Browse Source

Just part9.0 and 10 left

Nathan Hall 6 years ago
parent
commit
27ce33ed56

+ 141
- 115
.idea/workspace.xml View File

@@ -2,14 +2,12 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="bb34a630-99d6-43f1-88af-777f3bc41c8e" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" afterDir="false" />
9 7
       <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/io/zipcoder/interfaces/Instructor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
11
-      <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" />
12
-      <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" />
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" />
9
+      <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" />
10
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" afterDir="false" />
13 11
     </list>
14 12
     <ignored path="$PROJECT_DIR$/target/" />
15 13
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,30 +28,30 @@
30 28
       </usages-collector>
31 29
       <usages-collector id="statistics.file.extensions.open">
32 30
         <counts>
33
-          <entry key="java" value="36" />
31
+          <entry key="java" value="42" />
34 32
         </counts>
35 33
       </usages-collector>
36 34
       <usages-collector id="statistics.file.types.open">
37 35
         <counts>
38
-          <entry key="JAVA" value="36" />
36
+          <entry key="JAVA" value="42" />
39 37
         </counts>
40 38
       </usages-collector>
41 39
       <usages-collector id="statistics.file.extensions.edit">
42 40
         <counts>
43
-          <entry key="java" value="4396" />
41
+          <entry key="java" value="5067" />
44 42
         </counts>
45 43
       </usages-collector>
46 44
       <usages-collector id="statistics.file.types.edit">
47 45
         <counts>
48
-          <entry key="JAVA" value="4396" />
46
+          <entry key="JAVA" value="5067" />
49 47
         </counts>
50 48
       </usages-collector>
51 49
     </session>
52 50
   </component>
53 51
   <component name="FileEditorManager">
54
-    <splitter split-orientation="horizontal" split-proportion="0.51170146">
52
+    <splitter split-orientation="horizontal" split-proportion="0.59292036">
55 53
       <split-first>
56
-        <splitter split-orientation="horizontal" split-proportion="0.13773584">
54
+        <splitter split-orientation="horizontal" split-proportion="0.22431506">
57 55
           <split-first>
58 56
             <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
59 57
               <file pinned="false" current-in-tab="true">
@@ -70,23 +68,10 @@
70 68
           <split-second>
71 69
             <leaf>
72 70
               <file pinned="false" current-in-tab="false">
73
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
71
+                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
74 72
                   <provider selected="true" editor-type-id="text-editor">
75
-                    <state relative-caret-position="213">
76
-                      <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
77
-                      <folding>
78
-                        <element signature="imports" expanded="true" />
79
-                        <element signature="e#571#572#0" expanded="true" />
80
-                        <element signature="e#612#613#0" expanded="true" />
81
-                        <element signature="e#646#647#0" expanded="true" />
82
-                        <element signature="e#693#694#0" expanded="true" />
83
-                        <element signature="e#749#750#0" expanded="true" />
84
-                        <element signature="e#789#790#0" expanded="true" />
85
-                        <element signature="e#821#822#0" expanded="true" />
86
-                        <element signature="e#874#875#0" expanded="true" />
87
-                        <element signature="e#904#905#0" expanded="true" />
88
-                        <element signature="e#952#953#0" expanded="true" />
89
-                      </folding>
73
+                    <state relative-caret-position="30">
74
+                      <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
90 75
                     </state>
91 76
                   </provider>
92 77
                 </entry>
@@ -107,6 +92,21 @@
107 92
                 </entry>
108 93
               </file>
109 94
               <file pinned="false" current-in-tab="false">
95
+                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
96
+                  <provider selected="true" editor-type-id="text-editor">
97
+                    <state relative-caret-position="492">
98
+                      <caret line="63" selection-start-line="63" selection-end-line="63" />
99
+                      <folding>
100
+                        <element signature="imports" expanded="true" />
101
+                        <element signature="e#232#241#0" expanded="true" />
102
+                        <element signature="e#209#210#0" expanded="true" />
103
+                        <element signature="e#240#241#0" expanded="true" />
104
+                      </folding>
105
+                    </state>
106
+                  </provider>
107
+                </entry>
108
+              </file>
109
+              <file pinned="false" current-in-tab="false">
110 110
                 <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
111 111
                   <provider selected="true" editor-type-id="text-editor">
112 112
                     <state relative-caret-position="120">
@@ -120,30 +120,28 @@
120 120
                 </entry>
121 121
               </file>
122 122
               <file pinned="false" current-in-tab="false">
