소스 검색

Rolled back to before 10 becuase I broke everything; now reaching step 10 again

NedRedmond 6 년 전
부모
커밋
3cbeb9cbaf
3개의 변경된 파일164개의 추가작업 그리고 211개의 파일을 삭제
  1. 138
    206
      .idea/workspace.xml
  2. 20
    0
      src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java
  3. 6
    5
      src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java

+ 138
- 206
.idea/workspace.xml 파일 보기

@@ -2,29 +2,8 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="8e76a78c-7b87-4795-997f-dbd651047f5b" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/interfaces-1.iml" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" afterDir="false" />
20
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" afterDir="false" />
21
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" afterDir="false" />
22
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" afterDir="false" />
23
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" afterDir="false" />
24
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" afterDir="false" />
25
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" afterDir="false" />
26
-      <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" />
27
-      <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" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
6
+      <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" />
28 7
     </list>
29 8
     <ignored path="$PROJECT_DIR$/target/" />
30 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -44,52 +23,45 @@
44 23
       <usages-collector id="statistics.file.extensions.open">
45 24
         <counts>
46 25
           <entry key="iml" value="1" />
47
-          <entry key="java" value="18" />
26
+          <entry key="java" value="20" />
48 27
           <entry key="xml" value="1" />
49 28
         </counts>
50 29
       </usages-collector>
51 30
       <usages-collector id="statistics.file.types.open">
52 31
         <counts>
53 32
           <entry key="IDEA_MODULE" value="1" />
54
-          <entry key="JAVA" value="18" />
33
+          <entry key="JAVA" value="20" />
55 34
           <entry key="XML" value="1" />
56 35
         </counts>
57 36
       </usages-collector>
58 37
       <usages-collector id="statistics.file.extensions.edit">
59 38
         <counts>
60
-          <entry key="java" value="5728" />
39
+          <entry key="java" value="6162" />
61 40
         </counts>
62 41
       </usages-collector>
63 42
       <usages-collector id="statistics.file.types.edit">
64 43
         <counts>
65
-          <entry key="JAVA" value="5728" />
44
+          <entry key="JAVA" value="6162" />
66 45
         </counts>
67 46
       </usages-collector>
68 47
     </session>
69 48
   </component>
70 49
   <component name="FileEditorManager">
71
-    <leaf>
50
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
72 51
       <file pinned="false" current-in-tab="false">
73
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
52
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
74 53
           <provider selected="true" editor-type-id="text-editor">
75
-            <state relative-caret-position="105">
76
-              <caret line="7" column="57" selection-start-line="7" selection-start-column="57" selection-end-line="7" selection-end-column="57" />
77
-              <folding>
78
-                <element signature="imports" expanded="true" />
79
-              </folding>
54
+            <state relative-caret-position="90">
55
+              <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
80 56
             </state>
81 57
           </provider>
82 58
         </entry>
83 59
       </file>
84 60
       <file pinned="false" current-in-tab="false">
85
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
61
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
86 62
           <provider selected="true" editor-type-id="text-editor">
87
-            <state relative-caret-position="60">
88
-              <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
89
-              <folding>
90
-                <element signature="e#125#126#0" expanded="true" />
91
-                <element signature="e#150#151#0" expanded="true" />
92
-              </folding>
63
+            <state relative-caret-position="30">
64
+              <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
93 65
             </state>
94 66
           </provider>
95 67
         </entry>
@@ -98,38 +70,37 @@
98 70
         <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
99 71
           <provider selected="true" editor-type-id="text-editor">
100 72
             <state relative-caret-position="135">
101
-              <caret line="9" column="36" lean-forward="true" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
102
-              <folding>
103
-                <element signature="e#197#198#0" expanded="true" />
104
-                <element signature="e#227#228#0" expanded="true" />
105
-              </folding>
73
+              <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
106 74
             </state>
107 75
           </provider>
108 76
         </entry>
109 77
       </file>
110 78
       <file pinned="false" current-in-tab="false">
111
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
79
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
112 80
           <provider selected="true" editor-type-id="text-editor">
113
-            <state relative-caret-position="195">
114
-              <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
81
+            <state relative-caret-position="90">
82
+              <caret line="7" column="57" selection-start-line="7" selection-start-column="57" selection-end-line="7" selection-end-column="57" />
83
+              <folding>
84
+                <element signature="imports" expanded="true" />
85
+              </folding>
115 86
             </state>
