Bladeren bron

its missing the test configs

Whitney Martinez 6 jaren geleden
bovenliggende
commit
ca778cfee9

+ 299
- 230
.idea/workspace.xml Bestand weergeven

@@ -2,80 +2,16 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="f3e0c46d-eb65-4774-9640-a04ba3be6cf3" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
20
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
21
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_5.xml" afterDir="false" />
22
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_5.xml" afterDir="false" />
23
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
24
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
25
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml" afterDir="false" />
26
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_1.xml" afterDir="false" />
27
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_13.xml" afterDir="false" />
28
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_13.xml" afterDir="false" />
29
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_13.xml" afterDir="false" />
30
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml" afterDir="false" />
31
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
32
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
33
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" afterDir="false" />
34
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
35
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml" afterDir="false" />
36
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
37
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
38
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
39
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
40
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
41
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_1_RELEASE.xml" afterDir="false" />
42
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_1_RELEASE.xml" afterDir="false" />
43
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_1_RELEASE.xml" afterDir="false" />
44
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_1_RELEASE.xml" afterDir="false" />
45
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_1_RELEASE.xml" afterDir="false" />
46
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_1_RELEASE.xml" afterDir="false" />
47
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_1_RELEASE.xml" afterDir="false" />
48
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_1_RELEASE.xml" afterDir="false" />
49
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_1_RELEASE.xml" afterDir="false" />
50
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_1_RELEASE.xml" afterDir="false" />
51
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_1_RELEASE.xml" afterDir="false" />
52
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_3_RELEASE.xml" afterDir="false" />
53
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_3_RELEASE.xml" afterDir="false" />
54
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_3_RELEASE.xml" afterDir="false" />
55
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_3_RELEASE.xml" afterDir="false" />
56
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_3_RELEASE.xml" afterDir="false" />
57
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_3_RELEASE.xml" afterDir="false" />
58
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_3_RELEASE.xml" afterDir="false" />
59
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_3_RELEASE.xml" afterDir="false" />
60
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_3_RELEASE.xml" afterDir="false" />
61
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml" afterDir="false" />
62
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" afterDir="false" />
63
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
64
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
65
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
66
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
67
-      <change afterPath="$PROJECT_DIR$/demo.iml" afterDir="false" />
68
-      <change afterPath="$PROJECT_DIR$/src/main/java/AbstractClass/People.java" afterDir="false" />
69
-      <change afterPath="$PROJECT_DIR$/src/main/java/Classes/Classroom.java" afterDir="false" />
70
-      <change afterPath="$PROJECT_DIR$/src/main/java/Classes/Instructor.java" afterDir="false" />
71
-      <change afterPath="$PROJECT_DIR$/src/main/java/Classes/Instructors.java" afterDir="false" />
72
-      <change afterPath="$PROJECT_DIR$/src/main/java/Classes/Person.java" afterDir="false" />
73
-      <change afterPath="$PROJECT_DIR$/src/main/java/Classes/Student.java" afterDir="false" />
74
-      <change afterPath="$PROJECT_DIR$/src/main/java/Classes/Students.java" afterDir="false" />
75
-      <change afterPath="$PROJECT_DIR$/src/main/java/Interfaces/Learner.java" afterDir="false" />
76
-      <change afterPath="$PROJECT_DIR$/src/main/java/Interfaces/Teacher.java" afterDir="false" />
77
-      <change afterPath="$PROJECT_DIR$/src/test/java/PeopleTest.java" afterDir="false" />
78
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/ConfigClasses/ClassroomConfig.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/main/java/ConfigClasses/InstructorsConfig.java" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/src/main/java/ConfigClasses/StudentConfig.java" afterDir="false" />
8
+      <change afterPath="$PROJECT_DIR$/src/test/java/StudentConfigTest.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/src/main/java/AbstractClass/People.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AbstractClass/People.java" afterDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/src/main/java/Classes/Classroom.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Classes/Classroom.java" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/src/main/java/Classes/Instructors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Classes/Instructors.java" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/src/main/java/Classes/Student.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Classes/Student.java" afterDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/src/main/java/Classes/Students.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Classes/Students.java" afterDir="false" />
79 15
     </list>
80 16
     <ignored path="$PROJECT_DIR$/target/" />
81 17
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -88,82 +24,145 @@
88 24
     <session id="-2060828120">
89 25
       <usages-collector id="statistics.lifecycle.project">
90 26
         <counts>
27
+          <entry key="project.closed" value="1" />
28
+          <entry key="project.open.time.2" value="1" />
91 29
           <entry key="project.open.time.7" value="1" />
92
-          <entry key="project.opened" value="1" />
30
+          <entry key="project.opened" value="2" />
93 31
         </counts>
94 32
       </usages-collector>
95 33
       <usages-collector id="statistics.file.extensions.open">
96 34
         <counts>