123
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
123
+                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
124 124
                   <provider selected="true" editor-type-id="text-editor">
125
-                    <state relative-caret-position="88">
126
-                      <caret line="9" column="4" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="57" />
125
+                    <state relative-caret-position="105">
126
+                      <caret line="7" column="24" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="24" />
127 127
                       <folding>
128 128
                         <element signature="imports" expanded="true" />
129
-                        <element signature="e#232#241#0" expanded="true" />
130
-                        <element signature="e#209#210#0" expanded="true" />
131
-                        <element signature="e#240#241#0" expanded="true" />
129
+                        <element signature="e#255#267#0" expanded="true" />
130
+                        <element signature="e#229#230#0" expanded="true" />
131
+                        <element signature="e#256#257#0" expanded="true" />
132 132
                       </folding>
133 133
                     </state>
134 134
                   </provider>
135 135
                 </entry>
136 136
               </file>
137 137
               <file pinned="false" current-in-tab="true">
138
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
138
+                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
139 139
                   <provider selected="true" editor-type-id="text-editor">
140
-                    <state relative-caret-position="253">
141
-                      <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
140
+                    <state relative-caret-position="30">
141
+                      <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
142 142
                       <folding>
143
-                        <element signature="imports" expanded="true" />
144
-                        <element signature="e#255#267#0" expanded="true" />
145
-                        <element signature="e#229#230#0" expanded="true" />
146
-                        <element signature="e#256#257#0" expanded="true" />
143
+                        <element signature="e#624#625#0" expanded="true" />
144
+                        <element signature="e#655#656#0" expanded="true" />
147 145
                       </folding>
148 146
                     </state>
149 147
                   </provider>
@@ -158,8 +156,8 @@
158 156
           <file pinned="false" current-in-tab="false">
159 157
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
160 158
               <provider selected="true" editor-type-id="text-editor">
161
-                <state relative-caret-position="218">
162
-                  <caret line="35" column="38" lean-forward="true" selection-start-line="35" selection-start-column="38" selection-end-line="35" selection-end-column="38" />
159
+                <state relative-caret-position="488">
160
+                  <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
163 161
                   <folding>
164 162
                     <element signature="imports" expanded="true" />
165 163
                   </folding>
@@ -191,10 +189,10 @@
191 189
               </provider>
192 190
             </entry>
193 191
           </file>
194
-          <file pinned="false" current-in-tab="true">
192
+          <file pinned="false" current-in-tab="false">
195 193
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
196 194
               <provider selected="true" editor-type-id="text-editor">
197
-                <state relative-caret-position="163">
195
+                <state relative-caret-position="195">
198 196
                   <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
199 197
                   <folding>
200 198
                     <element signature="imports" expanded="true" />
@@ -203,6 +201,15 @@
203 201
               </provider>
204 202
             </entry>
205 203
           </file>
204
+          <file pinned="false" current-in-tab="true">
205
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
206
+              <provider selected="true" editor-type-id="text-editor">
207
+                <state relative-caret-position="255">
208
+                  <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
209
+                </state>
210
+              </provider>
211
+            </entry>
212
+          </file>
206 213
         </leaf>
207 214
       </split-second>
208 215
     </splitter>
@@ -230,13 +237,15 @@
230 237
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
231 238
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" />
232 239
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
233
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
234
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
235 240
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
236 241
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" />
237 242
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
238 243
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
239 244
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
245
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
246
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
247
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
248
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
240 249
       </list>
241 250
     </option>
242 251
   </component>
@@ -254,10 +263,10 @@
254 263
     </option>
255 264
   </component>
256 265
   <component name="ProjectFrameBounds">
257
-    <option name="x" value="-299" />
258
-    <option name="y" value="-921" />
259
-    <option name="width" value="1858" />
260
-    <option name="height" value="792" />
266
+    <option name="x" value="-332" />
267
+    <option name="y" value="-1023" />
268
+    <option name="width" value="1902" />
269
+    <option name="height" value="929" />
261 270
   </component>
262 271
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
263 272
   <component name="ProjectView">
@@ -330,7 +339,7 @@
330 339
   <component name="PropertiesComponent">
331 340
     <property name="WebServerToolWindowFactoryState" value="false" />
332 341
     <property name="aspect.path.notification.shown" value="true" />
333
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542235063377" />
342
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542316323338" />
334 343
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
335 344
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
336 345
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -470,14 +479,11 @@
470 479
       <updated>1541925109764</updated>
471 480
       <workItem from="1541925113078" duration="5099000" />
