Seth 6 vuotta sitten
vanhempi
commit
2f41cd0cc0

+ 117
- 74
.idea/workspace.xml Näytä tiedosto

@@ -1,12 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="043aad9b-f488-406e-94f4-e8cd787f123c" name="Default Changelist" comment="">
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/People.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" afterDir="false" />
7
-      <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" />
8
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" afterDir="false" />
9
-    </list>
4
+    <list default="true" id="043aad9b-f488-406e-94f4-e8cd787f123c" name="Default Changelist" comment="" />
10 5
     <ignored path="$PROJECT_DIR$/target/" />
11 6
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 7
     <option name="SHOW_DIALOG" value="false" />
@@ -28,25 +23,25 @@
28 23
       <usages-collector id="statistics.file.extensions.open">
29 24
         <counts>
30 25
           <entry key="class" value="3" />
31
-          <entry key="java" value="28" />
32
-          <entry key="md" value="1" />
26
+          <entry key="java" value="33" />
27
+          <entry key="md" value="2" />
33 28
         </counts>
34 29
       </usages-collector>
35 30
       <usages-collector id="statistics.file.types.open">
36 31
         <counts>
37 32
           <entry key="CLASS" value="3" />
38
-          <entry key="JAVA" value="28" />
39
-          <entry key="Markdown" value="1" />
33
+          <entry key="JAVA" value="33" />
34
+          <entry key="Markdown" value="2" />
40 35
         </counts>
41 36
       </usages-collector>
42 37
       <usages-collector id="statistics.file.extensions.edit">
43 38
         <counts>
44
-          <entry key="java" value="5767" />
39
+          <entry key="java" value="5902" />
45 40
         </counts>
46 41
       </usages-collector>
47 42
       <usages-collector id="statistics.file.types.edit">
48 43
         <counts>
49
-          <entry key="JAVA" value="5767" />
44
+          <entry key="JAVA" value="5902" />
50 45
         </counts>
51 46
       </usages-collector>
52 47
     </session>
@@ -56,8 +51,8 @@
56 51
       <file pinned="false" current-in-tab="false">
57 52
         <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
58 53
           <provider selected="true" editor-type-id="text-editor">
59
-            <state relative-caret-position="150">
60
-              <caret line="10" column="48" selection-start-line="10" selection-start-column="48" selection-end-line="10" selection-end-column="48" />
54
+            <state relative-caret-position="300">
55
+              <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="21" selection-end-column="46" />
61 56
               <folding>
62 57
                 <element signature="imports" expanded="true" />
63 58
               </folding>
@@ -77,14 +72,11 @@
77 72
           </provider>
78 73
         </entry>
79 74
       </file>
80
-      <file pinned="false" current-in-tab="false">
81
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
75
+      <file pinned="false" current-in-tab="true">
76
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
82 77
           <provider selected="true" editor-type-id="text-editor">
83
-            <state relative-caret-position="105">
84
-              <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
85
-              <folding>
86
-                <element signature="imports" expanded="true" />
87
-              </folding>
78
+            <state relative-caret-position="135">
79
+              <caret line="9" column="5" lean-forward="true" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
88 80
             </state>
89 81
           </provider>
90 82
         </entry>
@@ -101,11 +93,20 @@
101 93
           </provider>
102 94
         </entry>
103 95
       </file>
104
-      <file pinned="false" current-in-tab="true">
96
+      <file pinned="false" current-in-tab="false">
97
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
98
+          <provider selected="true" editor-type-id="text-editor">
99
+            <state relative-caret-position="135">
100
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
101
+            </state>
102
+          </provider>
103
+        </entry>
104
+      </file>
105
+      <file pinned="false" current-in-tab="false">
105 106
         <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
106 107
           <provider selected="true" editor-type-id="text-editor">
107
-            <state relative-caret-position="270">
108
-              <caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
108
+            <state relative-caret-position="285">
109
+              <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
109 110
               <folding>
110 111
                 <element signature="imports" expanded="true" />
111 112
               </folding>
@@ -114,6 +115,24 @@
114 115
         </entry>
115 116
       </file>
116 117
       <file pinned="false" current-in-tab="false">
118
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
119
+          <provider selected="true" editor-type-id="text-editor">
120
+            <state>
121
+              <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
122
+            </state>
123
+          </provider>
124
+        </entry>
125
+      </file>
126
+      <file pinned="false" current-in-tab="false">
127
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
128
+          <provider selected="true" editor-type-id="text-editor">
129
+            <state relative-caret-position="75">
130
+              <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
131
+            </state>
132
+          </provider>
133
+        </entry>
134
+      </file>
135
+      <file pinned="false" current-in-tab="false">
117 136
         <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
118 137
           <provider selected="true" editor-type-id="text-editor">
