Quellcode durchsuchen

jk, im not done

mpierse vor 6 Jahren
Ursprung
Commit
76b2eb9c90

+ 99
- 77
.idea/workspace.xml Datei anzeigen

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="7c067e32-f3c4-46c3-90e9-a9b9f12f1b24" name="Default Changelist" comment="">
4
     <list default="true" id="7c067e32-f3c4-46c3-90e9-a9b9f12f1b24" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
5
       <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" afterDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" afterDir="false" />
14
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" afterDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" afterDir="false" />
16
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmington.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" afterDir="false" />
17
       <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" afterDir="false" />
7
       <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" afterDir="false" />
18
     </list>
8
     </list>
19
     <ignored path="$PROJECT_DIR$/target/" />
9
     <ignored path="$PROJECT_DIR$/target/" />
39
       <usages-collector id="statistics.file.extensions.open">
29
       <usages-collector id="statistics.file.extensions.open">
40
         <counts>
30
         <counts>
41
           <entry key="class" value="7" />
31
           <entry key="class" value="7" />
42
-          <entry key="java" value="46" />
32
+          <entry key="java" value="47" />
43
         </counts>
33
         </counts>
44
       </usages-collector>
34
       </usages-collector>
45
       <usages-collector id="statistics.file.types.open">
35
       <usages-collector id="statistics.file.types.open">
46
         <counts>
36
         <counts>
47
           <entry key="CLASS" value="7" />
37
           <entry key="CLASS" value="7" />
48
-          <entry key="JAVA" value="46" />
38
+          <entry key="JAVA" value="47" />
49
         </counts>
39
         </counts>
50
       </usages-collector>
40
       </usages-collector>
51
       <usages-collector id="statistics.file.extensions.edit">
41
       <usages-collector id="statistics.file.extensions.edit">
52
         <counts>
42
         <counts>
53
-          <entry key="java" value="6028" />
43
+          <entry key="java" value="6138" />
54
         </counts>
44
         </counts>
55
       </usages-collector>
45
       </usages-collector>
56
       <usages-collector id="statistics.file.types.edit">
46
       <usages-collector id="statistics.file.types.edit">
57
         <counts>
47
         <counts>
58
-          <entry key="JAVA" value="6028" />
48
+          <entry key="JAVA" value="6138" />
59
         </counts>
49
         </counts>
60
       </usages-collector>
50
       </usages-collector>
61
       <usages-collector id="statistics.js.language.service.starts" />
51
       <usages-collector id="statistics.js.language.service.starts" />
77
               </provider>
67
               </provider>
78
             </entry>
68
             </entry>
79
           </file>
69
           </file>
80
-          <file pinned="false" current-in-tab="false">
70
+          <file pinned="false" current-in-tab="true">
81
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
71
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
82
               <provider selected="true" editor-type-id="text-editor">
72
               <provider selected="true" editor-type-id="text-editor">
83
                 <state relative-caret-position="120">
73
                 <state relative-caret-position="120">
102
           <file pinned="false" current-in-tab="false">
92
           <file pinned="false" current-in-tab="false">
103
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
93
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
104
               <provider selected="true" editor-type-id="text-editor">
94
               <provider selected="true" editor-type-id="text-editor">
105
-                <state relative-caret-position="214">
106
-                  <caret line="58" column="28" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="28" />
95
+                <state relative-caret-position="-11">
96
+                  <caret line="41" column="26" lean-forward="true" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
107
                   <folding>
97
                   <folding>
108
                     <element signature="e#216#225#0" expanded="true" />
98
                     <element signature="e#216#225#0" expanded="true" />
109
                     <element signature="e#2640#2641#0" expanded="true" />
99
                     <element signature="e#2640#2641#0" expanded="true" />
116
           <file pinned="false" current-in-tab="false">
106
           <file pinned="false" current-in-tab="false">
117
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
107
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
118
               <provider selected="true" editor-type-id="text-editor">
108
               <provider selected="true" editor-type-id="text-editor">
119
-                <state relative-caret-position="244">
120
-                  <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
109
+                <state relative-caret-position="214">
110
+                  <caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
111
+                  <folding>
112
+                    <element signature="e#228#240#0" expanded="true" />
113
+                    <element signature="e#690#691#0" expanded="true" />
114
+                    <element signature="e#724#725#0" expanded="true" />
115
+                  </folding>
121
                 </state>
116
                 </state>
122
               </provider>
117
               </provider>
123
             </entry>
118
             </entry>
134
               </provider>
129
               </provider>
135
             </entry>
130
             </entry>
136
           </file>
131
           </file>
137
-          <file pinned="false" current-in-tab="true">
132
+          <file pinned="false" current-in-tab="false">
138
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
133
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
139
               <provider selected="true" editor-type-id="text-editor">