472 481
       <workItem from="1541965822791" duration="598000" />
473
-      <workItem from="1542139054328" duration="20040000" />
482
+      <workItem from="1542139054328" duration="29492000" />
474 483
     </task>
475 484
     <servers />
476 485
   </component>
477 486
   <component name="TestHistory">
478
-    <history-entry file="PeopleTest_findByIdTest - 2018.11.14 at 13h 48m 10s.xml">
479
-      <configuration name="PeopleTest.findByIdTest" configurationId="JUnit" />
480
-    </history-entry>
481 487
     <history-entry file="PeopleTest_findByIdTest - 2018.11.14 at 13h 52m 03s.xml">
482 488
       <configuration name="PeopleTest.findByIdTest" configurationId="JUnit" />
483 489
     </history-entry>
@@ -505,15 +511,17 @@
505 511
     <history-entry file="StudentsTest_StudentsTest - 2018.11.14 at 17h 28m 11s.xml">
506 512
       <configuration name="StudentsTest.StudentsTest" configurationId="JUnit" />
507 513
     </history-entry>
514
+    <history-entry file="InstructorsTest_InstructorsTest - 2018.11.14 at 17h 37m 47s.xml">
515
+      <configuration name="InstructorsTest.InstructorsTest" configurationId="JUnit" />
516
+    </history-entry>
508 517
   </component>
509 518
   <component name="TimeTrackingManager">
510
-    <option name="totallyTimeSpent" value="25737000" />
519
+    <option name="totallyTimeSpent" value="35189000" />
511 520
   </component>
512 521
   <component name="ToolWindowManager">
513
-    <frame x="-299" y="-921" width="1858" height="792" extended-state="0" />
514
-    <editor active="true" />
522
+    <frame x="-332" y="-1023" width="1902" height="929" extended-state="0" />
515 523
     <layout>
516
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12940529" />
524
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.088709675" />
517 525
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
518 526
       <window_info id="Image Layers" order="2" />
519 527
       <window_info id="Designer" order="3" />
@@ -522,14 +530,14 @@
522 530
       <window_info id="Favorites" order="6" side_tool="true" />
523 531
       <window_info anchor="bottom" id="Message" order="0" />
524 532
       <window_info anchor="bottom" id="Find" order="1" />
525
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.37961596" />
533
+      <window_info anchor="bottom" id="Run" order="2" weight="0.37961596" />
526 534
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
527 535
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
528 536
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
529 537
       <window_info anchor="bottom" id="TODO" order="6" />
530 538
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
531 539
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
532
-      <window_info anchor="bottom" id="Terminal" order="9" weight="0.10487445" />
540
+      <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.17199017" />
533 541
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
534 542
       <window_info anchor="bottom" id="Messages" order="11" weight="0.3264402" />
535 543
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -605,13 +613,6 @@
605 613
         </state>
606 614
       </provider>
607 615
     </entry>
608
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
609
-      <provider selected="true" editor-type-id="text-editor">
610
-        <state relative-caret-position="30">
611
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
612
-        </state>
613
-      </provider>
614
-    </entry>
615 616
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
616 617
       <provider selected="true" editor-type-id="text-editor">
617 618
         <state relative-caret-position="105">
@@ -622,53 +623,43 @@
622 623
         </state>
623 624
       </provider>
624 625
     </entry>
625
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
626
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
626 627
       <provider selected="true" editor-type-id="text-editor">
627
-        <state relative-caret-position="213">
628
-          <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
629
-          <folding>
630
-            <element signature="imports" expanded="true" />
631
-            <element signature="e#571#572#0" expanded="true" />
632
-            <element signature="e#612#613#0" expanded="true" />
633
-            <element signature="e#646#647#0" expanded="true" />
634
-            <element signature="e#693#694#0" expanded="true" />
635
-            <element signature="e#749#750#0" expanded="true" />
636
-            <element signature="e#789#790#0" expanded="true" />
637
-            <element signature="e#821#822#0" expanded="true" />
638
-            <element signature="e#874#875#0" expanded="true" />
639
-            <element signature="e#904#905#0" expanded="true" />
640
-            <element signature="e#952#953#0" expanded="true" />
641
-          </folding>
628
+        <state relative-caret-position="75">
629
+          <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
642 630
         </state>
643 631
       </provider>
644 632
     </entry>
645
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
633
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
646 634
       <provider selected="true" editor-type-id="text-editor">