119 138
             <state relative-caret-position="225">
@@ -161,6 +180,8 @@
161 180
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" />
162 181
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
163 182
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
183
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
184
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
164 185
       </list>
165 186
     </option>
166 187
   </component>
@@ -170,9 +191,10 @@
170 191
     <detection-done>true</detection-done>
171 192
     <sorting>DEFINITION_ORDER</sorting>
172 193
   </component>
173
-  <component name="ProjectFrameBounds">
194
+  <component name="ProjectFrameBounds" extendedState="6">
195
+    <option name="x" value="109" />
174 196
     <option name="y" value="23" />
175
-    <option name="width" value="1130" />
197
+    <option name="width" value="1331" />
176 198
     <option name="height" value="806" />
177 199
   </component>
178 200
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -246,7 +268,7 @@
246 268
   <component name="PropertiesComponent">
247 269
     <property name="WebServerToolWindowFactoryState" value="false" />
248 270
     <property name="aspect.path.notification.shown" value="true" />
249
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541512823319" />
271
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541546163039" />
250 272
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
251 273
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
252 274
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -377,17 +399,11 @@
377 399
       <workItem from="1541370875087" duration="3031000" />
378 400
       <workItem from="1541424524484" duration="285000" />
379 401
       <workItem from="1541461069588" duration="897000" />
380
-      <workItem from="1541510807432" duration="1698000" />
402
+      <workItem from="1541510807432" duration="5470000" />
381 403
     </task>
382 404
     <servers />
383 405
   </component>
384 406
   <component name="TestHistory">
385
-    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 08h 32m 20s.xml">
386
-      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
387
-    </history-entry>
388
-    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 38m 05s.xml">
389
-      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
390
-    </history-entry>
391 407
     <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 39m 39s.xml">
392 408
       <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
393 409
     </history-entry>
@@ -412,15 +428,21 @@
412 428
     <history-entry file="InstructorsTest_testInstructorsSingleton - 2018.11.06 at 08h 52m 27s.xml">
413 429
       <configuration name="InstructorsTest.testInstructorsSingleton" configurationId="JUnit" />
414 430
     </history-entry>
431
+    <history-entry file="InstructorsTest_testInstructorsInitialization - 2018.11.06 at 09h 00m 17s.xml">
432
+      <configuration name="InstructorsTest.testInstructorsInitialization" configurationId="JUnit" />
433
+    </history-entry>
434
+    <history-entry file="InstructorsTest_testInstructorsInitialization - 2018.11.06 at 09h 00m 24s.xml">
435
+      <configuration name="InstructorsTest.testInstructorsInitialization" configurationId="JUnit" />
436
+    </history-entry>
415 437
   </component>
416 438
   <component name="TimeTrackingManager">
417
-    <option name="totallyTimeSpent" value="18025000" />
439
+    <option name="totallyTimeSpent" value="21797000" />
418 440
   </component>
419 441
   <component name="ToolWindowManager">
420
-    <frame x="0" y="23" width="1130" height="806" extended-state="0" />
442
+    <frame x="0" y="23" width="1431" height="806" extended-state="6" />
421 443
     <editor active="true" />
422 444
     <layout>
423
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26838234" />
445
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21022318" />
424 446
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
425 447
       <window_info id="Image Layers" order="2" />
426 448
       <window_info id="Designer" order="3" />
@@ -429,7 +451,7 @@
429 451
       <window_info id="Favorites" order="6" side_tool="true" />
430 452
       <window_info anchor="bottom" id="Message" order="0" />
431 453
       <window_info anchor="bottom" id="Find" order="1" />
432
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32913166" />
454
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32913166" />
433 455
       <window_info anchor="bottom" id="Debug" order="3" weight="0.39915967" />
434 456
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
435 457
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -500,20 +522,6 @@
500 522
         </state>
501 523
       </provider>
502 524
     </entry>
503
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
504
-      <provider selected="true" editor-type-id="text-editor">
505
-        <state>
506
-          <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
507
-        </state>
508
-      </provider>
509
-    </entry>
510
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
511
-      <provider selected="true" editor-type-id="text-editor">
512
-        <state relative-caret-position="75">
513
-          <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
514
-        </state>
515
-      </provider>
516
-    </entry>
517 525
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
518 526
       <provider selected="true" editor-type-id="text-editor">
519 527
         <state relative-caret-position="352">
@@ -565,6 +573,17 @@
565 573
         </state>
566 574
       </provider>
567 575
     </entry>