116 87
           </provider>
117 88
         </entry>
118 89
       </file>
119 90
       <file pinned="false" current-in-tab="false">
120
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
91
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
121 92
           <provider selected="true" editor-type-id="text-editor">
122
-            <state relative-caret-position="165">
123
-              <caret line="12" column="24" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
93
+            <state relative-caret-position="240">
94
+              <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
124 95
             </state>
125 96
           </provider>
126 97
         </entry>
127 98
       </file>
128
-      <file pinned="false" current-in-tab="true">
99
+      <file pinned="false" current-in-tab="false">
129 100
         <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
130 101
           <provider selected="true" editor-type-id="text-editor">
131
-            <state relative-caret-position="240">
132
-              <caret line="16" column="48" lean-forward="true" selection-start-line="16" selection-start-column="48" selection-end-line="16" selection-end-column="48" />
102
+            <state relative-caret-position="150">
103
+              <caret line="10" selection-start-line="10" selection-end-line="10" />
133 104
               <folding>
134 105
                 <element signature="imports" expanded="true" />
135 106
               </folding>
@@ -138,72 +109,41 @@
138 109
         </entry>
139 110
       </file>
140 111
       <file pinned="false" current-in-tab="false">
141
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
112
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
142 113
           <provider selected="true" editor-type-id="text-editor">
143
-            <state relative-caret-position="315">
144
-              <caret line="25" column="15" selection-start-line="25" selection-end-line="26" />
145
-              <folding>
146
-                <marker date="1541270715088" expanded="true" signature="135:199" ph="..." />
147
-              </folding>
114
+            <state relative-caret-position="45">
115
+              <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
148 116
             </state>
149 117
           </provider>
150 118
         </entry>
151 119
       </file>
152 120
       <file pinned="false" current-in-tab="false">
153
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
121
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
154 122
           <provider selected="true" editor-type-id="text-editor">
155
-            <state relative-caret-position="570">
156
-              <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
157
-              <folding>
158
-                <element signature="e#164#172#0" expanded="true" />
159
-                <element signature="e#203#204#0" expanded="true" />
160
-                <element signature="e#228#229#0" expanded="true" />
161
-                <element signature="e#279#280#0" expanded="true" />
162
-                <element signature="e#304#305#0" expanded="true" />
163
-                <element signature="e#331#332#0" expanded="true" />
164
-                <element signature="e#356#357#0" expanded="true" />
165
-                <element signature="e#433#434#0" expanded="true" />
166
-                <element signature="e#458#459#0" expanded="true" />
167
-                <element signature="e#786#787#0" expanded="true" />
168
-                <element signature="e#829#830#0" expanded="true" />
169
-                <element signature="e#882#883#0" expanded="true" />
170
-                <element signature="e#916#917#0" expanded="true" />
171
-              </folding>
123
+            <state relative-caret-position="30">
124
+              <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
172 125
             </state>
173 126
           </provider>
174 127
         </entry>
175 128
       </file>
176
-      <file pinned="false" current-in-tab="false">
177
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
129
+      <file pinned="false" current-in-tab="true">
130
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
178 131
           <provider selected="true" editor-type-id="text-editor">
179
-            <state relative-caret-position="180">
180
-              <caret line="12" selection-start-line="12" selection-end-line="12" />
132
+            <state relative-caret-position="195">
133
+              <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
181 134
               <folding>
182
-                <element signature="e#147#148#0" expanded="true" />
183
-                <element signature="e#172#173#0" expanded="true" />
184
-                <element signature="e#216#217#0" expanded="true" />
185
-                <element signature="e#300#301#0" expanded="true" />
186
-                <element signature="e#337#338#0" expanded="true" />
135
+                <element signature="e#225#226#0" expanded="true" />
136
+                <element signature="e#253#254#0" expanded="true" />
187 137
               </folding>
188 138
             </state>
189 139
           </provider>
190 140
         </entry>
191 141
       </file>
192 142
       <file pinned="false" current-in-tab="false">
193
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
143
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
194 144
           <provider selected="true" editor-type-id="text-editor">
