Przeglądaj źródła

fixed something that i did a goof on

Jennifer Chao 6 lat temu
rodzic
commit
edeb4982a3

+ 117
- 224
.idea/workspace.xml Wyświetl plik

@@ -2,10 +2,8 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="6d401438-edd6-46bd-8430-575eb6761c9c" name="Default Changelist" comment="">
5
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
9 7
     </list>
10 8
     <ignored path="$PROJECT_DIR$/target/" />
11 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -22,158 +20,69 @@
22 20
     <session id="-1194216088">
23 21
       <usages-collector id="statistics.lifecycle.project">
24 22
         <counts>
25
-          <entry key="project.closed" value="2" />
23
+          <entry key="project.closed" value="3" />
26 24
           <entry key="project.open.time.0" value="1" />
27 25
           <entry key="project.open.time.2" value="1" />
28 26
           <entry key="project.open.time.4" value="1" />
29
-          <entry key="project.opened" value="3" />
27
+          <entry key="project.open.time.9" value="1" />
28
+          <entry key="project.opened" value="4" />
30 29
         </counts>
31 30
       </usages-collector>
32 31
       <usages-collector id="statistics.file.extensions.open">
33 32
         <counts>
34 33
           <entry key="class" value="1" />
35
-          <entry key="java" value="103" />
34
+          <entry key="java" value="108" />
36 35
           <entry key="md" value="1" />
37 36
         </counts>
38 37
       </usages-collector>
39 38
       <usages-collector id="statistics.file.types.open">
40 39
         <counts>
41 40
           <entry key="CLASS" value="1" />
42
-          <entry key="JAVA" value="103" />
41
+          <entry key="JAVA" value="108" />
43 42
           <entry key="Markdown" value="1" />
44 43
         </counts>
45 44
       </usages-collector>
46 45
       <usages-collector id="statistics.file.extensions.edit">
47 46
         <counts>
48
-          <entry key="java" value="12248" />
47
+          <entry key="java" value="12395" />
49 48
         </counts>
50 49
       </usages-collector>
51 50
       <usages-collector id="statistics.file.types.edit">
52 51
         <counts>
53
-          <entry key="JAVA" value="12248" />
52
+          <entry key="JAVA" value="12395" />
54 53
         </counts>
55 54
       </usages-collector>
56 55
     </session>
57 56
   </component>
58 57
   <component name="FileEditorManager">