97
-          <entry key="java" value="35" />
98
-          <entry key="md" value="2" />
35
+          <entry key="class" value="2" />
36
+          <entry key="java" value="51" />
37
+          <entry key="md" value="4" />
38
+          <entry key="xml" value="1" />
99 39
         </counts>
100 40
       </usages-collector>
101 41
       <usages-collector id="statistics.file.types.open">
102 42
         <counts>
103
-          <entry key="JAVA" value="35" />
104
-          <entry key="Markdown" value="2" />
43
+          <entry key="CLASS" value="2" />
44
+          <entry key="JAVA" value="51" />
45
+          <entry key="Markdown" value="4" />
46
+          <entry key="XML" value="1" />
105 47
         </counts>
106 48
       </usages-collector>
107 49
       <usages-collector id="statistics.file.extensions.edit">
108 50
         <counts>
109
-          <entry key="java" value="2544" />
51
+          <entry key="java" value="3610" />
110 52
         </counts>
111 53
       </usages-collector>
112 54
       <usages-collector id="statistics.file.types.edit">
113 55
         <counts>
114
-          <entry key="JAVA" value="2544" />
56
+          <entry key="JAVA" value="3610" />
115 57
         </counts>
116 58
       </usages-collector>
117 59
     </session>
118 60
   </component>
119 61
   <component name="FileEditorManager">
120
-    <leaf>
121
-      <file pinned="false" current-in-tab="true">
122
-        <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Classroom.java">
123
-          <provider selected="true" editor-type-id="text-editor">
124
-            <state relative-caret-position="-11">
125
-              <caret line="13" column="35" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="13" selection-end-column="35" />
126
-              <folding>
127
-                <element signature="imports" expanded="true" />
128
-                <element signature="e#470#471#0" expanded="true" />
129
-                <element signature="e#504#505#0" expanded="true" />
130
-                <element signature="e#563#564#0" expanded="true" />
131
-                <element signature="e#609#610#0" expanded="true" />
132
-                <element signature="e#646#647#0" expanded="true" />
133
-                <element signature="e#677#678#0" expanded="true" />
134
-                <element signature="e#620#621#0" expanded="true" />
135
-                <element signature="e#660#661#0" expanded="true" />
136
-              </folding>
137
-            </state>
138
-          </provider>
139
-        </entry>
140
-      </file>
141
-      <file pinned="false" current-in-tab="false">
142
-        <entry file="file://$PROJECT_DIR$/src/main/java/Interfaces/Teacher.java">
143
-          <provider selected="true" editor-type-id="text-editor">
144
-            <state relative-caret-position="90">
145
-              <caret line="6" column="60" selection-start-line="6" selection-start-column="60" selection-end-line="6" selection-end-column="60" />
146
-            </state>
147
-          </provider>
148
-        </entry>
149
-      </file>
150
-      <file pinned="false" current-in-tab="false">
151
-        <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Students.java">
152
-          <provider selected="true" editor-type-id="text-editor">
153
-            <state relative-caret-position="59">
154
-              <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
155
-              <folding>
156
-                <element signature="imports" expanded="true" />
157
-                <element signature="e#358#359#0" expanded="true" />
158
-                <element signature="e#385#386#0" expanded="true" />
159
-                <element signature="e#530#531#0" expanded="true" />
160
-                <element signature="e#557#558#0" expanded="true" />
161
-              </folding>
162
-            </state>
163
-          </provider>
164
-        </entry>
165
-      </file>
166
-    </leaf>
62
+    <splitter split-orientation="horizontal" split-proportion="0.5">
63
+      <split-first>
64
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
65
+          <file pinned="false" current-in-tab="false">
66
+            <entry file="file://$PROJECT_DIR$/src/main/java/ConfigClasses/StudentConfig.java">
67
+              <provider selected="true" editor-type-id="text-editor">
68
+                <state relative-caret-position="300">
69
+                  <caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
70
+                  <folding>
71
+                    <element signature="imports" expanded="true" />
72
+                  </folding>
73
+                </state>
74
+              </provider>
75
+            </entry>
76
+          </file>
77
+          <file pinned="false" current-in-tab="true">
78
+            <entry file="file://$PROJECT_DIR$/src/test/java/StudentConfigTest.java">
79
+              <provider selected="true" editor-type-id="text-editor">
80
+                <state relative-caret-position="255">
81
+                  <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
82
+                  <folding>
83
+                    <element signature="imports" expanded="true" />
84
+                  </folding>
85
+                </state>
86
+              </provider>
87
+            </entry>
88
+          </file>
89
+          <file pinned="false" current-in-tab="false">
90
+            <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Classroom.java">
91
+              <provider selected="true" editor-type-id="text-editor">
92
+                <state relative-caret-position="75">
93
+                  <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
94
+                  <folding>
95
+                    <element signature="imports" expanded="true" />
96
+                  </folding>
97
+                </state>
98
+              </provider>
99
+            </entry>
100
+          </file>
101
+          <file pinned="false" current-in-tab="false">
102
+            <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Students.java">
103
+              <provider selected="true" editor-type-id="text-editor">
104
+                <state relative-caret-position="300">
105
+                  <caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
106
+                  <folding>
107
+                    <element signature="imports" expanded="true" />
108
+                  </folding>
109
+                </state>
110
+              </provider>
111
+            </entry>
112
+          </file>
113
+          <file pinned="false" current-in-tab="false">
114
+            <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Student.java">
115
+              <provider selected="true" editor-type-id="text-editor">
116
+                <state relative-caret-position="255">
117
+                  <caret line="17" column="32" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
118
+                  <folding>
119
+                    <element signature="e#162#163#0" expanded="true" />
120
+                    <element signature="e#189#190#0" expanded="true" />
121
+                    <element signature="e#232#233#0" expanded="true" />
122
+                    <element signature="e#262#263#0" expanded="true" />
123
+                  </folding>
124
+                </state>
125
+              </provider>
126
+            </entry>
127
+          </file>
128
+          <file pinned="false" current-in-tab="false">
129
+            <entry file="file://$PROJECT_DIR$/src/main/java/Interfaces/Learner.java">
130
+              <provider selected="true" editor-type-id="text-editor">
131
+                <state relative-caret-position="30">
132
+                  <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
133
+                </state>
134
+              </provider>
135
+            </entry>
136
+          </file>
137
+          <file pinned="false" current-in-tab="false">
138
+            <entry file="file://$PROJECT_DIR$/src/main/java/AbstractClass/People.java">
139
+              <provider selected="true" editor-type-id="text-editor">
140
+                <state relative-caret-position="90">
141
+                  <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
142
+                  <folding>
143
+                    <element signature="imports" expanded="true" />
144
+                  </folding>
145
+                </state>
146
+              </provider>
147
+            </entry>
148
+          </file>
149
+        </leaf>
150
+      </split-first>
151
+      <split-second>
152
+        <leaf>
153
+          <file pinned="false" current-in-tab="true">
154
+            <entry file="file://$PROJECT_DIR$/README.md">
155
+              <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
156
+                <state split_layout="SPLIT">
157
+                  <first_editor />
158
+                  <second_editor />
159
+                </state>
160
+              </provider>
161
+            </entry>
162
+          </file>
163
+        </leaf>
164
+      </split-second>
165
+    </splitter>
167 166
   </component>