195
-            <state relative-caret-position="210">
196
-              <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
197
-              <folding>
198
-                <element signature="e#191#192#0" expanded="true" />
199
-                <element signature="e#219#220#0" expanded="true" />
200
-                <element signature="e#104#105#0" expanded="true" />
201
-                <element signature="e#129#130#0" expanded="true" />
202
-                <element signature="e#182#183#0" expanded="true" />
203
-                <element signature="e#209#210#0" expanded="true" />
204
-                <element signature="e#249#250#0" expanded="true" />
205
-                <element signature="e#281#282#0" expanded="true" />
206
-              </folding>
145
+            <state relative-caret-position="420">
146
+              <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
207 147
             </state>
208 148
           </provider>
209 149
         </entry>
@@ -245,6 +185,7 @@
245 185
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
246 186
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
247 187
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
188
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
248 189
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
249 190
       </list>
250 191
     </option>
@@ -272,6 +213,7 @@
272 213
       <foldersAlwaysOnTop value="true" />
273 214
     </navigator>
274 215
     <panes>
216
+      <pane id="Scope" />
275 217
       <pane id="ProjectPane">
276 218
         <subPane>
277 219
           <expand>
@@ -330,14 +272,13 @@
330 272
           <select />
331 273
         </subPane>
332 274
       </pane>
333
-      <pane id="Scope" />
334 275
       <pane id="PackagesPane" />
335 276
     </panes>
336 277
   </component>
337 278
   <component name="PropertiesComponent">
338 279
     <property name="WebServerToolWindowFactoryState" value="false" />
339 280
     <property name="aspect.path.notification.shown" value="true" />
340
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541277209799" />
281
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541426832861" />
341 282
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
342 283
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
343 284
     <property name="project.structure.last.edited" value="Modules" />
@@ -362,7 +303,7 @@
362 303
       </list>
363 304
     </option>
364 305
   </component>
365
-  <component name="RunManager" selected="JUnit.InstructorsTest.testSingletonInstance">
306
+  <component name="RunManager" selected="JUnit.ZipCodeWilmingtonTest.testHostLecture">
366 307
     <configuration name="InstructorsTest.testInitializationSetupInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
367 308
       <module name="interfaces-1" />
368 309
       <extension name="coverage">
@@ -395,7 +336,7 @@
395 336
         <option name="Make" enabled="true" />
396 337
       </method>
397 338
     </configuration>
398
-    <configuration name="PeopleTest.testRemoveAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
339
+    <configuration name="StudentsTest.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
399 340
       <module name="interfaces-1" />
400 341
       <extension name="coverage">
401 342
         <pattern>
@@ -404,14 +345,14 @@
404 345
         </pattern>
405 346
       </extension>
406 347
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
407
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
408
-      <option name="METHOD_NAME" value="testRemoveAll" />
348
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
349
+      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
409 350
       <option name="TEST_OBJECT" value="method" />
410 351
       <method v="2">
411 352
         <option name="Make" enabled="true" />
412 353
       </method>
413 354
     </configuration>
414
-    <configuration name="StudentsTest.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
355
+    <configuration name="StudentsTest.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
415 356
       <module name="interfaces-1" />
416 357
       <extension name="coverage">
417 358
         <pattern>
@@ -421,13 +362,13 @@
421 362
       </extension>
422 363
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
423 364
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
424
-      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
365
+      <option name="METHOD_NAME" value="testSingletonInstance" />
425 366
       <option name="TEST_OBJECT" value="method" />
426 367
       <method v="2">
427 368
         <option name="Make" enabled="true" />
428 369
       </method>
429 370
     </configuration>
430
-    <configuration name="StudentsTest.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
371
+    <configuration name="ZipCodeWilmingtonTest.testHostLecture" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
431 372
       <module name="interfaces-1" />
432 373
       <extension name="coverage">
433 374
         <pattern>
@@ -436,27 +377,27 @@
436 377
         </pattern>
437 378
       </extension>
438 379
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
439
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
440
-      <option name="METHOD_NAME" value="testSingletonInstance" />
380
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
381
+      <option name="METHOD_NAME" value="testHostLecture" />
441 382
       <option name="TEST_OBJECT" value="method" />
442 383
       <method v="2">
443 384
         <option name="Make" enabled="true" />
444 385
       </method>
445 386
     </configuration>
446 387
     <list>
447
-      <item itemvalue="JUnit.PeopleTest.testRemoveAll" />
448 388
       <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
449 389
       <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
450 390
       <item itemvalue="JUnit.InstructorsTest.testSingletonInstance" />
451 391
       <item itemvalue="JUnit.InstructorsTest.testInitializationSetupInstructors" />
392
+      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture" />
452 393
     </list>
