From cc69f804c94a3cbdfb92c881ba21a5242f787381 Mon Sep 17 00:00:00 2001
From: 9731050 <callpfarcry@gmail.com>
Date: Sun, 12 May 2019 21:21:46 +0800
Subject: [PATCH] second
---
.idea/uiDesigner.xml | 124 ++++++++++++++++++
src/GradStudent.java | 3 -
src/{ => org/university/core}/Employee.java | 2 +
src/org/university/core/GradStudent.java | 20 +++
src/org/university/core/Professor.java | 6 +
src/org/university/core/Publication.java | 12 ++
src/org/university/core/ServiceEmployee.java | 9 ++
src/{ => org/university/core}/Student.java | 2 +
.../university/core}/UnderGradStudent.java | 2 +
9 files changed, 177 insertions(+), 3 deletions(-)
create mode 100644 .idea/uiDesigner.xml
delete mode 100644 src/GradStudent.java
rename src/{ => org/university/core}/Employee.java (96%)
create mode 100644 src/org/university/core/GradStudent.java
create mode 100644 src/org/university/core/Professor.java
create mode 100644 src/org/university/core/Publication.java
create mode 100644 src/org/university/core/ServiceEmployee.java
rename src/{ => org/university/core}/Student.java (93%)
rename src/{ => org/university/core}/UnderGradStudent.java (88%)
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/src/GradStudent.java b/src/GradStudent.java
deleted file mode 100644
index fe1aa1a..0000000
--- a/src/GradStudent.java
+++ /dev/null
@@ -1,3 +0,0 @@
-public class GradStudent {
-
-}
diff --git a/src/Employee.java b/src/org/university/core/Employee.java
similarity index 96%
rename from src/Employee.java
rename to src/org/university/core/Employee.java
index 06f19b5..d5127c9 100644
--- a/src/Employee.java
+++ b/src/org/university/core/Employee.java
@@ -1,3 +1,5 @@
+package org.university.core;
+
import java.util.ArrayList;
public class Employee extends Person {
diff --git a/src/org/university/core/GradStudent.java b/src/org/university/core/GradStudent.java
new file mode 100644
index 0000000..67e8c24
--- /dev/null
+++ b/src/org/university/core/GradStudent.java
@@ -0,0 +1,20 @@
+package org.university.core;
+
+import java.util.ArrayList;
+
+public class GradStudent extends Student{
+ private ArrayList<publication>publications;
+ private Professor advisor;
+ public GradStudent(String firstName, String lastName, String ID, int joiningYear, Department department,Professor professor) {
+ super(firstName, lastName, ID, joiningYear, department);
+ publications=new ArrayList<publication>();
+ this.advisor=professor;
+ }
+ public void addPublication(Publication p){
+ publications.add(p);
+ }
+
+ public ArrayList<publication> getPublications() {
+ return publications;
+ }
+}
diff --git a/src/org/university/core/Professor.java b/src/org/university/core/Professor.java
new file mode 100644
index 0000000..0a9d590
--- /dev/null
+++ b/src/org/university/core/Professor.java
@@ -0,0 +1,6 @@
+package org.university.core;
+
+public class Professor extends Employee{
+
+
+}
diff --git a/src/org/university/core/Publication.java b/src/org/university/core/Publication.java
new file mode 100644
index 0000000..03ca60f
--- /dev/null
+++ b/src/org/university/core/Publication.java
@@ -0,0 +1,12 @@
+package org.university.core;
+
+public class Publication {
+ private String title;
+ private int year;
+
+ public Publication(String title, int year) {
+ this.title = title;
+ this.year = year;
+ }
+
+}
diff --git a/src/org/university/core/ServiceEmployee.java b/src/org/university/core/ServiceEmployee.java
new file mode 100644
index 0000000..20927a0
--- /dev/null
+++ b/src/org/university/core/ServiceEmployee.java
@@ -0,0 +1,9 @@
+package org.university.core;
+
+public class ServiceEmployee extends Employee {
+ public ServiceEmployee(String firstName, String lastName, String ID, int joiningYear, Department department, String position, double basicIncome) {
+ super(firstName, lastName, ID, joiningYear, department, position, basicIncome);
+ }
+ public double getCurrentIncome(){
+ }
+}
diff --git a/src/Student.java b/src/org/university/core/Student.java
similarity index 93%
rename from src/Student.java
rename to src/org/university/core/Student.java
index e12cb07..a8ede5d 100644
--- a/src/Student.java
+++ b/src/org/university/core/Student.java
@@ -1,3 +1,5 @@
+package org.university.core;
+
import java.util.ArrayList;
public class Student extends Person {
diff --git a/src/UnderGradStudent.java b/src/org/university/core/UnderGradStudent.java
similarity index 88%
rename from src/UnderGradStudent.java
rename to src/org/university/core/UnderGradStudent.java
index 4a6dbeb..9e5b389 100644
--- a/src/UnderGradStudent.java
+++ b/src/org/university/core/UnderGradStudent.java
@@ -1,3 +1,5 @@
+package org.university.core;
+
public class UnderGradStudent extends Student {
public UnderGradStudent(String firstName, String lastName, String ID, int joiningYear, Department department) {
super(firstName, lastName, ID, joiningYear, department);
--
2.18.1