168 167
   <component name="FileTemplateManagerImpl">
169 168
     <option name="RECENT_TEMPLATES">
@@ -190,13 +189,17 @@
190 189
         <option value="$PROJECT_DIR$/src/main/java/Teacher.java" />
191 190
         <option value="$PROJECT_DIR$/src/test/java/com/example/demo/Charlie.java" />
192 191
         <option value="$PROJECT_DIR$/src/test/java/PeopleTest.java" />
193
-        <option value="$PROJECT_DIR$/src/main/java/AbstractClass/People.java" />
194
-        <option value="$PROJECT_DIR$/src/main/java/Classes/Instructors.java" />
195 192
         <option value="$PROJECT_DIR$/src/main/java/Classes/Instructor.java" />
196
-        <option value="$PROJECT_DIR$/src/main/java/Classes/Student.java" />
197 193
         <option value="$PROJECT_DIR$/src/main/java/Interfaces/Teacher.java" />
198
-        <option value="$PROJECT_DIR$/src/main/java/Classes/Students.java" />
199 194
         <option value="$PROJECT_DIR$/src/main/java/Classes/Classroom.java" />
195
+        <option value="$PROJECT_DIR$/src/main/java/Classes/Student.java" />
196
+        <option value="$PROJECT_DIR$/src/main/java/Classes/Students.java" />
197
+        <option value="$PROJECT_DIR$/src/main/java/ConfigClasses/StudentConfig.java" />
198
+        <option value="$PROJECT_DIR$/src/main/java/Classes/Instructors.java" />
199
+        <option value="$PROJECT_DIR$/src/main/java/ConfigClasses/InstructorsConfig.java" />
200
+        <option value="$PROJECT_DIR$/src/main/java/ConfigClasses/ClassroomConfig.java" />
201
+        <option value="$PROJECT_DIR$/src/main/java/AbstractClass/People.java" />
202
+        <option value="$PROJECT_DIR$/src/test/java/StudentConfigTest.java" />
200 203
       </list>
201 204
     </option>
202 205
   </component>
@@ -207,8 +210,7 @@
207 210
     <sorting>DEFINITION_ORDER</sorting>
208 211
   </component>
209 212
   <component name="ProjectFrameBounds">
210
-    <option name="x" value="139" />
211
-    <option name="y" value="77" />
213
+    <option name="y" value="23" />
212 214
     <option name="width" value="1166" />
213 215
     <option name="height" value="709" />
214 216
   </component>
@@ -218,7 +220,6 @@
218 220
       <foldersAlwaysOnTop value="true" />