134
               <provider selected="true" editor-type-id="text-editor">
140
                 <state relative-caret-position="60">
135
                 <state relative-caret-position="60">
170
       </split-first>
165
       </split-first>
171
       <split-second>
166
       <split-second>
172
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
167
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
173
-          <file pinned="false" current-in-tab="true">
168
+          <file pinned="false" current-in-tab="false">
174
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
169
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
175
               <provider selected="true" editor-type-id="text-editor">
170
               <provider selected="true" editor-type-id="text-editor">
176
-                <state relative-caret-position="195">
177
-                  <caret line="13" column="35" selection-start-line="13" selection-start-column="35" selection-end-line="13" selection-end-column="35" />
171
+                <state relative-caret-position="285">
172
+                  <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
178
                 </state>
173
                 </state>
179
               </provider>
174
               </provider>
180
             </entry>
175
             </entry>
193
             </entry>
188
             </entry>
194
           </file>
189
           </file>
195
           <file pinned="false" current-in-tab="false">
190
           <file pinned="false" current-in-tab="false">
191
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
192
+              <provider selected="true" editor-type-id="text-editor">
193
+                <state relative-caret-position="199">
194
+                  <caret line="45" column="46" selection-start-line="45" selection-start-column="46" selection-end-line="45" selection-end-column="46" />
195
+                  <folding>
196
+                    <element signature="imports" expanded="true" />
197
+                    <element signature="e#1243#1252#0" expanded="true" />
198
+                  </folding>
199
+                </state>
200
+              </provider>
201
+            </entry>
202
+          </file>
203
+          <file pinned="false" current-in-tab="false">
196
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
204
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
197
               <provider selected="true" editor-type-id="text-editor">
205
               <provider selected="true" editor-type-id="text-editor">
198
                 <state relative-caret-position="105">
206
                 <state relative-caret-position="105">
201
               </provider>
209
               </provider>
202
             </entry>
210
             </entry>
203
           </file>
211
           </file>
204
-          <file pinned="false" current-in-tab="false">
212
+          <file pinned="false" current-in-tab="true">
205
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java">
213
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java">
206
               <provider selected="true" editor-type-id="text-editor">
214
               <provider selected="true" editor-type-id="text-editor">
207
-                <state relative-caret-position="154">
208
-                  <caret line="28" column="40" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
215
+                <state relative-caret-position="203">
216
+                  <caret line="30" column="29" lean-forward="true" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
209
                   <folding>
217
                   <folding>
210
                     <element signature="imports" expanded="true" />
218
                     <element signature="imports" expanded="true" />
211
                   </folding>
219
                   </folding>
242
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
250
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
243
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
251
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
244
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" />
252
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" />
245
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" />
246
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" />
253
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" />
247
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
254
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
248
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
255
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
250
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
257
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
251
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
258
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
252
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
259
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
253
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" />
254
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
260
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
255
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
261
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
256
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
257
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
262
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
258
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
263
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
264
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" />
265
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java" />
266
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
259
       </list>
267
       </list>
260
     </option>
268
     </option>
261
   </component>
269
   </component>
324
               <item name="test" type="462c0819:PsiDirectoryNode" />
332
               <item name="test" type="462c0819:PsiDirectoryNode" />
325
               <item name="java" type="462c0819:PsiDirectoryNode" />
333
               <item name="java" type="462c0819:PsiDirectoryNode" />
326
             </path>
334
             </path>
335
+            <path>
336
+              <item name="interfaces-1" type="b2602c69:ProjectViewProjectNode" />
337
+              <item name="CR-MacroLabs-OOP-InstructorStudentClassroom" type="462c0819:PsiDirectoryNode" />
338
+              <item name="src" type="462c0819:PsiDirectoryNode" />
339
+              <item name="test" type="462c0819:PsiDirectoryNode" />
340
+              <item name="java" type="462c0819:PsiDirectoryNode" />
341
+              <item name="interfaces" type="462c0819:PsiDirectoryNode" />
342
+            </path>
327
           </expand>
343
           </expand>
328
           <select />
344
           <select />
329
         </subPane>
345
         </subPane>
333
   <component name="PropertiesComponent">
349
   <component name="PropertiesComponent">
334
     <property name="WebServerToolWindowFactoryState" value="false" />
350
     <property name="WebServerToolWindowFactoryState" value="false" />
335
     <property name="aspect.path.notification.shown" value="true" />
351
     <property name="aspect.path.notification.shown" value="true" />
336
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542228615557" />
352
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542229650397" />
337
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
353
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
338
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
354
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
339
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
355
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
468
       <workItem from="1541625651457" duration="11624000" />
484
       <workItem from="1541625651457" duration="11624000" />
469
       <workItem from="1541963609741" duration="186000" />