647
-        <state relative-caret-position="218">
648
-          <caret line="35" column="38" lean-forward="true" selection-start-line="35" selection-start-column="38" selection-end-line="35" selection-end-column="38" />
635
+        <state relative-caret-position="330">
636
+          <caret line="22" column="5" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="22" selection-end-column="5" />
649 637
           <folding>
650 638
             <element signature="imports" expanded="true" />
651 639
           </folding>
652 640
         </state>
653 641
       </provider>
654 642
     </entry>
655
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
643
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
656 644
       <provider selected="true" editor-type-id="text-editor">
657
-        <state relative-caret-position="165">
658
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
645
+        <state relative-caret-position="488">
646
+          <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
659 647
           <folding>
660
-            <element signature="e#171#172#0" expanded="true" />
661
-            <element signature="e#202#203#0" expanded="true" />
662
-            <element signature="e#263#264#0" expanded="true" />
663
-            <element signature="e#300#301#0" expanded="true" />
648
+            <element signature="imports" expanded="true" />
664 649
           </folding>
665 650
         </state>
666 651
       </provider>
667 652
     </entry>
668
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
653
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
669 654
       <provider selected="true" editor-type-id="text-editor">
670
-        <state relative-caret-position="75">
671
-          <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
655
+        <state relative-caret-position="105">
656
+          <caret line="7" column="24" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="24" />
657
+          <folding>
658
+            <element signature="imports" expanded="true" />
659
+            <element signature="e#255#267#0" expanded="true" />
660
+            <element signature="e#229#230#0" expanded="true" />
661
+            <element signature="e#256#257#0" expanded="true" />
662
+          </folding>
672 663
         </state>
673 664
       </provider>
674 665
     </entry>
@@ -683,20 +674,54 @@
683 674
         </state>
684 675
       </provider>
685 676
     </entry>
686
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
677
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
687 678
       <provider selected="true" editor-type-id="text-editor">
688
-        <state relative-caret-position="330">
689
-          <caret line="22" column="5" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="22" selection-end-column="5" />
679
+        <state relative-caret-position="253">
680
+          <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
690 681
           <folding>
691 682
             <element signature="imports" expanded="true" />
683
+            <element signature="e#571#572#0" expanded="true" />
684
+            <element signature="e#612#613#0" expanded="true" />
685
+            <element signature="e#646#647#0" expanded="true" />
686
+            <element signature="e#693#694#0" expanded="true" />
687
+            <element signature="e#749#750#0" expanded="true" />
688
+            <element signature="e#789#790#0" expanded="true" />
689
+            <element signature="e#821#822#0" expanded="true" />
690
+            <element signature="e#874#875#0" expanded="true" />
691
+            <element signature="e#904#905#0" expanded="true" />
692
+            <element signature="e#952#953#0" expanded="true" />
692 693
           </folding>
693 694
         </state>
694 695
       </provider>
695 696
     </entry>
697
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
698
+      <provider selected="true" editor-type-id="text-editor">
699
+        <state relative-caret-position="195">
700
+          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
701
+          <folding>
702
+            <element signature="imports" expanded="true" />
703
+          </folding>
704
+        </state>
705
+      </provider>
706
+    </entry>
707
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
708
+      <provider selected="true" editor-type-id="text-editor">
709
+        <state relative-caret-position="255">
710
+          <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
711
+        </state>
712
+      </provider>
713
+    </entry>
714
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
715
+      <provider selected="true" editor-type-id="text-editor">
716
+        <state relative-caret-position="30">
717
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
718
+        </state>
719
+      </provider>
720
+    </entry>
696 721
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
697 722
       <provider selected="true" editor-type-id="text-editor">
698
-        <state relative-caret-position="88">
699
-          <caret line="9" column="4" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="57" />
723
+        <state relative-caret-position="492">
724
+          <caret line="63" selection-start-line="63" selection-end-line="63" />
700 725
           <folding>
701 726
             <element signature="imports" expanded="true" />
702 727
             <element signature="e#232#241#0" expanded="true" />
@@ -706,25 +731,26 @@
706 731
         </state>
707 732
       </provider>
708 733
     </entry>
709
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
734
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
710 735
       <provider selected="true" editor-type-id="text-editor">
711
-        <state relative-caret-position="253">
712
-          <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
736
+        <state relative-caret-position="165">
737
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
713 738
           <folding>