59
-    <splitter split-orientation="horizontal" split-proportion="0.3755047">
60
-      <split-first>
61
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
62
-          <file pinned="false" current-in-tab="true">
63
-            <entry file="file://$PROJECT_DIR$/README.md">
64
-              <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
65
-                <state split_layout="SECOND">
66
-                  <first_editor />
67
-                  <second_editor />
68
-                </state>
69
-              </provider>
70
-            </entry>
71
-          </file>
72
-        </leaf>
73
-      </split-first>
74
-      <split-second>
75
-        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
76
-          <file pinned="false" current-in-tab="false">
77
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
78
-              <provider selected="true" editor-type-id="text-editor">
79
-                <state relative-caret-position="180">
80
-                  <caret line="12" column="8" lean-forward="true" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="58" />
81
-                  <folding>
82
-                    <element signature="imports" expanded="true" />
83
-                  </folding>
84
-                </state>
85
-              </provider>
86
-            </entry>
87
-          </file>
88
-          <file pinned="false" current-in-tab="true">
89
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
90
-              <provider selected="true" editor-type-id="text-editor">
91
-                <state relative-caret-position="1440">
92
-                  <caret line="96" column="5" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" />
93
-                  <folding>
94
-                    <element signature="imports" expanded="true" />
95
-                  </folding>
96
-                </state>
97
-              </provider>
98
-            </entry>
99
-          </file>
100
-          <file pinned="false" current-in-tab="false">
101
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PersonTest.java">
102
-              <provider selected="true" editor-type-id="text-editor">
103
-                <state relative-caret-position="285">
104
-                  <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
105
-                  <folding>
106
-                    <element signature="imports" expanded="true" />
107
-                  </folding>
108
-                </state>
109
-              </provider>
110
-            </entry>
111
-          </file>
112
-          <file pinned="false" current-in-tab="false">
113
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
114
-              <provider selected="true" editor-type-id="text-editor">
115
-                <state relative-caret-position="225">
116
-                  <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
117
-                  <folding>
118
-                    <element signature="imports" expanded="true" />
119
-                    <element signature="e#269#270#0" expanded="true" />
120
-                    <element signature="e#324#325#0" expanded="true" />
121
-                  </folding>
122
-                </state>
123
-              </provider>
124
-            </entry>
125
-          </file>
126
-          <file pinned="false" current-in-tab="false">
127
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
128
-              <provider selected="true" editor-type-id="text-editor">
129
-                <state relative-caret-position="405">
130
-                  <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
131
-                  <folding>
132
-                    <element signature="imports" expanded="true" />
133
-                  </folding>
134
-                </state>
135
-              </provider>
136
-            </entry>
137
-          </file>
138
-          <file pinned="false" current-in-tab="false">
139
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
140
-              <provider selected="true" editor-type-id="text-editor">
141
-                <state relative-caret-position="567">
142
-                  <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
143
-                  <folding>
144
-                    <element signature="imports" expanded="true" />
145
-                  </folding>
146
-                </state>
147
-              </provider>
148
-            </entry>
149
-          </file>
150
-          <file pinned="false" current-in-tab="false">
151
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
152
-              <provider selected="true" editor-type-id="text-editor">
153
-                <state relative-caret-position="120">
154
-                  <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
155
-                  <folding>
156
-                    <element signature="imports" expanded="true" />
157
-                  </folding>
158
-                </state>
159
-              </provider>
160
-            </entry>
161
-          </file>
162
-          <file pinned="false" current-in-tab="false">
163
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
164
-              <provider selected="true" editor-type-id="text-editor">
165
-                <state relative-caret-position="255">
166
-                  <caret line="17" selection-start-line="17" selection-end-line="18" selection-end-column="51" />
167
-                  <folding>
168
-                    <element signature="imports" expanded="true" />
169
-                  </folding>
170
-                </state>
171
-              </provider>
172
-            </entry>
173
-          </file>
174
-        </leaf>
175
-      </split-second>
176
-    </splitter>
58
+    <leaf>
59
+      <file pinned="false" current-in-tab="false">
60
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
61
+          <provider selected="true" editor-type-id="text-editor">
62
+            <state relative-caret-position="433">
63
+              <caret line="29" column="8" lean-forward="true" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
64
+              <folding>
65
+                <element signature="imports" expanded="true" />
66
+                <element signature="e#1093#1094#0" expanded="true" />
67
+                <element signature="e#1124#1125#0" expanded="true" />
68
+              </folding>
69
+            </state>
70
+          </provider>
71
+        </entry>
72
+      </file>
73
+      <file pinned="false" current-in-tab="true">
74
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
75
+          <provider selected="true" editor-type-id="text-editor">
76
+            <state relative-caret-position="419">
77
+              <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
78
+              <folding>
79
+                <element signature="imports" expanded="true" />
80
+              </folding>
81
+            </state>
82
+          </provider>
83
+        </entry>
84
+      </file>
85
+    </leaf>
177 86
   </component>
178 87
   <component name="FileTemplateManagerImpl">
179 88
     <option name="RECENT_TEMPLATES">
@@ -204,15 +113,15 @@
204 113
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
205 114
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
206 115
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
207
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
208 116
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonInterface.java" />
209 117
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
210 118
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
211 119
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
212
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
213 120
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
214 121
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" />
215 122
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
123
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
124
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
216 125
       </list>
217 126
     </option>
218 127
   </component>
@@ -236,6 +145,7 @@
236 145
       <foldersAlwaysOnTop value="true" />
237 146
     </navigator>
238 147
     <panes>
148
+      <pane id="PackagesPane" />
239 149
       <pane id="ProjectPane">
240 150
         <subPane>
241 151
           <expand>
@@ -294,7 +204,6 @@
294 204
           <select />
295 205
         </subPane>
296 206
       </pane>
297
-      <pane id="PackagesPane" />
298 207
       <pane id="Scope" />
299 208
     </panes>
300 209
   </component>
@@ -302,7 +211,7 @@
302 211
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/jenniferchao/Labs/W3/CR-MacroLabs-OOP-InstructorStudentClassroom/src/test/java/io/zipcoder/interfaces/StudentTest.java" />
303 212
     <property name="WebServerToolWindowFactoryState" value="false" />