453 394
     <recent_temporary>
454 395
       <list>
396
+        <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture" />
455 397
         <item itemvalue="JUnit.InstructorsTest.testSingletonInstance" />
456 398
         <item itemvalue="JUnit.InstructorsTest.testInitializationSetupInstructors" />
457 399
         <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
458 400
         <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
459
-        <item itemvalue="JUnit.PeopleTest.testRemoveAll" />
460 401
       </list>
461 402
     </recent_temporary>
462 403
   </component>
@@ -507,10 +448,10 @@
507 448
     </history-entry>
508 449
   </component>
509 450
   <component name="TimeTrackingManager">
510
-    <option name="totallyTimeSpent" value="14351000" />
451
+    <option name="totallyTimeSpent" value="15183000" />
511 452
   </component>
512 453
   <component name="ToolWindowManager">
513
-    <frame x="0" y="0" width="1440" height="900" extended-state="6" />
454
+    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
514 455
     <editor active="true" />
515 456
     <layout>
516 457
       <window_info id="Image Layers" order="0" />
@@ -518,7 +459,7 @@
518 459
       <window_info id="UI Designer" order="2" />
519 460
       <window_info id="Learn" order="3" />
520 461
       <window_info id="Capture Tool" order="4" />
521
-      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.24964234" />
462
+      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.2532189" />
522 463
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
523 464
       <window_info id="Favorites" order="7" side_tool="true" />
524 465
       <window_info anchor="bottom" id="Terminal" order="0" />
@@ -543,6 +484,37 @@
543 484
       <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
544 485
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
545 486
     </layout>
487
+    <layout-to-restore>
488
+      <window_info id="Image Layers" order="0" />
489
+      <window_info id="Designer" order="1" />
490
+      <window_info id="UI Designer" order="2" />
491
+      <window_info id="Learn" order="3" />
492
+      <window_info id="Capture Tool" order="4" />
493
+      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.24964234" />
494
+      <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
495
+      <window_info id="Favorites" order="7" side_tool="true" />
496
+      <window_info anchor="bottom" id="Terminal" order="0" />
497
+      <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" />
498
+      <window_info anchor="bottom" id="Database Changes" order="2" show_stripe_button="false" />
499
+      <window_info anchor="bottom" id="Version Control" order="3" show_stripe_button="false" />
500
+      <window_info anchor="bottom" id="Message" order="4" />
501
+      <window_info anchor="bottom" id="Find" order="5" />
502
+      <window_info anchor="bottom" id="Run" order="6" weight="0.32891566" />
503
+      <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
504
+      <window_info active="true" anchor="bottom" id="Messages" order="8" visible="true" weight="0.32891566" />
505
+      <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
506
+      <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
507
+      <window_info anchor="bottom" id="TODO" order="11" />
508
+      <window_info anchor="right" id="Capture Analysis" order="0" />
509
+      <window_info anchor="right" id="Theme Preview" order="1" />
510
+      <window_info anchor="right" id="Database" order="2" />
511
+      <window_info anchor="right" id="Palette&#9;" order="3" />
512
+      <window_info anchor="right" id="Maven Projects" order="4" />
513
+      <window_info anchor="right" id="Palette" order="5" />
514
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
515
+      <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
516
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
517
+    </layout-to-restore>
546 518
   </component>
547 519
   <component name="TypeScriptGeneratedFilesManager">
548 520
     <option name="version" value="1" />
@@ -568,20 +540,7 @@
568 540
         </state>
569 541
       </provider>
570 542
     </entry>
571
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/Teacher.java">
572
-      <provider selected="true" editor-type-id="text-editor">
573
-        <state relative-caret-position="30">
574
-          <caret line="2" column="23" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="23" />
575
-        </state>
576
-      </provider>
577
-    </entry>
578
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
579
-      <provider selected="true" editor-type-id="text-editor">
580
-        <state relative-caret-position="135">
581
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
582
-        </state>
583
-      </provider>
584
-    </entry>
543
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/Teacher.java" />
585 544
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
586 545
       <provider selected="true" editor-type-id="text-editor">
587 546
         <state relative-caret-position="255">
@@ -614,36 +573,17 @@
614 573
     </entry>
615 574
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
616 575
       <provider selected="true" editor-type-id="text-editor">
617
-        <state relative-caret-position="360">
618
-          <caret line="113" column="49" selection-start-line="113" selection-start-column="49" selection-end-line="113" selection-end-column="49" />
576
+        <state relative-caret-position="165">
577
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
619 578
           <folding>
