Seth 6 лет назад
Родитель
Сommit
baa95391e1

+ 187
- 139
.idea/workspace.xml Просмотреть файл

@@ -2,6 +2,8 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 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" />
5 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" />
6 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" />
7 9
     </list>
@@ -16,39 +18,46 @@
16 18
     <session id="1437882583">
17 19
       <usages-collector id="statistics.lifecycle.project">
18 20
         <counts>
21
+          <entry key="project.closed" value="4" />
19 22
           <entry key="project.open.time.0" value="1" />
20
-          <entry key="project.opened" value="1" />
23
+          <entry key="project.open.time.1" value="3" />
24
+          <entry key="project.open.time.2" value="1" />
25
+          <entry key="project.opened" value="5" />
21 26
         </counts>
22 27
       </usages-collector>
23 28
       <usages-collector id="statistics.file.extensions.open">
24 29
         <counts>
25
-          <entry key="java" value="24" />
30
+          <entry key="class" value="3" />
31
+          <entry key="java" value="28" />
32
+          <entry key="md" value="1" />
26 33
         </counts>
27 34
       </usages-collector>
28 35
       <usages-collector id="statistics.file.types.open">
29 36
         <counts>
30
-          <entry key="JAVA" value="24" />
37
+          <entry key="CLASS" value="3" />
38
+          <entry key="JAVA" value="28" />
39
+          <entry key="Markdown" value="1" />
31 40
         </counts>
32 41
       </usages-collector>
33 42
       <usages-collector id="statistics.file.extensions.edit">
34 43
         <counts>
35
-          <entry key="java" value="4542" />
44
+          <entry key="java" value="5767" />
36 45
         </counts>
37 46
       </usages-collector>
38 47
       <usages-collector id="statistics.file.types.edit">
39 48
         <counts>
40
-          <entry key="JAVA" value="4542" />
49
+          <entry key="JAVA" value="5767" />
41 50
         </counts>
42 51
       </usages-collector>
43 52
     </session>
44 53
   </component>
45 54
   <component name="FileEditorManager">
46
-    <leaf>
55
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
47 56
       <file pinned="false" current-in-tab="false">
48 57
         <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
49 58
           <provider selected="true" editor-type-id="text-editor">
50
-            <state relative-caret-position="330">
51
-              <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
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" />
52 61
               <folding>
53 62
                 <element signature="imports" expanded="true" />
54 63
               </folding>
@@ -56,14 +65,13 @@
56 65
           </provider>
57 66
         </entry>
58 67
       </file>
59
-      <file pinned="false" current-in-tab="true">
68
+      <file pinned="false" current-in-tab="false">
60 69
         <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
61 70
           <provider selected="true" editor-type-id="text-editor">
62
-            <state relative-caret-position="327">
63
-              <caret line="52" column="1" lean-forward="true" selection-start-line="52" selection-start-column="1" selection-end-line="52" selection-end-column="1" />
71
+            <state relative-caret-position="75">
72
+              <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="60" />
64 73
               <folding>
65
-                <element signature="e#194#195#0" expanded="true" />
66
-                <element signature="e#225#226#0" expanded="true" />
74
+                <element signature="imports" expanded="true" />
67 75
               </folding>
68 76
             </state>
69 77
           </provider>
@@ -72,34 +80,32 @@
72 80
       <file pinned="false" current-in-tab="false">
73 81
         <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
74 82
           <provider selected="true" editor-type-id="text-editor">
75
-            <state relative-caret-position="704">
76
-              <caret line="50" column="27" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" />
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" />
77 85
               <folding>
78 86
                 <element signature="imports" expanded="true" />
79
-                <element signature="e#984#985#0" expanded="true" />
80
-                <element signature="e#1018#1019#0" expanded="true" />
81 87
               </folding>
82 88
             </state>
83 89
           </provider>
84 90
         </entry>
85 91
       </file>
86 92
       <file pinned="false" current-in-tab="false">
87
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
88
-          <provider selected="true" editor-type-id="text-editor">
89
-            <state relative-caret-position="177">
90
-              <caret line="42" column="60" lean-forward="true" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
91
-              <folding>
92
-                <element signature="imports" expanded="true" />
93
-              </folding>
93
+        <entry file="file://$PROJECT_DIR$/README.md">
94
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
95
+            <state split_layout="SPLIT">
96
+              <first_editor relative-caret-position="210">
97
+                <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
98
+              </first_editor>
99
+              <second_editor />
94 100
             </state>
