|
@@ -1,9 +1,7 @@
|
1
|
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
2
|
2
|
<project version="4">
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
|
- <list default="true" id="26347f4d-713c-461d-b161-a64822c4681e" name="Default" comment="">
|
5
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
6
|
|
- </list>
|
|
4
|
+ <list default="true" id="26347f4d-713c-461d-b161-a64822c4681e" name="Default" comment="" />
|
7
|
5
|
<ignored path="$PROJECT_DIR$/target/" />
|
8
|
6
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
9
|
7
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -19,8 +17,8 @@
|
19
|
17
|
<file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
|
20
|
18
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
|
21
|
19
|
<provider selected="true" editor-type-id="text-editor">
|
22
|
|
- <state relative-caret-position="527">
|
23
|
|
- <caret line="41" column="44" lean-forward="true" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="44" />
|
|
20
|
+ <state relative-caret-position="600">
|
|
21
|
+ <caret line="41" column="44" lean-forward="false" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="44" />
|
24
|
22
|
<folding />
|
25
|
23
|
</state>
|
26
|
24
|
</provider>
|
|
@@ -43,8 +41,8 @@
|
43
|
41
|
<file leaf-file-name="ConwayGameOfLifeTest.java" pinned="false" current-in-tab="true">
|
44
|
42
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
|
45
|
43
|
<provider selected="true" editor-type-id="text-editor">
|
46
|
|
- <state relative-caret-position="8">
|
47
|
|
- <caret line="44" column="50" lean-forward="true" selection-start-line="44" selection-start-column="50" selection-end-line="44" selection-end-column="50" />
|
|
44
|
+ <state relative-caret-position="15">
|
|
45
|
+ <caret line="44" column="50" lean-forward="false" selection-start-line="44" selection-start-column="50" selection-end-line="44" selection-end-column="50" />
|
48
|
46
|
<folding />
|
49
|
47
|
</state>
|
50
|
48
|
</provider>
|
|
@@ -99,9 +97,7 @@
|
99
|
97
|
<foldersAlwaysOnTop value="true" />
|
100
|
98
|
</navigator>
|
101
|
99
|
<panes>
|
102
|
|
- <pane id="AndroidView" />
|
103
|
100
|
<pane id="PackagesPane" />
|
104
|
|
- <pane id="Scratches" />
|
105
|
101
|
<pane id="ProjectPane">
|
106
|
102
|
<subPane>
|
107
|
103
|
<expand>
|
|
@@ -160,7 +156,9 @@
|
160
|
156
|
<select />
|
161
|
157
|
</subPane>
|
162
|
158
|
</pane>
|
|
159
|
+ <pane id="AndroidView" />
|
163
|
160
|
<pane id="Scope" />
|
|
161
|
+ <pane id="Scratches" />
|
164
|
162
|
</panes>
|
165
|
163
|
</component>
|
166
|
164
|
<component name="PropertiesComponent">
|
|
@@ -414,6 +412,7 @@
|
414
|
412
|
<updated>1520867652526</updated>
|
415
|
413
|
<workItem from="1520867656190" duration="4128000" />
|
416
|
414
|
<workItem from="1520872722088" duration="9667000" />
|
|
415
|
+ <workItem from="1520882707267" duration="36000" />
|
417
|
416
|
</task>
|
418
|
417
|
<servers />
|
419
|
418
|
</component>
|
|
@@ -450,21 +449,20 @@
|
450
|
449
|
</history-entry>
|
451
|
450
|
</component>
|
452
|
451
|
<component name="TimeTrackingManager">
|
453
|
|
- <option name="totallyTimeSpent" value="13795000" />
|
|
452
|
+ <option name="totallyTimeSpent" value="13831000" />
|
454
|
453
|
</component>
|
455
|
454
|
<component name="ToolWindowManager">
|
456
|
455
|
<frame x="-317" y="-1057" width="1882" height="1057" extended-state="0" />
|
457
|
456
|
<layout>
|
458
|
457
|
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
459
|
458
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
460
|
|
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.328934" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
461
|
459
|
<window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
462
|
460
|
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
463
|
461
|
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
464
|
462
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
465
|
463
|
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
466
|
|
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
467
|
464
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22639593" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
465
|
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
468
|
466
|
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.328934" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
469
|
467
|
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
470
|
468
|
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
@@ -474,12 +472,13 @@
|
474
|
472
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
475
|
473
|
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
476
|
474
|
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
477
|
|
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
478
|
475
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
476
|
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
|
479
|
477
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
480
|
478
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
481
|
479
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
482
|
480
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
|
|
481
|
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.328934" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
483
|
482
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
484
|
483
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
485
|
484
|
</layout>
|
|
@@ -497,6 +496,30 @@
|
497
|
496
|
<component name="editorHistoryManager">
|
498
|
497
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
|
499
|
498
|
<provider selected="true" editor-type-id="text-editor">
|
|
499
|
+ <state relative-caret-position="600">
|
|
500
|
+ <caret line="41" column="44" lean-forward="true" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="44" />
|
|
501
|
+ <folding />
|
|
502
|
+ </state>
|
|
503
|
+ </provider>
|
|
504
|
+ </entry>
|
|
505
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
|
|
506
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
507
|
+ <state relative-caret-position="1935">
|
|
508
|
+ <caret line="129" column="45" lean-forward="false" selection-start-line="129" selection-start-column="45" selection-end-line="129" selection-end-column="45" />
|
|
509
|
+ <folding />
|
|
510
|
+ </state>
|
|
511
|
+ </provider>
|
|
512
|
+ </entry>
|
|
513
|
+ <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
|
|
514
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
515
|
+ <state relative-caret-position="0">
|
|
516
|
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
517
|
+ <folding />
|
|
518
|
+ </state>
|
|
519
|
+ </provider>
|
|
520
|
+ </entry>
|
|
521
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
|
|
522
|
+ <provider selected="true" editor-type-id="text-editor">
|
500
|
523
|
<state relative-caret-position="60">
|
501
|
524
|
<caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
|
502
|
525
|
<folding />
|
|
@@ -521,16 +544,16 @@
|
521
|
544
|
</entry>
|
522
|
545
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
|
523
|
546
|
<provider selected="true" editor-type-id="text-editor">
|
524
|
|
- <state relative-caret-position="8">
|
525
|
|
- <caret line="44" column="50" lean-forward="true" selection-start-line="44" selection-start-column="50" selection-end-line="44" selection-end-column="50" />
|
|
547
|
+ <state relative-caret-position="15">
|
|
548
|
+ <caret line="44" column="50" lean-forward="false" selection-start-line="44" selection-start-column="50" selection-end-line="44" selection-end-column="50" />
|
526
|
549
|
<folding />
|
527
|
550
|
</state>
|
528
|
551
|
</provider>
|
529
|
552
|
</entry>
|
530
|
553
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
|
531
|
554
|
<provider selected="true" editor-type-id="text-editor">
|
532
|
|
- <state relative-caret-position="527">
|
533
|
|
- <caret line="41" column="44" lean-forward="true" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="44" />
|
|
555
|
+ <state relative-caret-position="600">
|
|
556
|
+ <caret line="41" column="44" lean-forward="false" selection-start-line="41" selection-start-column="44" selection-end-line="41" selection-end-column="44" />
|
534
|
557
|
<folding />
|
535
|
558
|
</state>
|
536
|
559
|
</provider>
|