485
       <workItem from="1541963609741" duration="186000" />
470
       <workItem from="1541964187052" duration="1393000" />
486
       <workItem from="1541964187052" duration="1393000" />
471
-      <workItem from="1542224574521" duration="4283000" />
487
+      <workItem from="1542224574521" duration="5007000" />
472
     </task>
488
     </task>
473
     <servers />
489
     <servers />
474
   </component>
490
   </component>
505
     </history-entry>
521
     </history-entry>
506
   </component>
522
   </component>
507
   <component name="TimeTrackingManager">
523
   <component name="TimeTrackingManager">
508
-    <option name="totallyTimeSpent" value="36908000" />
524
+    <option name="totallyTimeSpent" value="37632000" />
509
   </component>
525
   </component>
510
   <component name="ToolWindowManager">
526
   <component name="ToolWindowManager">
511
     <frame x="0" y="23" width="1440" height="813" extended-state="0" />
527
     <frame x="0" y="23" width="1440" height="813" extended-state="0" />
586
         </state>
602
         </state>
587
       </provider>
603
       </provider>
588
     </entry>
604
     </entry>
589
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
590
-      <provider selected="true" editor-type-id="text-editor">
591
-        <state relative-caret-position="510">
592
-          <caret line="34" column="50" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" />
593
-          <folding>
594
-            <element signature="imports" expanded="true" />
595
-          </folding>
596
-        </state>
597
-      </provider>
598
-    </entry>
599
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
605
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
600
       <provider selected="true" editor-type-id="text-editor">
606
       <provider selected="true" editor-type-id="text-editor">
601
         <state relative-caret-position="390">
607
         <state relative-caret-position="390">
616
         </state>
622
         </state>
617
       </provider>
623
       </provider>
618
     </entry>
624
     </entry>
619
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java">
620
-      <provider selected="true" editor-type-id="text-editor">
621
-        <state relative-caret-position="154">
622
-          <caret line="28" column="40" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
623
-          <folding>
624
-            <element signature="imports" expanded="true" />
625
-          </folding>
626
-        </state>
627
-      </provider>
628
-    </entry>
629
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
625
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
630
       <provider selected="true" editor-type-id="text-editor">
626
       <provider selected="true" editor-type-id="text-editor">
631
         <state relative-caret-position="330">
627
         <state relative-caret-position="330">
672
         </state>
668
         </state>
673
       </provider>
669
       </provider>
674
     </entry>
670
     </entry>
675
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
676
-      <provider selected="true" editor-type-id="text-editor">
677
-        <state relative-caret-position="120">
678
-          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
679
-        </state>
680
-      </provider>
681
-    </entry>
682
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
671
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
683
       <provider selected="true" editor-type-id="text-editor">
672
       <provider selected="true" editor-type-id="text-editor">
684
-        <state relative-caret-position="214">
685
-          <caret line="58" column="28" selection-start-line="58" selection-start-column="21" selection-end-line="58" selection-end-column="28" />
686
-          <folding>
687
-            <element signature="e#216#225#0" expanded="true" />
688
-            <element signature="e#2640#2641#0" expanded="true" />
689
-            <element signature="e#2674#2675#0" expanded="true" />
690
-          </folding>
673
+        <state relative-caret-position="225">
674
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
691
         </state>
675
         </state>
692
       </provider>
676
       </provider>
693
     </entry>
677
     </entry>
694
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
678
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
695
       <provider selected="true" editor-type-id="text-editor">
679
       <provider selected="true" editor-type-id="text-editor">
696
-        <state relative-caret-position="225">
697
-          <caret line="17" selection-start-line="17" selection-end-line="17" />
680
+        <state relative-caret-position="135">
681
+          <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
698
         </state>
682
         </state>
699
       </provider>
683
       </provider>
700
     </entry>
684
     </entry>
701
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
685
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
702
       <provider selected="true" editor-type-id="text-editor">
686
       <provider selected="true" editor-type-id="text-editor">
703
-        <state relative-caret-position="244">
704
-          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
687
+        <state relative-caret-position="199">
688
+          <caret line="45" column="46" selection-start-line="45" selection-start-column="46" selection-end-line="45" selection-end-column="46" />
689
+          <folding>
690
+            <element signature="imports" expanded="true" />
691
+            <element signature="e#1243#1252#0" expanded="true" />
692
+          </folding>
705
         </state>
693
         </state>
706
       </provider>
694
       </provider>
707
     </entry>
695
     </entry>
708
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
696
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/testHostLecture.java">
709
       <provider selected="true" editor-type-id="text-editor">
697
       <provider selected="true" editor-type-id="text-editor">