304 213
     <property name="aspect.path.notification.shown" value="true" />
305
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541538568670" />
214
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541547503590" />
306 215
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
307 216
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
308 217
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -324,7 +233,7 @@
324 233
       </list>
325 234
     </option>
326 235
   </component>
327
-  <component name="RunManager" selected="JUnit.InstructorTest">
236
+  <component name="RunManager" selected="JUnit.ZipCodeWilmingtonTest">
328 237
     <configuration name="EducatorTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
329 238
       <module name="interfaces-1" />
330 239
       <extension name="coverage">
@@ -367,7 +276,7 @@
367 276
         <option name="Make" enabled="true" />
368 277
       </method>
369 278
     </configuration>
370
-    <configuration name="StudentTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
279
+    <configuration name="ZipCodeWilmingtonTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
371 280
       <module name="interfaces-1" />
372 281
       <extension name="coverage">
373 282
         <pattern>
@@ -376,12 +285,12 @@
376 285
         </pattern>
377 286
       </extension>
378 287
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
379
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentTest" />
288
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
380 289
       <method v="2">
381 290
         <option name="Make" enabled="true" />
382 291
       </method>
383 292
     </configuration>
384
-    <configuration name="StudentsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
293
+    <configuration name="ZipCodeWilmingtonTest.testHostLecture_ID" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
385 294
       <module name="interfaces-1" />
386 295
       <extension name="coverage">
387 296
         <pattern>
@@ -390,25 +299,27 @@
390 299
         </pattern>
391 300
       </extension>
392 301
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
393
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
302
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
303
+      <option name="METHOD_NAME" value="testHostLecture_ID" />
304
+      <option name="TEST_OBJECT" value="method" />
394 305
       <method v="2">
395 306
         <option name="Make" enabled="true" />
396 307
       </method>
397 308
     </configuration>
398 309
     <list>
399
-      <item itemvalue="JUnit.StudentTest" />
400
-      <item itemvalue="JUnit.StudentsTest" />
401 310
       <item itemvalue="JUnit.EducatorTest" />
402 311
       <item itemvalue="JUnit.InstructorsTest" />
403 312
       <item itemvalue="JUnit.InstructorTest" />
313
+      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture_ID" />
314
+      <item itemvalue="JUnit.ZipCodeWilmingtonTest" />
404 315
     </list>
405 316
     <recent_temporary>
406 317
       <list>
318
+        <item itemvalue="JUnit.ZipCodeWilmingtonTest" />
319
+        <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture_ID" />
407 320
         <item itemvalue="JUnit.InstructorTest" />
408 321
         <item itemvalue="JUnit.InstructorsTest" />
409 322
         <item itemvalue="JUnit.EducatorTest" />
410
-        <item itemvalue="JUnit.StudentTest" />
411
-        <item itemvalue="JUnit.StudentsTest" />
412 323
       </list>
413 324
     </recent_temporary>
414 325
   </component>
@@ -424,44 +335,45 @@
424 335
       <updated>1541398494769</updated>
425 336
       <workItem from="1541398496278" duration="19454000" />
426 337
       <workItem from="1541511967581" duration="11210000" />
427
-      <workItem from="1541534437208" duration="2258000" />
338
+      <workItem from="1541534437208" duration="2626000" />
339
+      <workItem from="1541547254552" duration="248000" />
428 340
     </task>
429 341
     <servers />
430 342
   </component>
431 343
   <component name="TestHistory">
432
-    <history-entry file="EducatorTest - 2018.11.06 at 16h 00m 22s.xml">
433
-      <configuration name="EducatorTest" configurationId="JUnit" />
344
+    <history-entry file="PeopleTest - 2018.11.06 at 16h 08m 49s.xml">
345
+      <configuration name="PeopleTest" configurationId="JUnit" />
434 346
     </history-entry>
435
-    <history-entry file="EducatorTest_testLecture_AnotherTime - 2018.11.06 at 16h 02m 03s.xml">
436
-      <configuration name="EducatorTest.testLecture_AnotherTime" configurationId="JUnit" />
347
+    <history-entry file="PeopleTest - 2018.11.06 at 16h 09m 06s.xml">
348
+      <configuration name="PeopleTest" configurationId="JUnit" />
437 349
     </history-entry>