620 579
             <element signature="imports" expanded="true" />
621
-            <element signature="e#184#185#0" expanded="true" />
622
-            <element signature="e#219#220#0" expanded="true" />
623
-          </folding>
624
-        </state>
625
-      </provider>
626
-    </entry>
627
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
628
-      <provider selected="true" editor-type-id="text-editor">
629
-        <state relative-caret-position="210">
630
-          <caret line="14" column="5" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
631
-          <folding>
632
-            <element signature="e#191#192#0" expanded="true" />
633
-            <element signature="e#219#220#0" expanded="true" />
634
-            <element signature="e#104#105#0" expanded="true" />
635
-            <element signature="e#129#130#0" expanded="true" />
636
-            <element signature="e#182#183#0" expanded="true" />
637
-            <element signature="e#209#210#0" expanded="true" />
638
-            <element signature="e#249#250#0" expanded="true" />
639
-            <element signature="e#281#282#0" expanded="true" />
640 580
           </folding>
641 581
         </state>
642 582
       </provider>
643 583
     </entry>
644 584
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
645 585
       <provider selected="true" editor-type-id="text-editor">
646
-        <state relative-caret-position="105">
586
+        <state relative-caret-position="90">
647 587
           <caret line="7" column="57" selection-start-line="7" selection-start-column="57" selection-end-line="7" selection-end-column="57" />
648 588
           <folding>
649 589
             <element signature="imports" expanded="true" />
@@ -651,21 +591,10 @@
651 591
         </state>
652 592
       </provider>
653 593
     </entry>
654
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
655
-      <provider selected="true" editor-type-id="text-editor">
656
-        <state relative-caret-position="60">
657
-          <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
658
-          <folding>
659
-            <element signature="e#125#126#0" expanded="true" />
660
-            <element signature="e#150#151#0" expanded="true" />
661
-          </folding>
662
-        </state>
663
-      </provider>
664
-    </entry>
665 594
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
666 595
       <provider selected="true" editor-type-id="text-editor">
667
-        <state relative-caret-position="195">
668
-          <caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
596
+        <state relative-caret-position="240">
597
+          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
669 598
         </state>
670 599
       </provider>
671 600
     </entry>
@@ -679,70 +608,73 @@
679 608
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
680 609
       <provider selected="true" editor-type-id="text-editor">
681 610
         <state relative-caret-position="135">
682
-          <caret line="9" column="36" lean-forward="true" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
683
-          <folding>
684
-            <element signature="e#197#198#0" expanded="true" />
685
-            <element signature="e#227#228#0" expanded="true" />
686
-          </folding>
611
+          <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
612
+        </state>
613
+      </provider>
614
+    </entry>
615
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
616
+      <provider selected="true" editor-type-id="text-editor">
617
+        <state relative-caret-position="420">
618
+          <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
619
+        </state>
620
+      </provider>
621
+    </entry>
622
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
623
+      <provider selected="true" editor-type-id="text-editor">
624
+        <state relative-caret-position="315">
625
+          <caret line="25" column="15" selection-start-line="25" selection-end-line="26" />
626
+        </state>
627
+      </provider>
628
+    </entry>
629
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
630
+      <provider selected="true" editor-type-id="text-editor">
631
+        <state relative-caret-position="30">
632
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
687 633
         </state>
688 634
       </provider>
689 635
     </entry>
690 636
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
691 637
       <provider selected="true" editor-type-id="text-editor">
692
-        <state relative-caret-position="180">
693
-          <caret line="12" selection-start-line="12" selection-end-line="12" />
694
-          <folding>
695
-            <element signature="e#147#148#0" expanded="true" />
696
-            <element signature="e#172#173#0" expanded="true" />
697
-            <element signature="e#216#217#0" expanded="true" />
698
-            <element signature="e#300#301#0" expanded="true" />
699
-            <element signature="e#337#338#0" expanded="true" />
700
-          </folding>
638
+        <state relative-caret-position="30">
639
+          <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
701 640
         </state>
702 641
       </provider>
703 642
     </entry>
704
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
643
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
705 644
       <provider selected="true" editor-type-id="text-editor">