714
-            <element signature="imports" expanded="true" />
715
-            <element signature="e#255#267#0" expanded="true" />
716
-            <element signature="e#229#230#0" expanded="true" />
717
-            <element signature="e#256#257#0" expanded="true" />
739
+            <element signature="e#171#172#0" expanded="true" />
740
+            <element signature="e#202#203#0" expanded="true" />
741
+            <element signature="e#263#264#0" expanded="true" />
742
+            <element signature="e#300#301#0" expanded="true" />
718 743
           </folding>
719 744
         </state>
720 745
       </provider>
721 746
     </entry>
722
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
747
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
723 748
       <provider selected="true" editor-type-id="text-editor">
724
-        <state relative-caret-position="163">
725
-          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
749
+        <state relative-caret-position="30">
750
+          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
726 751
           <folding>
727
-            <element signature="imports" expanded="true" />
752
+            <element signature="e#624#625#0" expanded="true" />
753
+            <element signature="e#655#656#0" expanded="true" />
728 754
           </folding>
729 755
         </state>
730 756
       </provider>

+ 1
- 1
src/main/java/io/zipcoder/interfaces/Instructors.java View File

@@ -9,7 +9,7 @@ public class Instructors extends Instructor {
9 9
 
10 10
     List<Instructor> instructorList = new ArrayList<Instructor>();
11 11
 
12
-    private Instructors(){
12
+    Instructors(){
13 13
         instructorList.add(new Instructor(1, "Kris"));
14 14
         instructorList.add(new Instructor(2, "Nhu"));
15 15
         instructorList.add(new Instructor(3, "Dolio"));

+ 5
- 2
src/main/java/io/zipcoder/interfaces/Students.java View File

@@ -3,14 +3,14 @@ package io.zipcoder.interfaces;
3 3
 import java.util.ArrayList;
4 4
 import java.util.List;
5 5
 
6
-public class Students extends People {
6
+public class Students extends People implements Learner {
7 7
 
8 8
     private static final Students INSTANCE = new Students();
9 9
 
10 10
     List<Student> studentList = new ArrayList<Student>();
11 11
 
12 12
 
13
-    private Students () {
13
+    Students() {
14 14
 
15 15
         studentList.add(new Student(1, "Ned Redmond"));
16 16
         studentList.add(new Student(2, "Seth Abrams"));
@@ -60,4 +60,7 @@ public class Students extends People {
60 60
     }
61 61
 
62 62
 
63
+    public void learn(double numberOfHours) {
64
+
65
+    }
63 66
 }

+ 31
- 0
src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java View File

@@ -0,0 +1,31 @@
1
+package io.zipcoder.interfaces;
2
+
3
+public class ZipCodeWilmington {
4
+
5
+    private static final ZipCodeWilmington INSTANCE = new ZipCodeWilmington();
6
+    private Learner[] cohort;
7
+
8
+    private ZipCodeWilmington() {
9
+
10
+    }
11
+
12
+    private static final Students students = new Students();
13
+    private static final Instructors instructors = new Instructors();
14
+
15
+    public void hostLecture(Teacher teacher, double numberOfHours) {
16
+
17
+
18
+        instructors.lecture((Learner[]) students.studentList.toArray(), numberOfHours);
19
+
20
+    }
21
+
22
+    public void hostLecture(long id, double numberOfHours) {
23
+        instructors.getINSTANCE().lecture(cohort, numberOfHours);
24
+
25
+    }
26
+
27
+
28
+    public static ZipCodeWilmington getINSTANCE() {
29
+        return INSTANCE;
30
+    }
31
+}

+ 1
- 1
src/test/java/io/zipcoder/interfaces/InstructorTest.java View File

@@ -54,7 +54,7 @@ public class InstructorTest {
54 54
 
55 55
         instructor.lecture(learners, 100);
56 56
 
57
-        double expected = 55;
57
+        double expected = 50;
58 58
         double actual = student.totalStudyTime;
59 59
 
60 60
 

+ 23
- 0
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java View File

@@ -0,0 +1,23 @@
1
+package io.zipcoder.interfaces;
2
+
3
+import org.junit.Test;
4
+
5
+import static org.junit.Assert.*;
6
+
7
+public class ZipCodeWilmingtonTest {
8
+
9
+
10
+    ZipCodeWilmington zcw = ZipCodeWilmington.getINSTANCE();
11
+    long id = 1;
12
+    double numHours = 39;
13
+
14
+    @Test
15
+    public void testHostLecture() {
16
+
17
+        zcw.hostLecture(id, numHours);
18
+
19
+        double expected = 1;
20
+//        double actual = zcw.
21
+
22
+    }
23
+}