438
-    <history-entry file="EducatorTest - 2018.11.06 at 16h 02m 06s.xml">
439
-      <configuration name="EducatorTest" configurationId="JUnit" />
350
+    <history-entry file="ZipCodeWilmingtonTest - 2018.11.06 at 16h 09m 10s.xml">
351
+      <configuration name="ZipCodeWilmingtonTest" configurationId="JUnit" />
440 352
     </history-entry>
441
-    <history-entry file="EducatorTest - 2018.11.06 at 16h 05m 02s.xml">
442
-      <configuration name="EducatorTest" configurationId="JUnit" />
353
+    <history-entry file="PeopleTest - 2018.11.06 at 16h 09m 13s.xml">
354
+      <configuration name="PeopleTest" configurationId="JUnit" />
443 355
     </history-entry>
444
-    <history-entry file="EducatorTest_testLecture_SomeoneElseTime - 2018.11.06 at 16h 06m 53s.xml">
445
-      <configuration name="EducatorTest.testLecture_SomeoneElseTime" configurationId="JUnit" />
356
+    <history-entry file="PersonTest - 2018.11.06 at 16h 09m 17s.xml">
357
+      <configuration name="PersonTest" configurationId="JUnit" />
446 358
     </history-entry>
447
-    <history-entry file="EducatorTest - 2018.11.06 at 16h 06m 57s.xml">
448
-      <configuration name="EducatorTest" configurationId="JUnit" />
359
+    <history-entry file="StudentsTest - 2018.11.06 at 16h 09m 20s.xml">
360
+      <configuration name="StudentsTest" configurationId="JUnit" />
449 361
     </history-entry>
450
-    <history-entry file="EducatorTest_testLecture_SomeoneElseTime - 2018.11.06 at 16h 07m 33s.xml">
451
-      <configuration name="EducatorTest.testLecture_SomeoneElseTime" configurationId="JUnit" />
362
+    <history-entry file="StudentTest - 2018.11.06 at 16h 09m 23s.xml">
363
+      <configuration name="StudentTest" configurationId="JUnit" />
452 364
     </history-entry>
453
-    <history-entry file="EducatorTest - 2018.11.06 at 16h 08m 18s.xml">
365
+    <history-entry file="EducatorTest - 2018.11.06 at 16h 09m 26s.xml">
454 366
       <configuration name="EducatorTest" configurationId="JUnit" />
455 367
     </history-entry>
456
-    <history-entry file="StudentTest - 2018.11.06 at 16h 08m 44s.xml">
457
-      <configuration name="StudentTest" configurationId="JUnit" />
368
+    <history-entry file="InstructorsTest - 2018.11.06 at 16h 09m 29s.xml">
369
+      <configuration name="InstructorsTest" configurationId="JUnit" />
458 370
     </history-entry>
459
-    <history-entry file="PeopleTest - 2018.11.06 at 16h 08m 49s.xml">
460
-      <configuration name="PeopleTest" configurationId="JUnit" />
371
+    <history-entry file="InstructorTest - 2018.11.06 at 16h 09m 33s.xml">
372
+      <configuration name="InstructorTest" configurationId="JUnit" />
461 373
     </history-entry>
462 374
   </component>
463 375
   <component name="TimeTrackingManager">
464
-    <option name="totallyTimeSpent" value="32922000" />
376
+    <option name="totallyTimeSpent" value="33538000" />
465 377
   </component>
466 378
   <component name="TodoView">
467 379
     <todo-panel id="selected-file">
@@ -481,15 +393,15 @@
481 393
       <window_info id="Capture Tool" order="2" />
482 394
       <window_info id="Favorites" order="3" side_tool="true" />
483 395
       <window_info id="Image Layers" order="4" />
484
-      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.14351586" />
396
+      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.14524496" />
485 397
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
486 398
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
487
-      <window_info anchor="bottom" id="Terminal" order="1" weight="0.32777777" />
399
+      <window_info anchor="bottom" id="Terminal" order="1" weight="0.32686085" />
488 400
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
489 401
       <window_info anchor="bottom" id="Database Changes" order="3" show_stripe_button="false" />
490 402
       <window_info anchor="bottom" id="Message" order="4" />
491 403
       <window_info anchor="bottom" id="Find" order="5" />