95 101
           </provider>
96 102
         </entry>
97 103
       </file>
98
-      <file pinned="false" current-in-tab="false">
99
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
104
+      <file pinned="false" current-in-tab="true">
105
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
100 106
           <provider selected="true" editor-type-id="text-editor">
101
-            <state relative-caret-position="375">
102
-              <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
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" />
103 109
               <folding>
104 110
                 <element signature="imports" expanded="true" />
105 111
               </folding>
@@ -108,27 +114,18 @@
108 114
         </entry>
109 115
       </file>
110 116
       <file pinned="false" current-in-tab="false">
111
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
117
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
112 118
           <provider selected="true" editor-type-id="text-editor">
113
-            <state relative-caret-position="75">
114
-              <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
119
+            <state relative-caret-position="225">
120
+              <caret line="15" column="56" lean-forward="true" selection-start-line="15" selection-start-column="56" selection-end-line="15" selection-end-column="56" />
115 121
               <folding>
116
-                <element signature="e#126#127#0" expanded="true" />
117
-                <element signature="e#151#152#0" expanded="true" />
122
+                <element signature="e#244#245#0" expanded="true" />
123
+                <element signature="e#274#275#0" expanded="true" />
118 124
               </folding>
119 125
             </state>
120 126
           </provider>
121 127
         </entry>
122 128
       </file>
123
-      <file pinned="false" current-in-tab="false">
124
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
125
-          <provider selected="true" editor-type-id="text-editor">
126
-            <state>
127
-              <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
128
-            </state>
129
-          </provider>
130
-        </entry>
131
-      </file>
132 129
     </leaf>
133 130
   </component>
134 131
   <component name="FileTemplateManagerImpl">
@@ -139,6 +136,11 @@
139 136
       </list>
140 137
     </option>
141 138
   </component>
139
+  <component name="FindInProjectRecents">
140
+    <findStrings>
141
+      <find>studentList</find>
142
+    </findStrings>
143
+  </component>
142 144
   <component name="Git.Settings">
143 145
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
144 146
   </component>
@@ -155,8 +157,10 @@
155 157
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
156 158
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
157 159
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
158
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" />
159 160
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
161
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" />
162
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
163
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
160 164
       </list>
161 165
     </option>
162 166
   </component>
@@ -167,8 +171,7 @@
167 171
     <sorting>DEFINITION_ORDER</sorting>
168 172
   </component>
169 173
   <component name="ProjectFrameBounds">
170
-    <option name="x" value="76" />
171
-    <option name="y" value="-973" />
174
+    <option name="y" value="23" />
172 175
     <option name="width" value="1130" />
173 176
     <option name="height" value="806" />
174 177
   </component>
@@ -178,7 +181,6 @@
178 181
       <foldersAlwaysOnTop value="true" />
179 182
     </navigator>
180 183
     <panes>
181
-      <pane id="PackagesPane" />
182 184
       <pane id="ProjectPane">
183 185
         <subPane>
184 186
           <expand>
@@ -237,17 +239,18 @@
237 239
           <select />
238 240
         </subPane>
239 241
       </pane>
242
+      <pane id="PackagesPane" />
240 243
       <pane id="Scope" />
241 244
     </panes>
242 245
   </component>
243 246
   <component name="PropertiesComponent">
244 247
     <property name="WebServerToolWindowFactoryState" value="false" />
245 248
     <property name="aspect.path.notification.shown" value="true" />
246
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541283811702" />
249
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541512823319" />
247 250
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
248 251
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
249 252
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
250
-    <property name="project.structure.last.edited" value="Modules" />
253
+    <property name="project.structure.last.edited" value="Project" />
251 254
     <property name="project.structure.proportion" value="0.15" />
252 255
     <property name="project.structure.side.proportion" value="0.2" />
253 256
     <property name="settings.editor.selected.configurable" value="reference.projectsettings.compiler.javacompiler" />
@@ -264,8 +267,8 @@
264 267
       </list>
265 268
     </option>
266 269
   </component>
267
-  <component name="RunManager" selected="JUnit.StudentsTest.testSingletonInstance">
268
-    <configuration name="PeopleTest.testFindById" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
270
+  <component name="RunManager" selected="JUnit.InstructorsTest.testInstructorsInitialization">
271
+    <configuration name="InstructorsTest.testInstructorsInitialization" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
269 272
       <module name="interfaces-1" />