219 221
     </navigator>
220 222
     <panes>
221
-      <pane id="PackagesPane" />
222 223
       <pane id="ProjectPane">
223 224
         <subPane>
224 225
           <expand>
@@ -274,13 +275,43 @@
274 275
               <item name="src" type="462c0819:PsiDirectoryNode" />
275 276
               <item name="main" type="462c0819:PsiDirectoryNode" />
276 277
               <item name="java" type="462c0819:PsiDirectoryNode" />
278
+              <item name="ConfigClasses" type="462c0819:PsiDirectoryNode" />
279
+            </path>
280
+            <path>
281
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
282
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
283
+              <item name="src" type="462c0819:PsiDirectoryNode" />
284
+              <item name="main" type="462c0819:PsiDirectoryNode" />
285
+              <item name="java" type="462c0819:PsiDirectoryNode" />
277 286
               <item name="Interfaces" type="462c0819:PsiDirectoryNode" />
278 287
             </path>
288
+            <path>
289
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
290
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
291
+              <item name="src" type="462c0819:PsiDirectoryNode" />
292
+              <item name="test" type="462c0819:PsiDirectoryNode" />
293
+            </path>
294
+            <path>
295
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
296
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
297
+              <item name="src" type="462c0819:PsiDirectoryNode" />
298
+              <item name="test" type="462c0819:PsiDirectoryNode" />
299
+              <item name="java" type="462c0819:PsiDirectoryNode" />
300
+            </path>
301
+            <path>
302
+              <item name="demo" type="b2602c69:ProjectViewProjectNode" />
303
+              <item name="CR-MesoLabs-Beans.LearnerLab" type="462c0819:PsiDirectoryNode" />
304
+              <item name="src" type="462c0819:PsiDirectoryNode" />
305
+              <item name="test" type="462c0819:PsiDirectoryNode" />
306
+              <item name="java" type="462c0819:PsiDirectoryNode" />
307
+              <item name="demo" type="462c0819:PsiDirectoryNode" />
308
+            </path>
279 309
           </expand>
280 310
           <select />
281 311
         </subPane>
282 312
       </pane>
283 313
       <pane id="Scope" />
314
+      <pane id="PackagesPane" />
284 315
     </panes>
285 316
   </component>
286 317
   <component name="PropertiesComponent">
@@ -290,7 +321,7 @@
290 321
     <property name="RequestMappingsPanelWidth1" value="75" />
291 322
     <property name="WebServerToolWindowFactoryState" value="false" />
292 323
     <property name="aspect.path.notification.shown" value="true" />
293
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544055953712" />
324
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544405482079" />
294 325
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
295 326
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
296 327
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -357,7 +388,8 @@
357 388
       <option name="number" value="Default" />
358 389
       <option name="presentableId" value="Default" />
359 390
       <updated>1544032317052</updated>
360
-      <workItem from="1544032321854" duration="15033000" />
391
+      <workItem from="1544032321854" duration="21559000" />
392
+      <workItem from="1544383962161" duration="2050000" />
361 393
     </task>
362 394
     <servers />
363 395
   </component>
@@ -382,44 +414,44 @@
382 414
     </history-entry>
383 415
   </component>
384 416
   <component name="TimeTrackingManager">
385
-    <option name="totallyTimeSpent" value="15033000" />
417
+    <option name="totallyTimeSpent" value="23609000" />
386 418
   </component>
387 419
   <component name="ToolWindowManager">
388
-    <frame x="139" y="77" width="1166" height="709" extended-state="0" />
420
+    <frame x="0" y="23" width="1166" height="709" extended-state="0" />
389 421
     <editor active="true" />
390 422
     <layout>
391
-      <window_info id="Designer" />
392
-      <window_info id="Image Layers" />
393
-      <window_info id="UI Designer" />
394
-      <window_info id="Favorites" side_tool="true" />
395
-      <window_info id="Capture Tool" />
396
-      <window_info id="Web" side_tool="true" />
397
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
423
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49758455" weight="0.25" />
398 424
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
399
-      <window_info anchor="bottom" id="Spring" />
400
-      <window_info anchor="bottom" id="Terminal" />
401
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
402
-      <window_info anchor="bottom" id="Messages" weight="0.32901135" />
403
-      <window_info anchor="bottom" id="Java Enterprise" />
404
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
405
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
425
+      <window_info id="Designer" order="2" />
426
+      <window_info id="Image Layers" order="3" />
427
+      <window_info id="UI Designer" order="4" />
428
+      <window_info id="Favorites" order="5" side_tool="true" />
429
+      <window_info id="Capture Tool" order="6" />
430
+      <window_info id="Web" order="7" sideWeight="0.5024155" side_tool="true" weight="0.25" />
406 431
       <window_info anchor="bottom" id="Message" order="0" />
407 432
       <window_info anchor="bottom" id="Find" order="1" weight="0.32901135" />