492
-      <window_info active="true" anchor="bottom" id="Run" order="6" visible="true" weight="0.32901832" />
404
+      <window_info anchor="bottom" id="Run" order="6" visible="true" weight="0.32901832" />
493 405
       <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
494 406
       <window_info anchor="bottom" id="Messages" order="8" weight="0.22222222" />
495 407
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
@@ -582,12 +494,6 @@
582 494
       <provider selected="true" editor-type-id="text-editor">
583 495
         <state relative-caret-position="150">
584 496
           <caret line="10" column="36" lean-forward="true" selection-start-line="10" selection-start-column="36" selection-end-line="10" selection-end-column="36" />
585
-          <folding>
586
-            <element signature="e#168#169#0" expanded="true" />
587
-            <element signature="e#199#200#0" expanded="true" />
588
-            <element signature="e#334#335#0" expanded="true" />
589
-            <element signature="e#371#372#0" expanded="true" />
590
-          </folding>
591 497
         </state>
592 498
       </provider>
593 499
     </entry>
@@ -616,23 +522,10 @@
616 522
       <provider selected="true" editor-type-id="text-editor">
617 523
         <state relative-caret-position="282">
618 524
           <caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
619
-          <folding>
620
-            <element signature="imports" expanded="true" />
621
-          </folding>
622 525
         </state>
623 526
       </provider>
624 527
     </entry>
625 528
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonInterface.java" />
626
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
627
-      <provider selected="true" editor-type-id="text-editor">
628
-        <state relative-caret-position="180">
629
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
630
-          <folding>
631
-            <element signature="imports" expanded="true" />
632
-          </folding>
633
-        </state>
634
-      </provider>
635
-    </entry>
636 529
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
637 530
       <provider selected="true" editor-type-id="text-editor">
638 531
         <state relative-caret-position="120">
@@ -650,44 +543,39 @@
650 543
         </state>
651 544
       </provider>
652 545
     </entry>
653
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
546
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
654 547
       <provider selected="true" editor-type-id="text-editor">
655
-        <state relative-caret-position="290">
656
-          <caret line="37" column="40" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" />
548
+        <state relative-caret-position="1440">
549
+          <caret line="96" column="5" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" />
657 550
           <folding>
658
-            <element signature="e#653#654#0" expanded="true" />
659
-            <element signature="e#678#679#0" expanded="true" />
660
-            <element signature="e#709#710#0" expanded="true" />
661
-            <element signature="e#736#737#0" expanded="true" />
551
+            <element signature="imports" expanded="true" />
662 552
           </folding>
663 553
         </state>
664 554
       </provider>
665 555
     </entry>
666
-    <entry file="file://$PROJECT_DIR$/README.md">
667
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
668
-        <state split_layout="SECOND">
669
-          <first_editor />
670
-          <second_editor />
556
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PersonTest.java">
557
+      <provider selected="true" editor-type-id="text-editor">
558
+        <state relative-caret-position="285">
559
+          <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
671 560
         </state>
672 561
       </provider>
673 562
     </entry>
674
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
563
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
675 564
       <provider selected="true" editor-type-id="text-editor">
676
-        <state relative-caret-position="180">
677
-          <caret line="12" column="8" lean-forward="true" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="58" />
565
+        <state relative-caret-position="225">
566
+          <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
678 567
           <folding>
679 568
             <element signature="imports" expanded="true" />
569
+            <element signature="e#269#270#0" expanded="true" />
570
+            <element signature="e#324#325#0" expanded="true" />
680 571
           </folding>
681 572
         </state>
682 573
       </provider>
683 574
     </entry>
684
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
575
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
685 576
       <provider selected="true" editor-type-id="text-editor">
686
-        <state relative-caret-position="567">
687
-          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
688
-          <folding>
689
-            <element signature="imports" expanded="true" />
690
-          </folding>
577
+        <state relative-caret-position="405">
578
+          <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
691 579
         </state>
692 580
       </provider>
693 581
     </entry>
@@ -703,50 +591,55 @@
703 591
     </entry>
704 592
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
705 593
       <provider selected="true" editor-type-id="text-editor">
706
-        <state relative-caret-position="255">
707
-          <caret line="17" selection-start-line="17" selection-end-line="18" selection-end-column="51" />
594
+        <state relative-caret-position="-160">
595
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
708 596
           <folding>
709 597
             <element signature="imports" expanded="true" />
