|
@@ -2,12 +2,16 @@
|
2
|
2
|
<project version="4">
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
4
|
<list default="true" id="26dbf132-6e6b-4a6e-bb22-c157a4ca9ba8" name="Default Changelist" comment="">
|
5
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" afterDir="false" />
|
6
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" afterDir="false" />
|
7
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" afterDir="false" />
|
8
|
|
- <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" afterDir="false" />
|
|
5
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
|
|
6
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" afterDir="false" />
|
|
7
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" afterDir="false" />
|
|
8
|
+ <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" afterDir="false" />
|
|
9
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
10
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" afterDir="false" />
|
9
|
11
|
<change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" afterDir="false" />
|
10
|
|
- <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" />
|
|
12
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" afterDir="false" />
|
|
13
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" afterDir="false" />
|
|
14
|
+ <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" afterDir="false" />
|
11
|
15
|
</list>
|
12
|
16
|
<ignored path="$PROJECT_DIR$/target/" />
|
13
|
17
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -20,36 +24,40 @@
|
20
|
24
|
<session id="438671118">
|
21
|
25
|
<usages-collector id="statistics.lifecycle.project">
|
22
|
26
|
<counts>
|
|
27
|
+ <entry key="project.closed" value="3" />
|
23
|
28
|
<entry key="project.open.time.1" value="1" />
|
24
|
|
- <entry key="project.opened" value="1" />
|
|
29
|
+ <entry key="project.open.time.13" value="1" />
|
|
30
|
+ <entry key="project.open.time.14" value="1" />
|
|
31
|
+ <entry key="project.open.time.3" value="1" />
|
|
32
|
+ <entry key="project.opened" value="4" />
|
25
|
33
|
</counts>
|
26
|
34
|
</usages-collector>
|
27
|
35
|
<usages-collector id="statistics.file.extensions.open">
|
28
|
36
|
<counts>
|
29
|
|
- <entry key="java" value="6" />
|
|
37
|
+ <entry key="java" value="26" />
|
30
|
38
|
<entry key="md" value="1" />
|
31
|
39
|
</counts>
|
32
|
40
|
</usages-collector>
|
33
|
41
|
<usages-collector id="statistics.file.types.open">
|
34
|
42
|
<counts>
|
35
|
|
- <entry key="JAVA" value="6" />
|
|
43
|
+ <entry key="JAVA" value="26" />
|
36
|
44
|
<entry key="Markdown" value="1" />
|
37
|
45
|
</counts>
|
38
|
46
|
</usages-collector>
|
39
|
47
|
<usages-collector id="statistics.file.extensions.edit">
|
40
|
48
|
<counts>
|
41
|
|
- <entry key="java" value="1559" />
|
|
49
|
+ <entry key="java" value="3701" />
|
42
|
50
|
</counts>
|
43
|
51
|
</usages-collector>
|
44
|
52
|
<usages-collector id="statistics.file.types.edit">
|
45
|
53
|
<counts>
|
46
|
|
- <entry key="JAVA" value="1559" />
|
|
54
|
+ <entry key="JAVA" value="3701" />
|
47
|
55
|
</counts>
|
48
|
56
|
</usages-collector>
|
49
|
57
|
</session>
|
50
|
58
|
</component>
|
51
|
59
|
<component name="FileEditorManager">
|
52
|
|
- <leaf>
|
|
60
|
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
53
|
61
|
<file pinned="false" current-in-tab="true">
|
54
|
62
|
<entry file="file://$PROJECT_DIR$/README.md">
|
55
|
63
|
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
@@ -61,46 +69,41 @@
|
61
|
69
|
</entry>
|
62
|
70
|
</file>
|
63
|
71
|
<file pinned="false" current-in-tab="false">
|
64
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
|
|
72
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
|
65
|
73
|
<provider selected="true" editor-type-id="text-editor">
|
66
|
|
- <state relative-caret-position="90">
|
67
|
|
- <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
|
68
|
|
- </state>
|
69
|
|
- </provider>
|
70
|
|
- </entry>
|
71
|
|
- </file>
|
72
|
|
- <file pinned="false" current-in-tab="false">
|
73
|
|
- <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
|
74
|
|
- <provider selected="true" editor-type-id="text-editor">
|
75
|
|
- <state relative-caret-position="145">
|
76
|
|
- <caret line="31" column="34" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
|
|
74
|
+ <state relative-caret-position="235">
|
|
75
|
+ <caret line="43" column="31" lean-forward="true" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
|
77
|
76
|
<folding>
|
78
|
77
|
<element signature="imports" expanded="true" />
|
|
78
|
+ <element signature="e#335#343#0" expanded="true" />
|
79
|
79
|
</folding>
|
80
|
80
|
</state>
|
81
|
81
|
</provider>
|
82
|
82
|
</entry>
|
83
|
83
|
</file>
|
84
|
84
|
<file pinned="false" current-in-tab="false">
|
85
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
|
|
85
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
|
86
|
86
|
<provider selected="true" editor-type-id="text-editor">
|
87
|
|
- <state relative-caret-position="120">
|
88
|
|
- <caret line="8" selection-start-line="8" selection-end-line="8" />
|
89
|
|
- <folding>
|
90
|
|
- <element signature="e#161#162#0" expanded="true" />
|
91
|
|
- <element signature="e#187#188#0" expanded="true" />
|
92
|
|
- <element signature="e#120#121#0" expanded="true" />
|
93
|
|
- <element signature="e#155#156#0" expanded="true" />
|
94
|
|
- </folding>
|
|
87
|
+ <state relative-caret-position="45">
|
|
88
|
+ <caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
|
95
|
89
|
</state>
|
96
|
90
|
</provider>
|
97
|
91
|
</entry>
|
98
|
92
|
</file>
|
99
|
93
|
<file pinned="false" current-in-tab="false">
|
100
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
|
|
94
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
|
101
|
95
|
<provider selected="true" editor-type-id="text-editor">
|
102
|
|
- <state relative-caret-position="75">
|
103
|
|
- <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
|
|
96
|
+ <state relative-caret-position="205">
|
|
97
|
+ <caret line="21" column="34" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="34" />
|
|
98
|
+ <folding>
|
|
99
|
+ <element signature="imports" expanded="true" />
|
|
100
|
+ <element signature="e#198#199#0" expanded="true" />
|
|
101
|
+ <element signature="e#226#227#0" expanded="true" />
|
|
102
|
+ <element signature="e#327#328#0" expanded="true" />
|
|
103
|
+ <element signature="e#362#363#0" expanded="true" />
|
|
104
|
+ <element signature="e#441#442#0" expanded="true" />
|
|
105
|
+ <element signature="e#461#462#0" expanded="true" />
|
|
106
|
+ </folding>
|
104
|
107
|
</state>
|
105
|
108
|
</provider>
|
106
|
109
|
</entry>
|
|
@@ -110,8 +113,8 @@
|
110
|
113
|
<component name="FileTemplateManagerImpl">
|
111
|
114
|
<option name="RECENT_TEMPLATES">
|
112
|
115
|
<list>
|
113
|
|
- <option value="Class" />
|
114
|
116
|
<option value="Interface" />
|
|
117
|
+ <option value="Class" />
|
115
|
118
|
</list>
|
116
|
119
|
</option>
|
117
|
120
|
</component>
|
|
@@ -121,12 +124,16 @@
|
121
|
124
|
<component name="IdeDocumentHistory">
|
122
|
125
|
<option name="CHANGED_PATHS">
|
123
|
126
|
<list>
|
124
|
|
- <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
|
125
|
127
|
<option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
|
126
|
128
|
<option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
|
|
129
|
+ <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
|
127
|
130
|
<option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" />
|
|
131
|
+ <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
|
128
|
132
|
<option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" />
|
129
|
|
- <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
|
|
133
|
+ <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
|
|
134
|
+ <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
|
|
135
|
+ <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
|
|
136
|
+ <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
|
130
|
137
|
</list>
|
131
|
138
|
</option>
|
132
|
139
|
</component>
|
|
@@ -148,8 +155,6 @@
|
148
|
155
|
<foldersAlwaysOnTop value="true" />
|
149
|
156
|
</navigator>
|
150
|
157
|
<panes>
|
151
|
|
- <pane id="PackagesPane" />
|
152
|
|
- <pane id="Scope" />
|
153
|
158
|
<pane id="ProjectPane">
|
154
|
159
|
<subPane>
|
155
|
160
|
<expand>
|
|
@@ -208,12 +213,14 @@
|
208
|
213
|
<select />
|
209
|
214
|
</subPane>
|
210
|
215
|
</pane>
|
|
216
|
+ <pane id="Scope" />
|
|
217
|
+ <pane id="PackagesPane" />
|
211
|
218
|
</panes>
|
212
|
219
|
</component>
|
213
|
220
|
<component name="PropertiesComponent">
|
214
|
221
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
215
|
222
|
<property name="aspect.path.notification.shown" value="true" />
|
216
|
|
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541266502459" />
|
|
223
|
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541474609100" />
|
217
|
224
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
218
|
225
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
219
|
226
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
@@ -235,8 +242,8 @@
|
235
|
242
|
</list>
|
236
|
243
|
</option>
|
237
|
244
|
</component>
|
238
|
|
- <component name="RunManager" selected="JUnit.TestStudent.testLearn">
|
239
|
|
- <configuration name="TestPerson.testConstructor" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
245
|
+ <component name="RunManager" selected="JUnit.PeopleTest.removeByPersonTest">
|
|
246
|
+ <configuration name="InstructorTest.testLecture" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
240
|
247
|
<module name="interfaces-1" />
|
241
|
248
|
<extension name="coverage">
|
242
|
249
|
<pattern>
|
|
@@ -245,14 +252,14 @@
|
245
|
252
|
</pattern>
|
246
|
253
|
</extension>
|
247
|
254
|
<option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
|
248
|
|
- <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPerson" />
|
249
|
|
- <option name="METHOD_NAME" value="testConstructor" />
|
|
255
|
+ <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorTest" />
|
|
256
|
+ <option name="METHOD_NAME" value="testLecture" />
|
250
|
257
|
<option name="TEST_OBJECT" value="method" />
|
251
|
258
|
<method v="2">
|
252
|
259
|
<option name="Make" enabled="true" />
|
253
|
260
|
</method>
|
254
|
261
|
</configuration>
|
255
|
|
- <configuration name="TestPerson.testSetAndGetName" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
262
|
+ <configuration name="InstructorTest.testTeach" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
256
|
263
|
<module name="interfaces-1" />
|
257
|
264
|
<extension name="coverage">
|
258
|
265
|
<pattern>
|
|
@@ -261,14 +268,14 @@
|
261
|
268
|
</pattern>
|
262
|
269
|
</extension>
|
263
|
270
|
<option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
|
264
|
|
- <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPerson" />
|
265
|
|
- <option name="METHOD_NAME" value="testSetAndGetName" />
|
|
271
|
+ <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorTest" />
|
|
272
|
+ <option name="METHOD_NAME" value="testTeach" />
|
266
|
273
|
<option name="TEST_OBJECT" value="method" />
|
267
|
274
|
<method v="2">
|
268
|
275
|
<option name="Make" enabled="true" />
|
269
|
276
|
</method>
|
270
|
277
|
</configuration>
|
271
|
|
- <configuration name="TestStudent.testImplementation" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
278
|
+ <configuration name="PeopleTest.addTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
272
|
279
|
<module name="interfaces-1" />
|
273
|
280
|
<extension name="coverage">
|
274
|
281
|
<pattern>
|
|
@@ -277,14 +284,14 @@
|
277
|
284
|
</pattern>
|
278
|
285
|
</extension>
|
279
|
286
|
<option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
|
280
|
|
- <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestStudent" />
|
281
|
|
- <option name="METHOD_NAME" value="testImplementation" />
|
|
287
|
+ <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
|
|
288
|
+ <option name="METHOD_NAME" value="addTest" />
|
282
|
289
|
<option name="TEST_OBJECT" value="method" />
|
283
|
290
|
<method v="2">
|
284
|
291
|
<option name="Make" enabled="true" />
|
285
|
292
|
</method>
|
286
|
293
|
</configuration>
|
287
|
|
- <configuration name="TestStudent.testInheritance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
294
|
+ <configuration name="PeopleTest.removeByPersonTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
288
|
295
|
<module name="interfaces-1" />
|
289
|
296
|
<extension name="coverage">
|
290
|
297
|
<pattern>
|
|
@@ -293,8 +300,8 @@
|
293
|
300
|
</pattern>
|
294
|
301
|
</extension>
|
295
|
302
|
<option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
|
296
|
|
- <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestStudent" />
|
297
|
|
- <option name="METHOD_NAME" value="testInheritance" />
|
|
303
|
+ <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
|
|
304
|
+ <option name="METHOD_NAME" value="removeByPersonTest" />
|
298
|
305
|
<option name="TEST_OBJECT" value="method" />
|
299
|
306
|
<method v="2">
|
300
|
307
|
<option name="Make" enabled="true" />
|
|
@@ -317,19 +324,19 @@
|
317
|
324
|
</method>
|
318
|
325
|
</configuration>
|
319
|
326
|
<list>
|
320
|
|
- <item itemvalue="JUnit.TestPerson.testConstructor" />
|
321
|
|
- <item itemvalue="JUnit.TestPerson.testSetAndGetName" />
|
322
|
|
- <item itemvalue="JUnit.TestStudent.testImplementation" />
|
323
|
|
- <item itemvalue="JUnit.TestStudent.testInheritance" />
|
324
|
327
|
<item itemvalue="JUnit.TestStudent.testLearn" />
|
|
328
|
+ <item itemvalue="JUnit.InstructorTest.testTeach" />
|
|
329
|
+ <item itemvalue="JUnit.InstructorTest.testLecture" />
|
|
330
|
+ <item itemvalue="JUnit.PeopleTest.addTest" />
|
|
331
|
+ <item itemvalue="JUnit.PeopleTest.removeByPersonTest" />
|
325
|
332
|
</list>
|
326
|
333
|
<recent_temporary>
|
327
|
334
|
<list>
|
|
335
|
+ <item itemvalue="JUnit.PeopleTest.removeByPersonTest" />
|
|
336
|
+ <item itemvalue="JUnit.PeopleTest.addTest" />
|
|
337
|
+ <item itemvalue="JUnit.InstructorTest.testLecture" />
|
|
338
|
+ <item itemvalue="JUnit.InstructorTest.testTeach" />
|
328
|
339
|
<item itemvalue="JUnit.TestStudent.testLearn" />
|
329
|
|
- <item itemvalue="JUnit.TestStudent.testInheritance" />
|
330
|
|
- <item itemvalue="JUnit.TestStudent.testImplementation" />
|
331
|
|
- <item itemvalue="JUnit.TestPerson.testSetAndGetName" />
|
332
|
|
- <item itemvalue="JUnit.TestPerson.testConstructor" />
|
333
|
340
|
</list>
|
334
|
341
|
</recent_temporary>
|
335
|
342
|
</component>
|
|
@@ -343,20 +350,14 @@
|
343
|
350
|
<option name="number" value="Default" />
|
344
|
351
|
<option name="presentableId" value="Default" />
|
345
|
352
|
<updated>1541262964874</updated>
|
346
|
|
- <workItem from="1541262966279" duration="3527000" />
|
|
353
|
+ <workItem from="1541262966279" duration="4192000" />
|
|
354
|
+ <workItem from="1541423915725" duration="3437000" />
|
|
355
|
+ <workItem from="1541460414673" duration="259000" />
|
|
356
|
+ <workItem from="1541471756375" duration="2806000" />
|
347
|
357
|
</task>
|
348
|
358
|
<servers />
|
349
|
359
|
</component>
|
350
|
360
|
<component name="TestHistory">
|
351
|
|
- <history-entry file="TestPerson_testConstructor - 2018.11.03 at 12h 51m 46s.xml">
|
352
|
|
- <configuration name="TestPerson.testConstructor" configurationId="JUnit" />
|
353
|
|
- </history-entry>
|
354
|
|
- <history-entry file="TestPerson_testSetAndGetName - 2018.11.03 at 12h 56m 04s.xml">
|
355
|
|
- <configuration name="TestPerson.testSetAndGetName" configurationId="JUnit" />
|
356
|
|
- </history-entry>
|
357
|
|
- <history-entry file="TestStudent_testImplementation - 2018.11.03 at 13h 08m 11s.xml">
|
358
|
|
- <configuration name="TestStudent.testImplementation" configurationId="JUnit" />
|
359
|
|
- </history-entry>
|
360
|
361
|
<history-entry file="TestStudent_testInheritance - 2018.11.03 at 13h 11m 24s.xml">
|
361
|
362
|
<configuration name="TestStudent.testInheritance" configurationId="JUnit" />
|
362
|
363
|
</history-entry>
|
|
@@ -366,72 +367,93 @@
|
366
|
367
|
<history-entry file="TestStudent_testLearn - 2018.11.03 at 13h 25m 37s.xml">
|
367
|
368
|
<configuration name="TestStudent.testLearn" configurationId="JUnit" />
|
368
|
369
|
</history-entry>
|
|
370
|
+ <history-entry file="InstructorTest_testImplementation - 2018.11.03 at 13h 44m 55s.xml">
|
|
371
|
+ <configuration name="InstructorTest.testImplementation" configurationId="JUnit" />
|
|
372
|
+ </history-entry>
|
|
373
|
+ <history-entry file="InstructorTest_testInheritance - 2018.11.03 at 13h 46m 18s.xml">
|
|
374
|
+ <configuration name="InstructorTest.testInheritance" configurationId="JUnit" />
|
|
375
|
+ </history-entry>
|
|
376
|
+ <history-entry file="TestStudent_testLearn - 2018.11.05 at 21h 41m 20s.xml">
|
|
377
|
+ <configuration name="TestStudent.testLearn" configurationId="JUnit" />
|
|
378
|
+ </history-entry>
|
|
379
|
+ <history-entry file="InstructorTest_testTeach - 2018.11.05 at 21h 41m 31s.xml">
|
|
380
|
+ <configuration name="InstructorTest.testTeach" configurationId="JUnit" />
|
|
381
|
+ </history-entry>
|
|
382
|
+ <history-entry file="InstructorTest_testLecture - 2018.11.05 at 21h 57m 46s.xml">
|
|
383
|
+ <configuration name="InstructorTest.testLecture" configurationId="JUnit" />
|
|
384
|
+ </history-entry>
|
|
385
|
+ <history-entry file="PeopleTest_addTest - 2018.11.05 at 22h 16m 01s.xml">
|
|
386
|
+ <configuration name="PeopleTest.addTest" configurationId="JUnit" />
|
|
387
|
+ </history-entry>
|
|
388
|
+ <history-entry file="PeopleTest_removeByPersonTest - 2018.11.05 at 22h 23m 31s.xml">
|
|
389
|
+ <configuration name="PeopleTest.removeByPersonTest" configurationId="JUnit" />
|
|
390
|
+ </history-entry>
|
369
|
391
|
</component>
|
370
|
392
|
<component name="TimeTrackingManager">
|
371
|
|
- <option name="totallyTimeSpent" value="3527000" />
|
|
393
|
+ <option name="totallyTimeSpent" value="10694000" />
|
372
|
394
|
</component>
|
373
|
395
|
<component name="ToolWindowManager">
|
374
|
396
|
<frame x="20" y="35" width="1260" height="669" extended-state="0" />
|
375
|
397
|
<editor active="true" />
|
376
|
398
|
<layout>
|
377
|
|
- <window_info id="Image Layers" />
|
378
|
|
- <window_info id="Designer" />
|
379
|
|
- <window_info id="UI Designer" />
|
380
|
|
- <window_info id="Capture Tool" />
|
381
|
|
- <window_info id="Favorites" side_tool="true" />
|
382
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24958949" />
|
|
399
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26190478" />
|
383
|
400
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
384
|
|
- <window_info anchor="bottom" id="Messages" weight="0.32928944" />
|
385
|
|
- <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
|
386
|
|
- <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
|
387
|
|
- <window_info anchor="bottom" id="Terminal" />
|
388
|
|
- <window_info anchor="bottom" id="Event Log" side_tool="true" />
|
|
401
|
+ <window_info id="Image Layers" order="2" />
|
|
402
|
+ <window_info id="Designer" order="3" />
|
|
403
|
+ <window_info id="UI Designer" order="4" />
|
|
404
|
+ <window_info id="Capture Tool" order="5" />
|
|
405
|
+ <window_info id="Favorites" order="6" side_tool="true" />
|
389
|
406
|
<window_info anchor="bottom" id="Message" order="0" />
|
390
|
407
|
<window_info anchor="bottom" id="Find" order="1" />
|
391
|
|
- <window_info anchor="bottom" id="Run" order="2" weight="0.32928944" />
|
|
408
|
+ <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32928944" />
|
392
|
409
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
393
|
410
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
394
|
411
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
395
|
412
|
<window_info anchor="bottom" id="TODO" order="6" />
|
396
|
|
- <window_info anchor="right" id="Palette" />
|
397
|
|
- <window_info anchor="right" id="Theme Preview" />
|
398
|
|
- <window_info anchor="right" id="Capture Analysis" />
|
399
|
|
- <window_info anchor="right" id="Palette	" />
|
400
|
|
- <window_info anchor="right" id="Database" />
|
401
|
|
- <window_info anchor="right" id="Maven Projects" />
|
|
413
|
+ <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
|
|
414
|
+ <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
415
|
+ <window_info anchor="bottom" id="Terminal" order="9" />
|
|
416
|
+ <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
417
|
+ <window_info anchor="bottom" id="Messages" order="11" weight="0.32928944" />
|
402
|
418
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
403
|
419
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
404
|
420
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
421
|
+ <window_info anchor="right" id="Palette" order="3" />
|
|
422
|
+ <window_info anchor="right" id="Capture Analysis" order="4" />
|
|
423
|
+ <window_info anchor="right" id="Database" order="5" />
|
|
424
|
+ <window_info anchor="right" id="Theme Preview" order="6" />
|
|
425
|
+ <window_info anchor="right" id="Palette	" order="7" />
|
|
426
|
+ <window_info anchor="right" id="Maven Projects" order="8" />
|
405
|
427
|
</layout>
|
406
|
428
|
<layout-to-restore>
|
407
|
|
- <window_info id="Image Layers" order="0" />
|
408
|
|
- <window_info id="Designer" order="1" />
|
409
|
|
- <window_info id="UI Designer" order="2" />
|
410
|
|
- <window_info id="Capture Tool" order="3" />
|
411
|
|
- <window_info id="Favorites" order="4" side_tool="true" />
|
412
|
|
- <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.24958949" />
|
413
|
|
- <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
|
414
|
|
- <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
|
415
|
|
- <window_info anchor="bottom" id="Terminal" order="1" />
|
416
|
|
- <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
|
417
|
|
- <window_info anchor="bottom" id="Database Changes" order="3" show_stripe_button="false" />
|
418
|
|
- <window_info anchor="bottom" id="Messages" order="4" weight="0.32928944" />
|
419
|
|
- <window_info anchor="bottom" id="Message" order="5" />
|
420
|
|
- <window_info anchor="bottom" id="Find" order="6" />
|
421
|
|
- <window_info anchor="bottom" id="Run" order="7" visible="true" weight="0.32928944" />
|
422
|
|
- <window_info anchor="bottom" id="Debug" order="8" weight="0.4" />
|
423
|
|
- <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
|
424
|
|
- <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
|
425
|
|
- <window_info anchor="bottom" id="TODO" order="11" />
|
426
|
|
- <window_info anchor="right" id="Palette" order="0" />
|
427
|
|
- <window_info anchor="right" id="Capture Analysis" order="1" />
|
428
|
|
- <window_info anchor="right" id="Database" order="2" />
|
429
|
|
- <window_info anchor="right" id="Theme Preview" order="3" />
|
430
|
|
- <window_info anchor="right" id="Palette	" order="4" />
|
431
|
|
- <window_info anchor="right" id="Maven Projects" order="5" />
|
432
|
|
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
|
433
|
|
- <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
|
434
|
|
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
|
|
429
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2536946" />
|
|
430
|
+ <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
431
|
+ <window_info id="Image Layers" order="2" />
|
|
432
|
+ <window_info id="Designer" order="3" />
|
|
433
|
+ <window_info id="UI Designer" order="4" />
|
|
434
|
+ <window_info id="Capture Tool" order="5" />
|
|
435
|
+ <window_info id="Favorites" order="6" side_tool="true" />
|
|
436
|
+ <window_info anchor="bottom" id="Message" order="0" />
|
|
437
|
+ <window_info anchor="bottom" id="Find" order="1" />
|
|
438
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.32928944" />
|
|
439
|
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
440
|
+ <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
441
|
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
442
|
+ <window_info anchor="bottom" id="TODO" order="6" />
|
|
443
|
+ <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
|
|
444
|
+ <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
|
|
445
|
+ <window_info anchor="bottom" id="Terminal" order="9" />
|
|
446
|
+ <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
447
|
+ <window_info anchor="bottom" id="Messages" order="11" visible="true" weight="0.32928944" />
|
|
448
|
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
449
|
+ <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
450
|
+ <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
451
|
+ <window_info anchor="right" id="Palette" order="3" />
|
|
452
|
+ <window_info anchor="right" id="Capture Analysis" order="4" />
|
|
453
|
+ <window_info anchor="right" id="Database" order="5" />
|
|
454
|
+ <window_info anchor="right" id="Theme Preview" order="6" />
|
|
455
|
+ <window_info anchor="right" id="Palette	" order="7" />
|
|
456
|
+ <window_info anchor="right" id="Maven Projects" order="8" />
|
435
|
457
|
</layout-to-restore>
|
436
|
458
|
</component>
|
437
|
459
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -445,59 +467,88 @@
|
445
|
467
|
<provider selected="true" editor-type-id="text-editor">
|
446
|
468
|
<state relative-caret-position="275">
|
447
|
469
|
<caret line="21" column="36" lean-forward="true" selection-start-line="21" selection-start-column="36" selection-end-line="21" selection-end-column="36" />
|
448
|
|
- <folding>
|
449
|
|
- <element signature="imports" expanded="true" />
|
450
|
|
- </folding>
|
451
|
470
|
</state>
|
452
|
471
|
</provider>
|
453
|
472
|
</entry>
|
454
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
|
|
473
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
|
455
|
474
|
<provider selected="true" editor-type-id="text-editor">
|
456
|
|
- <state relative-caret-position="255">
|
457
|
|
- <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
|
458
|
|
- <folding>
|
459
|
|
- <element signature="e#195#196#0" expanded="true" />
|
460
|
|
- <element signature="e#227#228#0" expanded="true" />
|
461
|
|
- <element signature="e#261#262#0" expanded="true" />
|
462
|
|
- <element signature="e#288#289#0" expanded="true" />
|
463
|
|
- </folding>
|
|
475
|
+ <state relative-caret-position="30">
|
|
476
|
+ <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
|
464
|
477
|
</state>
|
465
|
478
|
</provider>
|
466
|
479
|
</entry>
|
467
|
480
|
<entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
|
468
|
481
|
<provider selected="true" editor-type-id="text-editor">
|
469
|
|
- <state relative-caret-position="75">
|
470
|
|
- <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
|
|
482
|
+ <state relative-caret-position="30">
|
|
483
|
+ <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
|
|
484
|
+ </state>
|
|
485
|
+ </provider>
|
|
486
|
+ </entry>
|
|
487
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
|
|
488
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
489
|
+ <state relative-caret-position="175">
|
|
490
|
+ <caret line="35" column="61" selection-start-line="35" selection-start-column="61" selection-end-line="35" selection-end-column="61" />
|
471
|
491
|
</state>
|
472
|
492
|
</provider>
|
473
|
493
|
</entry>
|
474
|
494
|
<entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
|
475
|
495
|
<provider selected="true" editor-type-id="text-editor">
|
476
|
|
- <state relative-caret-position="120">
|
477
|
|
- <caret line="8" selection-start-line="8" selection-end-line="8" />
|
|
496
|
+ <state relative-caret-position="105">
|
|
497
|
+ <caret line="9" column="38" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
|
478
|
498
|
<folding>
|
479
|
|
- <element signature="e#161#162#0" expanded="true" />
|
480
|
|
- <element signature="e#187#188#0" expanded="true" />
|
481
|
|
- <element signature="e#120#121#0" expanded="true" />
|
482
|
|
- <element signature="e#155#156#0" expanded="true" />
|
|
499
|
+ <element signature="e#314#315#0" expanded="true" />
|
483
|
500
|
</folding>
|
484
|
501
|
</state>
|
485
|
502
|
</provider>
|
486
|
503
|
</entry>
|
487
|
|
- <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
|
|
504
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
|
488
|
505
|
<provider selected="true" editor-type-id="text-editor">
|
489
|
|
- <state relative-caret-position="145">
|
490
|
|
- <caret line="31" column="34" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="34" />
|
|
506
|
+ <state relative-caret-position="180">
|
|
507
|
+ <caret line="12" column="53" selection-start-line="12" selection-start-column="53" selection-end-line="12" selection-end-column="53" />
|
|
508
|
+ </state>
|
|
509
|
+ </provider>
|
|
510
|
+ </entry>
|
|
511
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
|
|
512
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
513
|
+ <state relative-caret-position="190">
|
|
514
|
+ <caret line="61" column="64" selection-start-line="61" selection-start-column="64" selection-end-line="61" selection-end-column="64" />
|
491
|
515
|
<folding>
|
492
|
516
|
<element signature="imports" expanded="true" />
|
493
|
517
|
</folding>
|
494
|
518
|
</state>
|
495
|
519
|
</provider>
|
496
|
520
|
</entry>
|
497
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
|
|
521
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
|
498
|
522
|
<provider selected="true" editor-type-id="text-editor">
|
499
|
|
- <state relative-caret-position="90">
|
500
|
|
- <caret line="6" column="66" selection-start-line="6" selection-start-column="66" selection-end-line="6" selection-end-column="66" />
|
|
523
|
+ <state relative-caret-position="205">
|
|
524
|
+ <caret line="21" column="34" selection-start-line="21" selection-start-column="34" selection-end-line="21" selection-end-column="34" />
|
|
525
|
+ <folding>
|
|
526
|
+ <element signature="imports" expanded="true" />
|
|
527
|
+ <element signature="e#198#199#0" expanded="true" />
|
|
528
|
+ <element signature="e#226#227#0" expanded="true" />
|
|
529
|
+ <element signature="e#327#328#0" expanded="true" />
|
|
530
|
+ <element signature="e#362#363#0" expanded="true" />
|
|
531
|
+ <element signature="e#441#442#0" expanded="true" />
|
|
532
|
+ <element signature="e#461#462#0" expanded="true" />
|
|
533
|
+ </folding>
|
|
534
|
+ </state>
|
|
535
|
+ </provider>
|
|
536
|
+ </entry>
|
|
537
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
|
|
538
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
539
|
+ <state relative-caret-position="45">
|
|
540
|
+ <caret line="3" column="18" lean-forward="true" selection-start-line="3" selection-start-column="18" selection-end-line="3" selection-end-column="18" />
|
|
541
|
+ </state>
|
|
542
|
+ </provider>
|
|
543
|
+ </entry>
|
|
544
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
|
|
545
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
546
|
+ <state relative-caret-position="235">
|
|
547
|
+ <caret line="43" column="31" lean-forward="true" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
|
|
548
|
+ <folding>
|
|
549
|
+ <element signature="imports" expanded="true" />
|
|
550
|
+ <element signature="e#335#343#0" expanded="true" />
|
|
551
|
+ </folding>
|
501
|
552
|
</state>
|
502
|
553
|
</provider>
|
503
|
554
|
</entry>
|