710
-        <state relative-caret-position="135">
711
-          <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
698
+        <state relative-caret-position="203">
699
+          <caret line="30" column="29" lean-forward="true" selection-start-line="30" selection-start-column="29" selection-end-line="30" selection-end-column="29" />
700
+          <folding>
701
+            <element signature="imports" expanded="true" />
702
+          </folding>
712
         </state>
703
         </state>
713
       </provider>
704
       </provider>
714
     </entry>
705
     </entry>
724
         </state>
715
         </state>
725
       </provider>
716
       </provider>
726
     </entry>
717
     </entry>
718
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
719
+      <provider selected="true" editor-type-id="text-editor">
720
+        <state relative-caret-position="214">
721
+          <caret line="25" column="27" lean-forward="true" selection-start-line="25" selection-start-column="27" selection-end-line="25" selection-end-column="27" />
722
+          <folding>
723
+            <element signature="e#228#240#0" expanded="true" />
724
+            <element signature="e#690#691#0" expanded="true" />
725
+            <element signature="e#724#725#0" expanded="true" />
726
+          </folding>
727
+        </state>
728
+      </provider>
729
+    </entry>
730
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
731
+      <provider selected="true" editor-type-id="text-editor">
732
+        <state relative-caret-position="-11">
733
+          <caret line="41" column="26" lean-forward="true" selection-start-line="41" selection-start-column="26" selection-end-line="41" selection-end-column="26" />
734
+          <folding>
735
+            <element signature="e#216#225#0" expanded="true" />
736
+            <element signature="e#2640#2641#0" expanded="true" />
737
+            <element signature="e#2674#2675#0" expanded="true" />
738
+          </folding>
739
+        </state>
740
+      </provider>
741
+    </entry>
742
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
743
+      <provider selected="true" editor-type-id="text-editor">
744
+        <state relative-caret-position="120">
745
+          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
746
+        </state>
747
+      </provider>
748
+    </entry>
727
   </component>
749
   </component>
728
 </project>
750
 </project>

+ 5
- 0
src/main/java/io/zipcoder/interfaces/Instructors.java Datei anzeigen

5
 public final class Instructors extends People{
5
 public final class Instructors extends People{
6
 
6
 
7
     private static final Instructors INSTANCE = new Instructors();
7
     private static final Instructors INSTANCE = new Instructors();
8
+    ArrayList<Instructor> teacherList=new ArrayList<Instructor>();
8
 
9
 
9
 
10
 
10
     private Instructors() {
11
     private Instructors() {
20
         return INSTANCE;
21
         return INSTANCE;
21
     }
22
     }
22
 
23
 
24
+    @Override
25
+    public ArrayList<Instructor> getArray() {
26
+        return teacherList;
27
+    }
23
 
28
 
24
 }
29
 }

+ 6
- 1
src/test/java/io/zipcoder/interfaces/TestInstructor.java Datei anzeigen

3
 import org.junit.Assert;
3
 import org.junit.Assert;
4
 import org.junit.Test;
4
 import org.junit.Test;
5
 
5
 
6
+import java.util.ArrayList;
7
+
6
 public class TestInstructor {
8
 public class TestInstructor {
7
 
9
 
8
     @Test
10
     @Test
36
         Student student = new Student(2, "FizzBuzz");
38
         Student student = new Student(2, "FizzBuzz");
37
         Student student2 = new Student(3, "FizzBuzz");
39
         Student student2 = new Student(3, "FizzBuzz");
38
         Student student3 = new Student(4,"BarFoo");
40
         Student student3 = new Student(4,"BarFoo");
39
-        Student[] students = new Student[]{student, student2,student3};
41
+        ArrayList<Learner> students = new ArrayList<Learner>();
42
+        students.add(student);
43
+        students.add(student2);
44
+        students.add(student3);
40
         instructor.lecture(students, 6);
45
         instructor.lecture(students, 6);
41
         double actual = student.getTotalStudayTime();
46
         double actual = student.getTotalStudayTime();
42
         Assert.assertEquals(2, actual,1);
47
         Assert.assertEquals(2, actual,1);

+ 1
- 1
src/test/java/io/zipcoder/interfaces/testHostLecture.java Datei anzeigen

21
         ZipCodeWilmington zip = ZipCodeWilmington.getInstance();
21
         ZipCodeWilmington zip = ZipCodeWilmington.getInstance();
22
         Students students = Students.getInstance();
22
         Students students = Students.getInstance();
23
         Instructors intsructors = Instructors.getInstance();
23
         Instructors intsructors = Instructors.getInstance();
24
-        Instructor instructor = intsructors.getArray()[0];
24
+        Instructor instructor = intsructors.getArray().get(0);
25
 
25
 
26
         double start = students.getArray().get(0).getTotalStudayTime();
26
         double start = students.getArray().get(0).getTotalStudayTime();
27
         System.out.println(start);
27
         System.out.println(start);