710 598
           </folding>
711 599
         </state>
712 600
       </provider>
713 601
     </entry>
714
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PersonTest.java">
602
+    <entry file="file://$PROJECT_DIR$/README.md">
603
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
604
+        <state split_layout="SECOND">
605
+          <first_editor />
606
+          <second_editor />
607
+        </state>
608
+      </provider>
609
+    </entry>
610
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
715 611
       <provider selected="true" editor-type-id="text-editor">
716
-        <state relative-caret-position="285">
717
-          <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
612
+        <state relative-caret-position="990">
613
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
718 614
           <folding>
719 615
             <element signature="imports" expanded="true" />
720 616
           </folding>
721 617
         </state>
722 618
       </provider>
723 619
     </entry>
724
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
620
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
725 621
       <provider selected="true" editor-type-id="text-editor">
726
-        <state relative-caret-position="225">
727
-          <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
728
-          <folding>
729
-            <element signature="imports" expanded="true" />
730
-            <element signature="e#269#270#0" expanded="true" />
731
-            <element signature="e#324#325#0" expanded="true" />
732
-          </folding>
622
+        <state relative-caret-position="290">
623
+          <caret line="37" column="40" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" />
733 624
         </state>
734 625
       </provider>
735 626
     </entry>
736
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
627
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
737 628
       <provider selected="true" editor-type-id="text-editor">
738
-        <state relative-caret-position="405">
739
-          <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
629
+        <state relative-caret-position="433">
630
+          <caret line="29" column="8" lean-forward="true" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
740 631
           <folding>
741 632
             <element signature="imports" expanded="true" />
633
+            <element signature="e#1093#1094#0" expanded="true" />
634
+            <element signature="e#1124#1125#0" expanded="true" />
742 635
           </folding>
743 636
         </state>
744 637
       </provider>
745 638
     </entry>
746
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
639
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
747 640
       <provider selected="true" editor-type-id="text-editor">
748
-        <state relative-caret-position="1440">
749
-          <caret line="96" column="5" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" />
641
+        <state relative-caret-position="419">
642
+          <caret line="28" column="36" lean-forward="true" selection-start-line="28" selection-start-column="36" selection-end-line="28" selection-end-column="36" />
750 643
           <folding>
751 644
             <element signature="imports" expanded="true" />
752 645
           </folding>

+ 0
- 8
src/main/java/io/zipcoder/interfaces/Instructors.java Wyświetl plik

@@ -16,14 +16,6 @@ public class Instructors extends People<Instructor> {
16 16
         final Instructor instructor = new Instructor(educator.getId(), educator.getName());
17 17
         instructorsList.add(instructor);
18 18
         }
19
-//        instructorsList = new ArrayList<Instructor>();
20
-//
21
-//        instructorsList.add(new Instructor(40, "Kris Younger"));
22
-//        instructorsList.add(new Instructor(41, "Nhu Nguyen"));
23
-//        instructorsList.add(new Instructor(42, "Wilhem Alcivar"));
24
-//        instructorsList.add(new Instructor(43, "L. Dolio Durant"));
25
-//        instructorsList.add(new Instructor(44, "Froilan Miranda"));
26
-//        instructorsList.add(new Instructor(45, "Leon Hunter"));
27 19
     }
28 20
 
29 21
     public static Instructors getInstance() {

+ 8
- 3
src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java Wyświetl plik

@@ -1,6 +1,5 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
-import java.lang.reflect.Array;
4 3
 import java.util.ArrayList;
5 4
 
6 5
 public final class ZipCodeWilmington {
@@ -18,11 +17,17 @@ public final class ZipCodeWilmington {
18 17
     }
19 18
 
20 19
     public void hostLecture(long id, double numberOfHours){
21
-        Instructor teacher = instructors.instructorsList.get(0);
20
+        Instructor instructor = null;
21
+
22
+        for (Instructor element : instructors.instructorsList) {
23
+            if (element.getID() == id) {
24
+                instructor = element;
25
+            }
26
+        }
22 27
 
23 28
         Learner[] cohort = cohortList.toArray(new Learner[cohortList.size()]);
24 29
 
25
-        teacher.lecture(cohort, numberOfHours);
30
+        instructor.lecture(cohort, numberOfHours);
26 31
     }
27 32
 
28 33