270 273
       <extension name="coverage">
271 274
         <pattern>
@@ -274,14 +277,14 @@
274 277
         </pattern>
275 278
       </extension>
276 279
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
277
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
278
-      <option name="METHOD_NAME" value="testFindById" />
280
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
281
+      <option name="METHOD_NAME" value="testInstructorsInitialization" />
279 282
       <option name="TEST_OBJECT" value="method" />
280 283
       <method v="2">
281 284
         <option name="Make" enabled="true" />
282 285
       </method>
283 286
     </configuration>
284
-    <configuration name="PeopleTest.testGetArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
287
+    <configuration name="InstructorsTest.testInstructorsSingleton" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
285 288
       <module name="interfaces-1" />
286 289
       <extension name="coverage">
287 290
         <pattern>
@@ -290,14 +293,14 @@
290 293
         </pattern>
291 294
       </extension>
292 295
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
293
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
294
-      <option name="METHOD_NAME" value="testGetArray" />
296
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
297
+      <option name="METHOD_NAME" value="testInstructorsSingleton" />
295 298
       <option name="TEST_OBJECT" value="method" />
296 299
       <method v="2">
297 300
         <option name="Make" enabled="true" />
298 301
       </method>
299 302
     </configuration>
300
-    <configuration name="PeopleTest.testRemoveAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
303
+    <configuration name="PeopleTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
301 304
       <module name="interfaces-1" />
302 305
       <extension name="coverage">
303 306
         <pattern>
@@ -307,13 +310,11 @@
307 310
       </extension>
308 311
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
309 312
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
310
-      <option name="METHOD_NAME" value="testRemoveAll" />
311
-      <option name="TEST_OBJECT" value="method" />
312 313
       <method v="2">
313 314
         <option name="Make" enabled="true" />
314 315
       </method>
315 316
     </configuration>
316
-    <configuration name="StudentsTest.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
317
+    <configuration name="PeopleTest.testAdd" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
317 318
       <module name="interfaces-1" />
318 319
       <extension name="coverage">
319 320
         <pattern>
@@ -322,14 +323,14 @@
322 323
         </pattern>
323 324
       </extension>
324 325
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
325
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
326
-      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
326
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
327
+      <option name="METHOD_NAME" value="testAdd" />
327 328
       <option name="TEST_OBJECT" value="method" />
328 329
       <method v="2">
329 330
         <option name="Make" enabled="true" />
330 331
       </method>
331 332
     </configuration>
332
-    <configuration name="StudentsTest.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
333
+    <configuration name="StudentsTest.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
333 334
       <module name="interfaces-1" />
334 335
       <extension name="coverage">
335 336
         <pattern>
@@ -339,26 +340,26 @@
339 340
       </extension>
340 341
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
341 342
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
342
-      <option name="METHOD_NAME" value="testSingletonInstance" />
343
+      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
343 344
       <option name="TEST_OBJECT" value="method" />
344 345
       <method v="2">
345 346
         <option name="Make" enabled="true" />
346 347
       </method>
347 348
     </configuration>
348 349
     <list>
349
-      <item itemvalue="JUnit.PeopleTest.testFindById" />
350
-      <item itemvalue="JUnit.PeopleTest.testGetArray" />
351
-      <item itemvalue="JUnit.PeopleTest.testRemoveAll" />
352 350
       <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
353
-      <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
351
+      <item itemvalue="JUnit.PeopleTest.testAdd" />
352
+      <item itemvalue="JUnit.PeopleTest" />
353
+      <item itemvalue="JUnit.InstructorsTest.testInstructorsSingleton" />
354
+      <item itemvalue="JUnit.InstructorsTest.testInstructorsInitialization" />
354 355
     </list>
355 356
     <recent_temporary>
356 357
       <list>
357
-        <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
358
+        <item itemvalue="JUnit.InstructorsTest.testInstructorsInitialization" />
359
+        <item itemvalue="JUnit.InstructorsTest.testInstructorsSingleton" />
358 360
         <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
359
-        <item itemvalue="JUnit.PeopleTest.testRemoveAll" />
360
-        <item itemvalue="JUnit.PeopleTest.testGetArray" />
361
-        <item itemvalue="JUnit.PeopleTest.testFindById" />
361
+        <item itemvalue="JUnit.PeopleTest" />
362
+        <item itemvalue="JUnit.PeopleTest.testAdd" />
362 363
       </list>