408
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32901135" />
433
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32901135" />
409 434
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
410 435
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
411 436
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
412 437
       <window_info anchor="bottom" id="TODO" order="6" />
413
-      <window_info anchor="right" id="Palette" />
414
-      <window_info anchor="right" id="Capture Analysis" />
415
-      <window_info anchor="right" id="Maven Projects" />
416
-      <window_info anchor="right" id="Database" />
417
-      <window_info anchor="right" id="Palette&#9;" />
418
-      <window_info anchor="right" id="Theme Preview" />
419
-      <window_info anchor="right" id="Bean Validation" />
438
+      <window_info anchor="bottom" id="Spring" order="7" />
439
+      <window_info anchor="bottom" id="Terminal" order="8" />
440
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
441
+      <window_info anchor="bottom" id="Messages" order="10" weight="0.32901135" />
442
+      <window_info anchor="bottom" id="Java Enterprise" order="11" />
443
+      <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
444
+      <window_info anchor="bottom" id="Version Control" order="13" show_stripe_button="false" />
420 445
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
421 446
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
422 447
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
448
+      <window_info anchor="right" id="Palette" order="3" />
449
+      <window_info anchor="right" id="Capture Analysis" order="4" />
450
+      <window_info anchor="right" id="Maven Projects" order="5" />
451
+      <window_info anchor="right" id="Database" order="6" />
452
+      <window_info anchor="right" id="Palette&#9;" order="7" />
453
+      <window_info anchor="right" id="Theme Preview" order="8" />
454
+      <window_info anchor="right" id="Bean Validation" order="9" />
423 455
     </layout>
424 456
   </component>
425 457
   <component name="TypeScriptGeneratedFilesManager">
@@ -429,13 +461,6 @@
429 461
     <option name="myLimit" value="2678400000" />
430 462
   </component>
431 463
   <component name="editorHistoryManager">
432
-    <entry file="file://$PROJECT_DIR$/src/main/java/Interfaces/Learner.java">
433
-      <provider selected="true" editor-type-id="text-editor">
434
-        <state relative-caret-position="30">
435
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
436
-        </state>
437
-      </provider>
438
-    </entry>
439 464
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/util/List.java">
440 465
       <provider selected="true" editor-type-id="text-editor">
441 466
         <state relative-caret-position="-56">
@@ -457,134 +482,178 @@
457 482
         </state>
458 483
       </provider>
459 484
     </entry>
460
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/demo/Charlie.java">
485
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/demo/Charlie.java" />
486
+    <entry file="file://$PROJECT_DIR$/src/test/java/PeopleTest.java">
461 487
       <provider selected="true" editor-type-id="text-editor">
462
-        <state relative-caret-position="150">
463
-          <caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
488
+        <state relative-caret-position="166">
489
+          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
464 490
           <folding>
465 491
             <element signature="imports" expanded="true" />
466
-            <element signature="e#209#210#0" expanded="true" />
467
-            <element signature="e#232#233#0" expanded="true" />
468
-            <element signature="e#234#235#0" expanded="true" />
469
-            <element signature="e#261#262#0" expanded="true" />
470
-            <element signature="e#380#381#0" expanded="true" />
471
-            <element signature="e#407#408#0" expanded="true" />
472 492
           </folding>
473 493
         </state>
474 494
       </provider>
475 495
     </entry>
476
-    <entry file="file://$PROJECT_DIR$/src/test/java/PeopleTest.java">
496
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/demo/DemoApplication.java">
477 497
       <provider selected="true" editor-type-id="text-editor">
478
-        <state relative-caret-position="166">
479
-          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
498
+        <state relative-caret-position="75">
499
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
500
+        </state>
501
+      </provider>
502
+    </entry>
503
+    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Instructor.java">
504
+      <provider selected="true" editor-type-id="text-editor">
505
+        <state relative-caret-position="-9">
506
+          <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
507
+        </state>
508
+      </provider>
509
+    </entry>
510
+    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Person.java">
511
+      <provider selected="true" editor-type-id="text-editor">
512
+        <state relative-caret-position="30">
513
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
514
+        </state>
515
+      </provider>
516
+    </entry>
517
+    <entry file="file://$PROJECT_DIR$/src/main/java/Interfaces/Teacher.java">
518
+      <provider selected="true" editor-type-id="text-editor">
519
+        <state relative-caret-position="90">
520
+          <caret line="6" column="60" selection-start-line="6" selection-start-column="60" selection-end-line="6" selection-end-column="60" />
521
+        </state>
522
+      </provider>
523
+    </entry>
524
+    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Instructors.java">
525
+      <provider selected="true" editor-type-id="text-editor">
526
+        <state relative-caret-position="67">
527
+          <caret line="17" column="18" selection-start-line="17" selection-start-column="18" selection-end-line="17" selection-end-column="18" />
480 528
           <folding>
481 529
             <element signature="imports" expanded="true" />