576
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
577
+      <provider selected="true" editor-type-id="text-editor">
578
+        <state relative-caret-position="225">
579
+          <caret line="15" column="56" lean-forward="true" selection-start-line="15" selection-start-column="56" selection-end-line="15" selection-end-column="56" />
580
+          <folding>
581
+            <element signature="e#244#245#0" expanded="true" />
582
+            <element signature="e#274#275#0" expanded="true" />
583
+          </folding>
584
+        </state>
585
+      </provider>
586
+    </entry>
568 587
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
569 588
       <provider selected="true" editor-type-id="text-editor">
570 589
         <state relative-caret-position="105">
@@ -575,57 +594,81 @@
575 594
         </state>
576 595
       </provider>
577 596
     </entry>
578
-    <entry file="file://$PROJECT_DIR$/README.md">
579
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
580
-        <state split_layout="SPLIT">
581
-          <first_editor relative-caret-position="210">
582
-            <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
583
-          </first_editor>
584
-          <second_editor />
597
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
598
+      <provider selected="true" editor-type-id="text-editor">
599
+        <state relative-caret-position="30">
600
+          <caret line="2" column="32" selection-start-line="2" selection-start-column="32" selection-end-line="2" selection-end-column="32" />
585 601
         </state>
586 602
       </provider>
587 603
     </entry>
588
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
604
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
589 605
       <provider selected="true" editor-type-id="text-editor">
590
-        <state relative-caret-position="75">
591
-          <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="60" />
606
+        <state relative-caret-position="285">
607
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
592 608
           <folding>
593 609
             <element signature="imports" expanded="true" />
594 610
           </folding>
595 611
         </state>
596 612
       </provider>
597 613
     </entry>
614
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
615
+      <provider selected="true" editor-type-id="text-editor">
616
+        <state relative-caret-position="75">
617
+          <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
618
+        </state>
619
+      </provider>
620
+    </entry>
621
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
622
+      <provider selected="true" editor-type-id="text-editor">
623
+        <state>
624
+          <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
625
+        </state>
626
+      </provider>
627
+    </entry>
598 628
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
599 629
       <provider selected="true" editor-type-id="text-editor">
600
-        <state relative-caret-position="150">
601
-          <caret line="10" column="48" selection-start-line="10" selection-start-column="48" selection-end-line="10" selection-end-column="48" />
630
+        <state relative-caret-position="300">
631
+          <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="21" selection-end-column="46" />
602 632
           <folding>
603 633
             <element signature="imports" expanded="true" />
604 634
           </folding>
605 635
         </state>
606 636
       </provider>
607 637
     </entry>
608
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
638
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
609 639
       <provider selected="true" editor-type-id="text-editor">
610
-        <state relative-caret-position="225">
611
-          <caret line="15" column="56" lean-forward="true" selection-start-line="15" selection-start-column="56" selection-end-line="15" selection-end-column="56" />
612
-          <folding>
613
-            <element signature="e#244#245#0" expanded="true" />
614
-            <element signature="e#274#275#0" expanded="true" />
615
-          </folding>
640
+        <state relative-caret-position="135">
641
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
616 642
         </state>
617 643
       </provider>
618 644
     </entry>
619
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
645
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
620 646
       <provider selected="true" editor-type-id="text-editor">
621
-        <state relative-caret-position="270">
622
-          <caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
647
+        <state relative-caret-position="75">
648
+          <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="60" />
623 649
           <folding>
624 650
             <element signature="imports" expanded="true" />
625 651
           </folding>
626 652
         </state>
627 653
       </provider>
628 654
     </entry>
655
+    <entry file="file://$PROJECT_DIR$/README.md">
656
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
657
+        <state split_layout="SPLIT">
658
+          <first_editor relative-caret-position="210">
659
+            <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
660
+          </first_editor>
661
+          <second_editor />
662
+        </state>
663
+      </provider>
664
+    </entry>
665
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
666
+      <provider selected="true" editor-type-id="text-editor">
667
+        <state relative-caret-position="135">
668
+          <caret line="9" column="5" lean-forward="true" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
669
+        </state>
670
+      </provider>
671
+    </entry>
629 672
   </component>
630 673
   <component name="masterDetails">
631 674
     <states>

+ 13
- 0
src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java Näytä tiedosto

@@ -0,0 +1,13 @@
1
+package io.zipcoder.interfaces;
2
+
3
+public final class ZipCodeWilmington {
4
+    private Students students;
5
+    private Instructors instructors;
6
+
7
+    public ZipCodeWilmington() {
8
+
9
+
10
+    }
11
+
12
+
13
+}

+ 12
- 0
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java Näytä tiedosto

@@ -0,0 +1,12 @@
1
+package io.zipcoder.interfaces;
2
+
3
+import org.junit.Test;
4
+
5
+public class ZipCodeWilmingtonTest {
6
+
7
+    @Test
8
+    public void testHostLecture() {
9
+
10
+
11
+    }
12
+}