363 364
     </recent_temporary>
364 365
   </component>
@@ -372,61 +373,60 @@
372 373
       <option name="number" value="Default" />
373 374
       <option name="presentableId" value="Default" />
374 375
       <updated>1541272245713</updated>
375
-      <workItem from="1541272247066" duration="11446000" />
376
+      <workItem from="1541272247066" duration="12114000" />
377
+      <workItem from="1541370875087" duration="3031000" />
378
+      <workItem from="1541424524484" duration="285000" />
379
+      <workItem from="1541461069588" duration="897000" />
380
+      <workItem from="1541510807432" duration="1698000" />
376 381
     </task>
377 382
     <servers />
378 383
   </component>
379 384
   <component name="TestHistory">
380
-    <history-entry file="PeopleTest_testRemoveById - 2018.11.03 at 17h 57m 32s.xml">
381
-      <configuration name="PeopleTest.testRemoveById" configurationId="JUnit" />
382
-    </history-entry>
383
-    <history-entry file="PeopleTest_testRemoveById - 2018.11.03 at 17h 57m 55s.xml">
384
-      <configuration name="PeopleTest.testRemoveById" configurationId="JUnit" />
385
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 08h 32m 20s.xml">
386
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
385 387
     </history-entry>
386
-    <history-entry file="PeopleTest_testRemoveById - 2018.11.03 at 17h 58m 39s.xml">
387
-      <configuration name="PeopleTest.testRemoveById" configurationId="JUnit" />
388
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 38m 05s.xml">
389
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
388 390
     </history-entry>
389
-    <history-entry file="PeopleTest_testRemoveById - 2018.11.03 at 17h 59m 15s.xml">
390
-      <configuration name="PeopleTest.testRemoveById" configurationId="JUnit" />
391
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 39m 39s.xml">
392
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
391 393
     </history-entry>
392
-    <history-entry file="PeopleTest_testFindById - 2018.11.03 at 18h 04m 17s.xml">
393
-      <configuration name="PeopleTest.testFindById" configurationId="JUnit" />
394
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 45m 45s.xml">
395
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
394 396
     </history-entry>
395
-    <history-entry file="PeopleTest_testFindById - 2018.11.03 at 18h 04m 21s.xml">
396
-      <configuration name="PeopleTest.testFindById" configurationId="JUnit" />
397
+    <history-entry file="PeopleTest_testAdd - 2018.11.05 at 18h 45m 55s.xml">
398
+      <configuration name="PeopleTest.testAdd" configurationId="JUnit" />
397 399
     </history-entry>
398
-    <history-entry file="PeopleTest_testGetArray - 2018.11.03 at 18h 09m 04s.xml">
399
-      <configuration name="PeopleTest.testGetArray" configurationId="JUnit" />
400
+    <history-entry file="PeopleTest - 2018.11.05 at 18h 45m 59s.xml">
401
+      <configuration name="PeopleTest" configurationId="JUnit" />
400 402
     </history-entry>
401
-    <history-entry file="PeopleTest_testRemoveAll - 2018.11.03 at 18h 13m 19s.xml">
402
-      <configuration name="PeopleTest.testRemoveAll" configurationId="JUnit" />
403
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 46m 25s.xml">
404
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
403 405
     </history-entry>
404
-    <history-entry file="PeopleTest_testRemoveAll - 2018.11.03 at 18h 15m 01s.xml">
405
-      <configuration name="PeopleTest.testRemoveAll" configurationId="JUnit" />
406
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 51m 41s.xml">
407
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
406 408
     </history-entry>
407
-    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.03 at 18h 19m 30s.xml">
409
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.05 at 18h 51m 59s.xml">
408 410
       <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
409 411
     </history-entry>
412
+    <history-entry file="InstructorsTest_testInstructorsSingleton - 2018.11.06 at 08h 52m 27s.xml">
413
+      <configuration name="InstructorsTest.testInstructorsSingleton" configurationId="JUnit" />
414
+    </history-entry>
410 415
   </component>
411 416
   <component name="TimeTrackingManager">
412
-    <option name="totallyTimeSpent" value="11446000" />
417
+    <option name="totallyTimeSpent" value="18025000" />
413 418
   </component>
414 419
   <component name="ToolWindowManager">
415
-    <frame x="76" y="-973" width="1130" height="806" extended-state="0" />
420
+    <frame x="0" y="23" width="1130" height="806" extended-state="0" />
416 421
     <editor active="true" />