530
+            <element signature="e#270#271#0" expanded="true" />
531
+            <element signature="e#300#301#0" expanded="true" />
532
+            <element signature="e#356#357#0" expanded="true" />
533
+            <element signature="e#386#387#0" expanded="true" />
482 534
           </folding>
483 535
         </state>
484 536
       </provider>
485 537
     </entry>
486
-    <entry file="file://$PROJECT_DIR$/README.md">
487
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
488
-        <state split_layout="SPLIT">
489
-          <first_editor relative-caret-position="-7" />
490
-          <second_editor />
491
-        </state>
538
+    <entry file="file://$PROJECT_DIR$/../../Checkbook-OldStyle/Checkbook/pom.xml">
539
+      <provider selected="true" editor-type-id="text-editor">
540
+        <state relative-caret-position="-37" />
492 541
       </provider>
493 542
     </entry>
494
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/demo/DemoApplication.java">
543
+    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Classroom.java">
495 544
       <provider selected="true" editor-type-id="text-editor">
496 545
         <state relative-caret-position="75">
497
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
546
+          <caret line="5" column="22" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
547
+          <folding>
548
+            <element signature="imports" expanded="true" />
549
+          </folding>
498 550
         </state>
499 551
       </provider>
500 552
     </entry>
501
-    <entry file="file://$PROJECT_DIR$/src/main/java/AbstractClass/People.java">
553
+    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Students.java">
502 554
       <provider selected="true" editor-type-id="text-editor">
503
-        <state relative-caret-position="-68">
504
-          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
555
+        <state relative-caret-position="300">
556
+          <caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
505 557
           <folding>
506 558
             <element signature="imports" expanded="true" />
507 559
           </folding>
508 560
         </state>
509 561
       </provider>
510 562
     </entry>
511
-    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Instructor.java">
563
+    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Student.java">
512 564
       <provider selected="true" editor-type-id="text-editor">
513
-        <state relative-caret-position="-9">
514
-          <caret line="11" column="8" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="8" />
565
+        <state relative-caret-position="255">
566
+          <caret line="17" column="32" selection-start-line="17" selection-start-column="32" selection-end-line="17" selection-end-column="32" />
567
+          <folding>
568
+            <element signature="e#162#163#0" expanded="true" />
569
+            <element signature="e#189#190#0" expanded="true" />
570
+            <element signature="e#232#233#0" expanded="true" />
571
+            <element signature="e#262#263#0" expanded="true" />
572
+          </folding>
573
+        </state>
574
+      </provider>
575
+    </entry>
576
+    <entry file="file://$PROJECT_DIR$/src/main/java/Interfaces/Learner.java">
577
+      <provider selected="true" editor-type-id="text-editor">
578
+        <state relative-caret-position="30">
579
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
580
+        </state>
581
+      </provider>
582
+    </entry>
583
+    <entry file="file://$PROJECT_DIR$/src/main/java/AbstractClass/People.java">
584
+      <provider selected="true" editor-type-id="text-editor">
585
+        <state relative-caret-position="90">
586
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
515 587
           <folding>
516 588
             <element signature="imports" expanded="true" />
517 589
           </folding>
518 590
         </state>
519 591
       </provider>
520 592
     </entry>
521
-    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Instructors.java">
593
+    <entry file="file://$PROJECT_DIR$/src/main/java/ConfigClasses/InstructorsConfig.java">
522 594
       <provider selected="true" editor-type-id="text-editor">
523
-        <state relative-caret-position="102">
524
-          <caret line="12" column="4" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
595
+        <state relative-caret-position="150">
596
+          <caret line="12" column="5" selection-start-line="9" selection-start-column="4" selection-end-line="12" selection-end-column="5" />
525 597
           <folding>
526 598
             <element signature="imports" expanded="true" />
527
-            <element signature="e#270#271#0" expanded="true" />
528
-            <element signature="e#300#301#0" expanded="true" />
529 599
           </folding>
530 600
         </state>
531 601
       </provider>
532 602
     </entry>
533
-    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Person.java">
603
+    <entry file="file://$PROJECT_DIR$/target/classes/Classes/Instructor.class">
534 604
       <provider selected="true" editor-type-id="text-editor">
535
-        <state relative-caret-position="30">
536
-          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
605
+        <state>
606
+          <folding>
607
+            <element signature="e#0#717#0" expanded="true" />
608
+          </folding>
537 609
         </state>
538 610
       </provider>
539 611
     </entry>
540
-    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Student.java">
612
+    <entry file="file://$PROJECT_DIR$/target/test-classes/PeopleTest.class">
541 613
       <provider selected="true" editor-type-id="text-editor">
542
-        <state relative-caret-position="22">
543
-          <caret line="9" column="40" lean-forward="true" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
614
+        <state>
544 615
           <folding>
545
-            <element signature="e#182#183#0" expanded="true" />
546
-            <element signature="e#213#214#0" expanded="true" />
547
-            <element signature="e#477#478#0" expanded="true" />
548
-            <element signature="e#529#530#0" expanded="true" />
616
+            <element signature="e#0#864#0" expanded="true" />
549 617
           </folding>
