|
@@ -2,19 +2,8 @@
|
2
|
2
|
<project version="4">
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
4
|
<list default="true" id="3695f464-5078-499e-b9a2-a8eebaa75f86" name="Default Changelist" comment="">
|
5
|
|
- <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
|
6
|
|
- <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
|
7
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
|
8
|
|
- <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
|
9
|
|
- <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
10
|
|
- <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
|
11
|
|
- <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
12
|
|
- <change afterPath="$PROJECT_DIR$/interfaces-1.iml" afterDir="false" />
|
13
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" afterDir="false" />
|
14
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/PersonTest.java" afterDir="false" />
|
15
|
|
- <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" afterDir="false" />
|
16
|
|
- <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" />
|
17
|
|
- <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" afterDir="false" />
|
|
5
|
+ <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" afterDir="false" />
|
|
6
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
18
|
7
|
</list>
|
19
|
8
|
<ignored path="$PROJECT_DIR$/target/" />
|
20
|
9
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -27,7 +16,7 @@
|
27
|
16
|
<session id="-1454329160">
|
28
|
17
|
<usages-collector id="statistics.lifecycle.project">
|
29
|
18
|
<counts>
|
30
|
|
- <entry key="project.closed" value="2" />
|
|
19
|
+ <entry key="project.closed" value="3" />
|
31
|
20
|
<entry key="project.open.time.0" value="1" />
|
32
|
21
|
<entry key="project.open.time.1" value="2" />
|
33
|
22
|
<entry key="project.opened" value="3" />
|
|
@@ -35,22 +24,24 @@
|
35
|
24
|
</usages-collector>
|
36
|
25
|
<usages-collector id="statistics.file.extensions.open">
|
37
|
26
|
<counts>
|
38
|
|
- <entry key="java" value="9" />
|
|
27
|
+ <entry key="java" value="10" />
|
39
|
28
|
</counts>
|
40
|
29
|
</usages-collector>
|
41
|
30
|
<usages-collector id="statistics.file.types.open">
|
42
|
31
|
<counts>
|
43
|
|
- <entry key="JAVA" value="9" />
|
|
32
|
+ <entry key="JAVA" value="10" />
|
44
|
33
|
</counts>
|
45
|
34
|
</usages-collector>
|
46
|
35
|
<usages-collector id="statistics.file.extensions.edit">
|
47
|
36
|
<counts>
|
48
|
|
- <entry key="java" value="533" />
|
|
37
|
+ <entry key="java" value="559" />
|
|
38
|
+ <entry key="txt" value="20" />
|
49
|
39
|
</counts>
|
50
|
40
|
</usages-collector>
|
51
|
41
|
<usages-collector id="statistics.file.types.edit">
|
52
|
42
|
<counts>
|
53
|
|
- <entry key="JAVA" value="533" />
|
|
43
|
+ <entry key="JAVA" value="559" />
|
|
44
|
+ <entry key="PLAIN_TEXT" value="20" />
|
54
|
45
|
</counts>
|
55
|
46
|
</usages-collector>
|
56
|
47
|
</session>
|
|
@@ -75,11 +66,11 @@
|
75
|
66
|
</provider>
|
76
|
67
|
</entry>
|
77
|
68
|
</file>
|
78
|
|
- <file pinned="false" current-in-tab="true">
|
|
69
|
+ <file pinned="false" current-in-tab="false">
|
79
|
70
|
<entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
|
80
|
71
|
<provider selected="true" editor-type-id="text-editor">
|
81
|
|
- <state relative-caret-position="150">
|
82
|
|
- <caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
|
|
72
|
+ <state relative-caret-position="255">
|
|
73
|
+ <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
|
83
|
74
|
<folding>
|
84
|
75
|
<element signature="e#154#155#0" expanded="true" />
|
85
|
76
|
<element signature="e#185#186#0" expanded="true" />
|
|
@@ -92,6 +83,15 @@
|
92
|
83
|
</provider>
|
93
|
84
|
</entry>
|
94
|
85
|
</file>
|
|
86
|
+ <file pinned="false" current-in-tab="true">
|
|
87
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
|
|
88
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
89
|
+ <state relative-caret-position="30">
|
|
90
|
+ <caret line="2" column="26" lean-forward="true" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
|
|
91
|
+ </state>
|
|
92
|
+ </provider>
|
|
93
|
+ </entry>
|
|
94
|
+ </file>
|
95
|
95
|
</leaf>
|
96
|
96
|
</split-first>
|
97
|
97
|
<split-second>
|
|
@@ -99,8 +99,8 @@
|
99
|
99
|
<file pinned="false" current-in-tab="true">
|
100
|
100
|
<entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
|
101
|
101
|
<provider selected="true" editor-type-id="text-editor">
|
102
|
|
- <state relative-caret-position="450">
|
103
|
|
- <caret line="40" column="52" selection-start-line="40" selection-start-column="52" selection-end-line="40" selection-end-column="52" />
|
|
102
|
+ <state relative-caret-position="525">
|
|
103
|
+ <caret line="35" column="14" selection-start-line="35" selection-start-column="14" selection-end-line="35" selection-end-column="14" />
|
104
|
104
|
<folding>
|
105
|
105
|
<element signature="imports" expanded="true" />
|
106
|
106
|
</folding>
|
|
@@ -115,8 +115,8 @@
|
115
|
115
|
<component name="FileTemplateManagerImpl">
|
116
|
116
|
<option name="RECENT_TEMPLATES">
|
117
|
117
|
<list>
|
118
|
|
- <option value="Interface" />
|
119
|
118
|
<option value="Class" />
|
|
119
|
+ <option value="Interface" />
|
120
|
120
|
</list>
|
121
|
121
|
</option>
|
122
|
122
|
</component>
|
|
@@ -141,10 +141,9 @@
|
141
|
141
|
<sorting>DEFINITION_ORDER</sorting>
|
142
|
142
|
</component>
|
143
|
143
|
<component name="ProjectFrameBounds" extendedState="6">
|
144
|
|
- <option name="x" value="-309" />
|
145
|
|
- <option name="y" value="-1057" />
|
146
|
|
- <option name="width" value="1920" />
|
147
|
|
- <option name="height" value="1057" />
|
|
144
|
+ <option name="y" value="23" />
|
|
145
|
+ <option name="width" value="1280" />
|
|
146
|
+ <option name="height" value="709" />
|
148
|
147
|
</component>
|
149
|
148
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
150
|
149
|
<ConfirmationsSetting value="2" id="Add" />
|
|
@@ -219,7 +218,7 @@
|
219
|
218
|
<component name="PropertiesComponent">
|
220
|
219
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
221
|
220
|
<property name="aspect.path.notification.shown" value="true" />
|
222
|
|
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541441797458" />
|
|
221
|
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541442045950" />
|
223
|
222
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
|
224
|
223
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
225
|
224
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
@@ -310,8 +309,16 @@
|
310
|
309
|
<updated>1541283434383</updated>
|
311
|
310
|
<workItem from="1541283435850" duration="41000" />
|
312
|
311
|
<workItem from="1541425891076" duration="1680000" />
|
313
|
|
- <workItem from="1541439761012" duration="1712000" />
|
|
312
|
+ <workItem from="1541439761012" duration="2637000" />
|
314
|
313
|
</task>
|
|
314
|
+ <task id="LOCAL-00001" summary="Part 1-3 complete">
|
|
315
|
+ <created>1541441816861</created>
|
|
316
|
+ <option name="number" value="00001" />
|
|
317
|
+ <option name="presentableId" value="LOCAL-00001" />
|
|
318
|
+ <option name="project" value="LOCAL" />
|
|
319
|
+ <updated>1541441816861</updated>
|
|
320
|
+ </task>
|
|
321
|
+ <option name="localTasksCounter" value="2" />
|
315
|
322
|
<servers />
|
316
|
323
|
</component>
|
317
|
324
|
<component name="TestHistory">
|
|
@@ -339,15 +346,21 @@
|
339
|
346
|
<history-entry file="TestPerson_testInheritance - 2018.11.05 at 13h 10m 35s.xml">
|
340
|
347
|
<configuration name="TestPerson.testInheritance" configurationId="JUnit" />
|
341
|
348
|
</history-entry>
|
|
349
|
+ <history-entry file="TestPerson_testLearn - 2018.11.05 at 13h 14m 37s.xml">
|
|
350
|
+ <configuration name="TestPerson.testLearn" configurationId="JUnit" />
|
|
351
|
+ </history-entry>
|
|
352
|
+ <history-entry file="TestPerson_testLearn - 2018.11.05 at 13h 15m 40s.xml">
|
|
353
|
+ <configuration name="TestPerson.testLearn" configurationId="JUnit" />
|
|
354
|
+ </history-entry>
|
342
|
355
|
</component>
|
343
|
356
|
<component name="TimeTrackingManager">
|
344
|
|
- <option name="totallyTimeSpent" value="3433000" />
|
|
357
|
+ <option name="totallyTimeSpent" value="4358000" />
|
345
|
358
|
</component>
|
346
|
359
|
<component name="ToolWindowManager">
|
347
|
|
- <frame x="-309" y="-1057" width="1920" height="1057" extended-state="6" />
|
|
360
|
+ <frame x="0" y="23" width="1280" height="709" extended-state="6" />
|
348
|
361
|
<editor active="true" />
|
349
|
362
|
<layout>
|
350
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12673056" />
|
|
363
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19224556" />
|
351
|
364
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
352
|
365
|
<window_info id="Image Layers" order="2" />
|
353
|
366
|
<window_info id="Designer" order="3" />
|
|
@@ -357,7 +370,7 @@
|
357
|
370
|
<window_info anchor="bottom" id="Messages" weight="0.32953367" />
|
358
|
371
|
<window_info anchor="bottom" id="Message" order="0" />
|
359
|
372
|
<window_info anchor="bottom" id="Find" order="1" />
|
360
|
|
- <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.32953367" />
|
|
373
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.32953367" />
|
361
|
374
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
362
|
375
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
363
|
376
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
@@ -383,6 +396,10 @@
|
383
|
396
|
<component name="VcsContentAnnotationSettings">
|
384
|
397
|
<option name="myLimit" value="2678400000" />
|
385
|
398
|
</component>
|
|
399
|
+ <component name="VcsManagerConfiguration">
|
|
400
|
+ <MESSAGE value="Part 1-3 complete" />
|
|
401
|
+ <option name="LAST_COMMIT_MESSAGE" value="Part 1-3 complete" />
|
|
402
|
+ </component>
|
386
|
403
|
<component name="editorHistoryManager">
|
387
|
404
|
<entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
|
388
|
405
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -412,10 +429,20 @@
|
412
|
429
|
</state>
|
413
|
430
|
</provider>
|
414
|
431
|
</entry>
|
|
432
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
|
|
433
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
434
|
+ <state relative-caret-position="525">
|
|
435
|
+ <caret line="35" column="14" selection-start-line="35" selection-start-column="14" selection-end-line="35" selection-end-column="14" />
|
|
436
|
+ <folding>
|
|
437
|
+ <element signature="imports" expanded="true" />
|
|
438
|
+ </folding>
|
|
439
|
+ </state>
|
|
440
|
+ </provider>
|
|
441
|
+ </entry>
|
415
|
442
|
<entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
|
416
|
443
|
<provider selected="true" editor-type-id="text-editor">
|
417
|
|
- <state relative-caret-position="150">
|
418
|
|
- <caret line="10" column="24" selection-start-line="10" selection-start-column="24" selection-end-line="10" selection-end-column="24" />
|
|
444
|
+ <state relative-caret-position="255">
|
|
445
|
+ <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
|
419
|
446
|
<folding>
|
420
|
447
|
<element signature="e#154#155#0" expanded="true" />
|
421
|
448
|
<element signature="e#185#186#0" expanded="true" />
|
|
@@ -427,13 +454,10 @@
|
427
|
454
|
</state>
|
428
|
455
|
</provider>
|
429
|
456
|
</entry>
|
430
|
|
- <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
|
|
457
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
|
431
|
458
|
<provider selected="true" editor-type-id="text-editor">
|
432
|
|
- <state relative-caret-position="450">
|
433
|
|
- <caret line="40" column="52" selection-start-line="40" selection-start-column="52" selection-end-line="40" selection-end-column="52" />
|
434
|
|
- <folding>
|
435
|
|
- <element signature="imports" expanded="true" />
|
436
|
|
- </folding>
|
|
459
|
+ <state relative-caret-position="30">
|
|
460
|
+ <caret line="2" column="26" lean-forward="true" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="26" />
|
437
|
461
|
</state>
|
438
|
462
|
</provider>
|
439
|
463
|
</entry>
|