417 422
     <layout>
418
-      <window_info id="Image Layers" />
419
-      <window_info id="Designer" />
420
-      <window_info id="UI Designer" />
421
-      <window_info id="Capture Tool" />
422
-      <window_info id="Favorites" side_tool="true" />
423
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
423
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26838234" />
424 424
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
425
-      <window_info anchor="bottom" id="Messages" visible="true" weight="0.32913166" />
426
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
427
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
428
-      <window_info anchor="bottom" id="Terminal" />
429
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
425
+      <window_info id="Image Layers" order="2" />
426
+      <window_info id="Designer" order="3" />
427
+      <window_info id="UI Designer" order="4" />
428
+      <window_info id="Capture Tool" order="5" />
429
+      <window_info id="Favorites" order="6" side_tool="true" />
430 430
       <window_info anchor="bottom" id="Message" order="0" />
431 431
       <window_info anchor="bottom" id="Find" order="1" />
432 432
       <window_info anchor="bottom" id="Run" order="2" weight="0.32913166" />
@@ -434,15 +434,20 @@
434 434
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
435 435
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
436 436
       <window_info anchor="bottom" id="TODO" order="6" />
437
-      <window_info anchor="right" id="Palette" />
438
-      <window_info anchor="right" id="Theme Preview" />
439
-      <window_info anchor="right" id="Capture Analysis" />
440
-      <window_info anchor="right" id="Palette&#9;" />
441
-      <window_info anchor="right" id="Database" />
442
-      <window_info anchor="right" id="Maven Projects" />
437
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
438
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
439
+      <window_info anchor="bottom" id="Terminal" order="9" />
440
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
441
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32913166" />
443 442
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
444 443
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
445 444
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
445
+      <window_info anchor="right" id="Palette" order="3" />
446
+      <window_info anchor="right" id="Capture Analysis" order="4" />
447
+      <window_info anchor="right" id="Database" order="5" />
448
+      <window_info anchor="right" id="Theme Preview" order="6" />
449
+      <window_info anchor="right" id="Palette&#9;" order="7" />
450
+      <window_info anchor="right" id="Maven Projects" order="8" />
446 451
     </layout>
447 452
   </component>
448 453
   <component name="TypeScriptGeneratedFilesManager">
@@ -462,6 +467,14 @@
462 467
           </properties>
463 468
           <option name="timeStamp" value="5" />
464 469
         </line-breakpoint>
470
+        <line-breakpoint enabled="true" type="java-method">
471
+          <url>file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java</url>
472
+          <line>43</line>
473
+          <properties class="io.zipcoder.interfaces.People" method="getArray">
474
+            <option name="EMULATED" value="true" />
475
+          </properties>
476
+          <option name="timeStamp" value="7" />
477
+        </line-breakpoint>
465 478
       </breakpoints>
466 479
     </breakpoint-manager>
467 480
   </component>
@@ -484,9 +497,6 @@
484 497
       <provider selected="true" editor-type-id="text-editor">
485 498
         <state relative-caret-position="297">
486 499
           <caret line="30" column="50" lean-forward="true" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="50" />
487
-          <folding>
488
-            <element signature="imports" expanded="true" />
489
-          </folding>
490 500
         </state>
491 501
       </provider>
492 502
     </entry>
@@ -497,10 +507,17 @@
497 507
         </state>
498 508
       </provider>
499 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>
500 517
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
501 518
       <provider selected="true" editor-type-id="text-editor">
502
-        <state relative-caret-position="375">
503
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
519
+        <state relative-caret-position="352">
520
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
504 521
           <folding>
505 522
             <element signature="imports" expanded="true" />
506 523
           </folding>
@@ -510,70 +527,101 @@
510 527
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
511 528
       <provider selected="true" editor-type-id="text-editor">
512 529
         <state relative-caret-position="177">
513
-          <caret line="42" column="60" lean-forward="true" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
530
+          <caret line="42" column="60" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
514 531
           <folding>
515 532
             <element signature="imports" expanded="true" />
516 533
           </folding>
517 534
         </state>
518 535
       </provider>
519 536
     </entry>
520
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
537
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runners/ParentRunner.class">
521 538
       <provider selected="true" editor-type-id="text-editor">