550 618
         </state>
551 619
       </provider>
552 620
     </entry>
553
-    <entry file="file://$PROJECT_DIR$/src/main/java/Interfaces/Teacher.java">
621
+    <entry file="file://$PROJECT_DIR$/src/main/java/ConfigClasses/ClassroomConfig.java">
554 622
       <provider selected="true" editor-type-id="text-editor">
555
-        <state relative-caret-position="90">
556
-          <caret line="6" column="60" selection-start-line="6" selection-start-column="60" selection-end-line="6" selection-end-column="60" />
623
+        <state relative-caret-position="165">
624
+          <caret line="11" column="9" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
625
+          <folding>
626
+            <element signature="imports" expanded="true" />
627
+            <element signature="e#389#390#0" expanded="true" />
628
+            <element signature="e#477#478#0" expanded="true" />
629
+          </folding>
557 630
         </state>
558 631
       </provider>
559 632
     </entry>
560
-    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Students.java">
633
+    <entry file="file://$PROJECT_DIR$/src/main/java/ConfigClasses/StudentConfig.java">
561 634
       <provider selected="true" editor-type-id="text-editor">
562
-        <state relative-caret-position="59">
563
-          <caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
635
+        <state relative-caret-position="300">
636
+          <caret line="20" column="19" selection-start-line="20" selection-start-column="19" selection-end-line="20" selection-end-column="19" />
564 637
           <folding>
565 638
             <element signature="imports" expanded="true" />
566
-            <element signature="e#358#359#0" expanded="true" />
567
-            <element signature="e#385#386#0" expanded="true" />
568
-            <element signature="e#530#531#0" expanded="true" />
569
-            <element signature="e#557#558#0" expanded="true" />
570 639
           </folding>
571 640
         </state>
572 641
       </provider>
573 642
     </entry>
574
-    <entry file="file://$PROJECT_DIR$/src/main/java/Classes/Classroom.java">
643
+    <entry file="file://$PROJECT_DIR$/README.md">
644
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
645
+        <state split_layout="SPLIT">
646
+          <first_editor />
647
+          <second_editor />
648
+        </state>
649
+      </provider>
650
+    </entry>
651
+    <entry file="file://$PROJECT_DIR$/src/test/java/StudentConfigTest.java">
575 652
       <provider selected="true" editor-type-id="text-editor">
576
-        <state relative-caret-position="-11">
577
-          <caret line="13" column="35" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="13" selection-end-column="35" />
653
+        <state relative-caret-position="255">
654
+          <caret line="17" column="26" selection-start-line="17" selection-start-column="26" selection-end-line="17" selection-end-column="26" />
578 655
           <folding>
579 656
             <element signature="imports" expanded="true" />
580
-            <element signature="e#470#471#0" expanded="true" />
581
-            <element signature="e#504#505#0" expanded="true" />
582
-            <element signature="e#563#564#0" expanded="true" />
583
-            <element signature="e#609#610#0" expanded="true" />
584
-            <element signature="e#646#647#0" expanded="true" />
585
-            <element signature="e#677#678#0" expanded="true" />
586
-            <element signature="e#620#621#0" expanded="true" />
587
-            <element signature="e#660#661#0" expanded="true" />
588 657
           </folding>
589 658
         </state>
590 659
       </provider>

+ 4
- 0
src/main/java/AbstractClass/People.java Bestand weergeven