706
-        <state relative-caret-position="570">
707
-          <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" />
708
-          <folding>
709
-            <element signature="e#164#172#0" expanded="true" />
710
-            <element signature="e#203#204#0" expanded="true" />
711
-            <element signature="e#228#229#0" expanded="true" />
712
-            <element signature="e#279#280#0" expanded="true" />
713
-            <element signature="e#304#305#0" expanded="true" />
714
-            <element signature="e#331#332#0" expanded="true" />
715
-            <element signature="e#356#357#0" expanded="true" />
716
-            <element signature="e#433#434#0" expanded="true" />
717
-            <element signature="e#458#459#0" expanded="true" />
718
-            <element signature="e#786#787#0" expanded="true" />
719
-            <element signature="e#829#830#0" expanded="true" />
720
-            <element signature="e#882#883#0" expanded="true" />
721
-            <element signature="e#916#917#0" expanded="true" />
722
-          </folding>
645
+        <state relative-caret-position="90">
646
+          <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
723 647
         </state>
724 648
       </provider>
725 649
     </entry>
726
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
650
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
727 651
       <provider selected="true" editor-type-id="text-editor">
728
-        <state relative-caret-position="315">
729
-          <caret line="25" column="15" selection-start-line="25" selection-end-line="26" />
730
-          <folding>
731
-            <marker date="1541270715088" expanded="true" signature="135:199" ph="..." />
732
-          </folding>
652
+        <state relative-caret-position="45">
653
+          <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
733 654
         </state>
734 655
       </provider>
735 656
     </entry>
736 657
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
737 658
       <provider selected="true" editor-type-id="text-editor">
738
-        <state relative-caret-position="240">
739
-          <caret line="16" column="48" lean-forward="true" selection-start-line="16" selection-start-column="48" selection-end-line="16" selection-end-column="48" />
659
+        <state relative-caret-position="150">
660
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
740 661
           <folding>
741 662
             <element signature="imports" expanded="true" />
742 663
           </folding>
743 664
         </state>
744 665
       </provider>
745 666
     </entry>
667
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
668
+      <provider selected="true" editor-type-id="text-editor">
669
+        <state relative-caret-position="195">
670
+          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
671
+          <folding>
672
+            <element signature="e#225#226#0" expanded="true" />
673
+            <element signature="e#253#254#0" expanded="true" />
674
+          </folding>
675
+        </state>
676
+      </provider>
677
+    </entry>
746 678
   </component>
747 679
   <component name="masterDetails">
748 680
     <states>

+ 20
- 0
src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java 파일 보기

@@ -0,0 +1,20 @@
1
+package io.zipcoder.interfaces;
2
+
3
+public enum ZipCodeWilmington {
4
+    INSTANCE;
5
+
6
+    Students students = Students.getInstance();
7
+    Instructors instructors = Instructors.getInstance();
8
+
9
+    public void hostLecture(Teacher teacher, double numberOfHours) {
10
+        Student[] studentsArray = (Student[]) students.studentList.getArray();
11
+        teacher.lecture(studentsArray, numberOfHours);
12
+    }
13
+
14
+    public void hostLecture(long id, double numberOfHours) {
15
+        Student[] studentsArray = (Student[]) students.studentList.getArray();
16
+        Teacher teacher = (Teacher) instructors.instructorList.findByID(id);
17
+        teacher.lecture(studentsArray, numberOfHours);
18
+    }
19
+
20
+}

+ 6
- 5
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java 파일 보기

@@ -7,12 +7,13 @@ public class ZipCodeWilmingtonTest {
7 7
 
8 8
     @Test
9 9
     public void testHostLecture() {
10
-        Students students = Students.getInstance();
11
-        Student[] studentListArray = (Student[]) students.studentList.getArray();
10
+        ZipCodeWilmington zcw = ZipCodeWilmington.INSTANCE;
11
+        Student[] studentsArray = (Student[]) zcw.students.studentList.getArray();
12
+        Instructor[] instructorsArray = (Instructor[]) zcw.instructors.instructorList.getArray();
12 13
 
13
-        double before = studentListArray[0].getTotalStudyTime();
14
-        ZipCodeWilmington.hostLecture(1, students.studentList);
15
-        double after = studentListArray[0].getTotalStudyTime();
14
+        double before = studentsArray[0].getTotalStudyTime();
15
+        zcw.hostLecture(instructorsArray[0], 1);
16
+        double after = studentsArray[0].getTotalStudyTime();
16 17
 
17 18
         Assert.assertTrue(after-before == 1/39);
18 19
     }