522
-        <state>
523
-          <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
539
+        <state relative-caret-position="118">
540
+          <caret line="208" selection-start-line="208" selection-end-line="208" />
541
+        </state>
542
+      </provider>
543
+    </entry>
544
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/internal/runners/model/ReflectiveCallable.class">
545
+      <provider selected="true" editor-type-id="text-editor">
546
+        <state relative-caret-position="210">
547
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
524 548
         </state>
525 549
       </provider>
526 550
     </entry>
527 551
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
528 552
       <provider selected="true" editor-type-id="text-editor">
529
-        <state relative-caret-position="297">
530
-          <caret line="105" lean-forward="true" selection-start-line="105" selection-end-line="105" />
553
+        <state relative-caret-position="255">
554
+          <caret line="17" column="24" selection-start-line="17" selection-start-column="24" selection-end-line="17" selection-end-column="24" />
531 555
           <folding>
532 556
             <element signature="imports" expanded="true" />
533 557
           </folding>
534 558
         </state>
535 559
       </provider>
536 560
     </entry>
537
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
561
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
562
+      <provider selected="true" editor-type-id="text-editor">
563
+        <state relative-caret-position="30">
564
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
565
+        </state>
566
+      </provider>
567
+    </entry>
568
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
569
+      <provider selected="true" editor-type-id="text-editor">
570
+        <state relative-caret-position="105">
571
+          <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
572
+          <folding>
573
+            <element signature="imports" expanded="true" />
574
+          </folding>
575
+        </state>
576
+      </provider>
577
+    </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 />
585
+        </state>
586
+      </provider>
587
+    </entry>
588
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
538 589
       <provider selected="true" editor-type-id="text-editor">
539 590
         <state relative-caret-position="75">
540
-          <caret line="5" column="42" selection-start-line="5" selection-start-column="42" selection-end-line="5" selection-end-column="42" />
591
+          <caret line="5" selection-start-line="5" selection-end-line="6" selection-end-column="60" />
541 592
           <folding>
542
-            <element signature="e#126#127#0" expanded="true" />
543
-            <element signature="e#151#152#0" expanded="true" />
593
+            <element signature="imports" expanded="true" />
544 594
           </folding>
545 595
         </state>
546 596
       </provider>
547 597
     </entry>
548 598
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
549 599
       <provider selected="true" editor-type-id="text-editor">
550
-        <state relative-caret-position="330">
551
-          <caret line="22" column="46" lean-forward="true" selection-start-line="22" selection-start-column="46" selection-end-line="22" selection-end-column="46" />
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" />
552 602
           <folding>
553 603
             <element signature="imports" expanded="true" />
554 604
           </folding>
555 605
         </state>
556 606
       </provider>
557 607
     </entry>
558
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
608
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
559 609
       <provider selected="true" editor-type-id="text-editor">
560
-        <state relative-caret-position="704">
561
-          <caret line="50" column="27" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" />
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" />
562 612
           <folding>
563
-            <element signature="imports" expanded="true" />
564
-            <element signature="e#984#985#0" expanded="true" />
565
-            <element signature="e#1018#1019#0" expanded="true" />
613
+            <element signature="e#244#245#0" expanded="true" />
614
+            <element signature="e#274#275#0" expanded="true" />
566 615
           </folding>
567 616
         </state>
568 617
       </provider>
569 618
     </entry>
570
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
619
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
571 620
       <provider selected="true" editor-type-id="text-editor">
572
-        <state relative-caret-position="327">
573
-          <caret line="52" column="1" lean-forward="true" selection-start-line="52" selection-start-column="1" selection-end-line="52" selection-end-column="1" />
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" />
574 623
           <folding>
575
-            <element signature="e#194#195#0" expanded="true" />
576
-            <element signature="e#225#226#0" expanded="true" />
624
+            <element signature="imports" expanded="true" />
577 625
           </folding>
578 626
         </state>
579 627
       </provider>

+ 28
- 0
src/main/java/io/zipcoder/interfaces/Instructors.java Просмотреть файл