@@ -8,11 +8,14 @@ public abstract class People <Person> implements Iterable<Person> {
8 8
 
9 9
    public List<Person> personList;
10 10
 
11
+
11 12
    public People(List<Person> peoples){
12 13
 
13 14
 
14 15
    }
16
+    public People(Person... args){
15 17
 
18
+    }
16 19
 
17 20
 
18 21
     public void add(Person person){
@@ -21,6 +24,7 @@ public abstract class People <Person> implements Iterable<Person> {
21 24
    }
22 25
 
23 26
    public void remove (Person person) {
27
+
24 28
        personList.remove(person);
25 29
    }
26 30
     public int size () {

+ 1
- 1
src/main/java/Classes/Classroom.java Bestand weergeven

@@ -3,7 +3,7 @@ package Classes;
3 3
 import Interfaces.Learner;
4 4
 import Interfaces.Teacher;
5 5
 
6
-public class Classroom <Instuctors,Students>{
6
+public class Classroom{
7 7
 
8 8
     private Instructors instructors;
9 9
     private Students students;

+ 4
- 0
src/main/java/Classes/Instructors.java Bestand weergeven

@@ -14,6 +14,10 @@ public class Instructors extends People<Instructor> {
14 14
         super(peoples);
15 15
     }
16 16
 
17
+    public Instructors(Instructor...args) {
18
+        super(args);
19
+    }
20
+
17 21
     @Override
18 22
     public Iterator iterator() {
19 23
         return null;

+ 5
- 2
src/main/java/Classes/Student.java Bestand weergeven

@@ -7,14 +7,17 @@ public class Student extends Person implements Learner {
7 7
     private double totalStudyTime;
8 8
 
9 9
 
10
+    public Student() {
11
+        super("",0);
12
+    }
10 13
     public Student(String name, long id) {
11
-        super(name, id);
14
+        super(name,id);
12 15
     }
13 16
 
14 17
     @Override
15 18
     public void learn(double numberOfHours) {
16 19
 
17
-        totalStudyTime =+ numberOfHours;
20
+        totalStudyTime += numberOfHours;
18 21
     }
19 22
 
20 23
     public double getTotalStudyTime() {

+ 6
- 1
src/main/java/Classes/Students.java Bestand weergeven

@@ -16,6 +16,11 @@ public class Students extends People<Student> {
16 16
         super(students);
17 17
     }
18 18
 
19
+    public Students(Student... args) {
20
+
21
+        super(args);
22
+    }
23
+
19 24
 
20 25
     @Override
21 26
     public Iterator<Student> iterator() {
@@ -23,7 +28,7 @@ public class Students extends People<Student> {
23 28
     }
24 29
 
25 30
     @Override
26
-    public void forEach(Consumer<? super Student> action) {
31
+    public void forEach(Consumer action) {
27 32
 
28 33
     }
29 34
 

+ 24
- 0
src/main/java/ConfigClasses/ClassroomConfig.java Bestand weergeven

@@ -0,0 +1,24 @@
1
+package ConfigClasses;
2
+
3
+import Classes.*;
4
+import org.springframework.context.annotation.Bean;
5
+import org.springframework.context.annotation.DependsOn;
6
+
7
+public class ClassroomConfig {
8
+
9
+    private Student [] student = new Student[0];
10
+    private Instructor[] instructors = new Instructor[0];
11
+
12
+    @Bean
13
+    @DependsOn(value = {"instructors","students"})
14
+    public Classroom currentCohort(){
15
+        return new Classroom(new Instructors(instructors),new Students(student));
16
+    }
17
+
18
+    @Bean
19
+    @DependsOn(value = {"instructors","previousStudents"})
20
+    public Classroom previousCohort(){
21
+        return new Classroom(new Instructors(instructors),new Students(student));
22
+    }
23
+
24
+}

+ 25
- 0
src/main/java/ConfigClasses/InstructorsConfig.java Bestand weergeven

@@ -0,0 +1,25 @@
1
+package ConfigClasses;
2
+
3
+import Classes.Instructor;
4
+import Classes.Instructors;
5
+import org.springframework.context.annotation.Bean;
6
+import org.springframework.context.annotation.Primary;
7
+
8
+public class InstructorsConfig {
9
+
10
+    @Bean
11
+    public Instructors tcUsaInstructors(){
12
+        return new Instructors(new Instructor("Nancy",1));
13
+    }
14
+
15
+    @Bean
16
+    public Instructors tcUkInstructors(){
17
+        return new Instructors(new Instructor("White",2));
18
+    }
19
+
20
+    @Primary
21
+    @Bean
22
+    public Instructors ZipCodeInstructors(){
23
+        return new Instructors(new Instructor("Nhu",1));
24
+    }
25
+}

+ 23
- 0
src/main/java/ConfigClasses/StudentConfig.java Bestand weergeven

@@ -0,0 +1,23 @@
1
+package ConfigClasses;
2
+
3
+import Classes.Student;
4
+import Classes.Students;
5
+import org.springframework.beans.factory.annotation.Qualifier;
6
+import org.springframework.context.annotation.Bean;
7
+
8
+public class StudentConfig {
9
+
10
+
11
+    @Bean(name="students")
12
+    public Students currentStudents(){
13
+
14
+       return new Students(new Student("Jen",1));
15
+
16
+    }
17
+
18
+    @Bean(name = "prevStudents")
19
+    public Students previousStudents(){
20
+
21
+        return new Students(new Student("Jevit",2));
22
+    }
23
+}

+ 23
- 0
src/test/java/StudentConfigTest.java Bestand weergeven

@@ -0,0 +1,23 @@
1
+import Classes.Student;
2
+import org.junit.runner.RunWith;
3
+import org.springframework.beans.factory.annotation.Autowired;
4
+import org.springframework.beans.factory.annotation.Qualifier;
5
+import org.springframework.boot.test.context.SpringBootTest;
6
+import org.springframework.test.context.junit4.SpringRunner;
7
+
8
+@RunWith(SpringRunner.class)
9
+@SpringBootTest
10
+public class StudentConfigTest {
11
+
12
+    Student student = new Student();
13
+
14
+    @Autowired
15
+    @Qualifier("students")
16
+    public void testingStudents (){
17
+
18
+        student.getName();
19
+    }
20
+
21
+
22
+
23
+}