@@ -0,0 +1,28 @@
1
+package io.zipcoder.interfaces;
2
+
3
+
4
+public final class Instructors extends People{
5
+    private static final Instructors INSTANCE = new Instructors();
6
+    People personList;
7
+
8
+    private Instructors(){
9
+        personList = new People();
10
+        personList.add(new Instructor(1, "Kris Younger"));
11
+        personList.add(new Instructor(2, "Dolio Durant"));
12
+        personList.add(new Instructor(3, "Froilan Miranda"));
13
+        personList.add(new Instructor(4, "Nhu Ngyuen"));
14
+        personList.add(new Instructor(5, "Wilhem Alcivar"));
15
+        personList.add(new Instructor(6, "Dominique Clark"));
16
+        personList.add(new Instructor(7,"Leon Hunter"));
17
+
18
+
19
+
20
+    }
21
+
22
+    public static Instructors getInstance() {
23
+        return INSTANCE;
24
+    }
25
+
26
+
27
+
28
+}

+ 2
- 2
src/main/java/io/zipcoder/interfaces/People.java Просмотреть файл

@@ -5,10 +5,10 @@ import java.util.ArrayList;
5 5
 import java.util.List;
6 6
 
7 7
 public class People {
8
-    private List<Person> personList;
8
+    ArrayList<Person> personList = new ArrayList<>();
9 9
 
10 10
     public People() {
11
-        this.personList = new ArrayList<>();
11
+        //this.personList;
12 12
     }
13 13
 
14 14
     public void add(Person person) {

+ 46
- 40
src/main/java/io/zipcoder/interfaces/Students.java Просмотреть файл

@@ -1,48 +1,54 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
+import java.util.ArrayList;
4
+import java.util.List;
5
+
3 6
 public final class Students extends People{
4
-    final static Students INSTANCE = new Students();
7
+    private static final Students INSTANCE = new Students();
8
+    People personList;
9
+
5 10
 
6 11
     private Students() {
7
-        .add(new Student(1, "Ned Redmond"));
8
-        studentList.add(new Student(2, "Seth Abrams"));
9
-        studentList.add(new Student(3, "Akeem Cherry"));
10
-        studentList.add(new Student(4, "Whitney Martinez"));
11
-        studentList.add(new Student(5, "Nira Parikh"));
12
-        studentList.add(new Student(6, "Connor Dunnigan"));
13
-        studentList.add(new Student(7, "Christian Sheridan"));
14
-        studentList.add(new Student(8, "Curtis Cook"));
15
-        studentList.add(new Student(9, "Nuridalia Hernandez"));
16
-        studentList.add(new Student(10, "Brandon DeFrancis"));
17
-        studentList.add(new Student(11, "De'Jon Johnson"));
18
-        studentList.add(new Student(12, "Demetrius Murray"));
19
-        studentList.add(new Student(13, "Elliott Stansbury"));
20
-        studentList.add(new Student(14, "Nathan Hall"));
21
-        studentList.add(new Student(15, "Jae Joson"));
22
-        studentList.add(new Student(16, "Jacob Anderson"));
23
-        studentList.add(new Student(17, "Jose Bedolla"));
24
-        studentList.add(new Student(18, "Jenn Chao"));
25
-        studentList.add(new Student(19, "Jennifer Tinkler"));
26
-        studentList.add(new Student(20, "Jonathan Hinds"));
27
-        studentList.add(new Student(21, "Jay Samuels"));
28
-        studentList.add(new Student(22, "Jevit Tith"));
29
-        studentList.add(new Student(23, "Lauren Green"));
30
-        studentList.add(new Student(24, "Kate Moore"));
31
-        studentList.add(new Student(25, "Michelle DiMarino"));
32
-        studentList.add(new Student(26, "Maggie Pierse"));
33
-        studentList.add(new Student(27, "Nick Satinover"));
34
-        studentList.add(new Student(28, "Chaitali Patel"));
35
-        studentList.add(new Student(29, "Yesoda Sanka"));
36
-        studentList.add(new Student(30, "Saurav Kamath"));
37
-        studentList.add(new Student(31, "Sam Bhutani"));
38
-        studentList.add(new Student(32, "Soujanya Buragapu"));
39
-        studentList.add(new Student(33, "Steffon Williams"));
40
-        studentList.add(new Student(34, "Zavon Malone"));
41
-        studentList.add(new Student(35, "Thuy Kong"));
42
-        studentList.add(new Student(36, "Thulasi Puppala"));
43
-        studentList.add(new Student(37, "Trinh Tong"));
44
-        studentList.add(new Student(38, "William Brown"));
45
-        studentList.add(new Student(39, "Xzavia Cuello"));
12
+        personList = new People();
13
+        personList.add(new Student(1, "Ned Redmond"));
14
+        personList.add(new Student(2, "Seth Abrams"));
15
+        personList.add(new Student(3, "Akeem Cherry"));
16
+        personList.add(new Student(4, "Whitney Martinez"));
17
+        personList.add(new Student(5, "Nira Parikh"));
18
+        personList.add(new Student(6, "Connor Dunnigan"));
19
+        personList.add(new Student(7, "Christian Sheridan"));
20
+        personList.add(new Student(8, "Curtis Cook"));
21
+        personList.add(new Student(9, "Nuridalia Hernandez"));
22
+        personList.add(new Student(10, "Brandon DeFrancis"));
23
+        personList.add(new Student(11, "De'Jon Johnson"));
24
+        personList.add(new Student(12, "Demetrius Murray"));
25
+        personList.add(new Student(13, "Elliott Stansbury"));
26
+        personList.add(new Student(14, "Nathan Hall"));
27
+        personList.add(new Student(15, "Jae Joson"));
28
+        personList.add(new Student(16, "Jacob Anderson"));
29
+        personList.add(new Student(17, "Jose Bedolla"));
30
+        personList.add(new Student(18, "Jenn Chao"));
31
+        personList.add(new Student(19, "Jennifer Tinkler"));
32
+        personList.add(new Student(20, "Jonathan Hinds"));
33
+        personList.add(new Student(21, "Jay Samuels"));
34
+        personList.add(new Student(22, "Jevit Tith"));
35
+        personList.add(new Student(23, "Lauren Green"));
36
+        personList.add(new Student(24, "Kate Moore"));
37
+        personList.add(new Student(25, "Michelle DiMarino"));
38
+        personList.add(new Student(26, "Maggie Pierse"));
39
+        personList.add(new Student(27, "Nick Satinover"));
40
+        personList.add(new Student(28, "Chaitali Patel"));
41
+        personList.add(new Student(29, "Yesoda Sanka"));
42
+        personList.add(new Student(30, "Saurav Kamath"));
43
+        personList.add(new Student(31, "Sam Bhutani"));
44
+        personList.add(new Student(32, "Soujanya Buragapu"));
45
+        personList.add(new Student(33, "Steffon Williams"));
46
+        personList.add(new Student(34, "Zavon Malone"));
47
+        personList.add(new Student(35, "Thuy Kong"));
48
+        personList.add(new Student(36, "Thulasi Puppala"));
49
+        personList.add(new Student(37, "Trinh Tong"));
50
+        personList.add(new Student(38, "William Brown"));
51
+        personList.add(new Student(39, "Xzavia Cuello"));
46 52
 
47 53
     }
48 54
 

+ 25
- 0
src/test/java/io/zipcoder/interfaces/InstructorsTest.java Просмотреть файл

@@ -0,0 +1,25 @@
1
+package io.zipcoder.interfaces;
2
+
3
+import org.junit.Assert;
4
+import org.junit.Test;
5
+
6
+public class InstructorsTest {
7
+
8
+    @Test
9
+    public void testInstructorsSingleton() {
10
+
11
+        Instructors  test1 =  Instructors.getInstance();
12
+        Instructors  test2 =  Instructors.getInstance();
13
+
14
+        Assert.assertSame(test1, test2);
15
+
16
+    }
17
+
18
+    @Test
19
+    public void testInstructorsInitialization() {
20
+
21
+        int expected = 7;
22
+        int actual = Instructors.getInstance().personList.getArray().length;
23
+        Assert.assertEquals(expected, actual);
24
+    }
25
+}

+ 4
- 5
src/test/java/io/zipcoder/interfaces/StudentsTest.java Просмотреть файл

@@ -9,17 +9,16 @@ public class StudentsTest {
9 9
     public void testSingletonInstance() {
10 10
         Students test1 = Students.getINSTANCE();
11 11
         Students test2 = Students.getINSTANCE();
12
-
13
-        Assert.assertSame(test1, test2);
14
-
15 12
     }
16 13
 
17 14
     @Test
18 15
     public void testInitializationSetupStudents() {
19 16
 
17
+//        Students test = Students.getINSTANCE();
18
+//        Person[] studentArray = test.personList.getArray()
20 19
         int expected = 39;
21
-        int actual = Students.getINSTANCE().getArray().length;
22
-
20
+        //int actual = Students.getINSTANCE().getArray().length;
21
+        int actual = Students.getINSTANCE().personList.getArray().length;
23 22
         Assert.assertEquals(expected, actual);
24 23
     }
25 24