|
@@ -2,7 +2,6 @@
|
2
|
2
|
<project version="4">
|
3
|
3
|
<component name="ChangeListManager">
|
4
|
4
|
<list default="true" id="e282cee1-bfe9-42a3-9794-9633eb4654d1" name="Default" comment="">
|
5
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
6
|
5
|
<change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" />
|
7
|
6
|
</list>
|
8
|
7
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
@@ -14,7 +13,7 @@
|
14
|
13
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
15
|
14
|
</component>
|
16
|
15
|
<component name="FileEditorManager">
|
17
|
|
- <splitter split-orientation="horizontal" split-proportion="0.81826484">
|
|
16
|
+ <splitter split-orientation="horizontal" split-proportion="0.6187399">
|
18
|
17
|
<split-first>
|
19
|
18
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
20
|
19
|
<file leaf-file-name="SimpleWindow.java" pinned="false" current-in-tab="false">
|
|
@@ -32,14 +31,9 @@
|
32
|
31
|
<file leaf-file-name="ConwayGameOfLife.java" pinned="false" current-in-tab="true">
|
33
|
32
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
|
34
|
33
|
<provider selected="true" editor-type-id="text-editor">
|
35
|
|
- <state relative-caret-position="710">
|
36
|
|
- <caret line="66" column="30" lean-forward="true" selection-start-line="66" selection-start-column="30" selection-end-line="66" selection-end-column="30" />
|
37
|
|
- <folding>
|
38
|
|
- <element signature="e#906#907#0" expanded="true" />
|
39
|
|
- <element signature="e#942#943#0" expanded="true" />
|
40
|
|
- <element signature="e#997#998#0" expanded="true" />
|
41
|
|
- <element signature="e#1033#1034#0" expanded="true" />
|
42
|
|
- </folding>
|
|
34
|
+ <state relative-caret-position="360">
|
|
35
|
+ <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
36
|
+ <folding />
|
43
|
37
|
</state>
|
44
|
38
|
</provider>
|
45
|
39
|
</entry>
|
|
@@ -51,8 +45,8 @@
|
51
|
45
|
<file leaf-file-name="ConwayGameOfLifeTest.java" pinned="false" current-in-tab="true">
|
52
|
46
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
|
53
|
47
|
<provider selected="true" editor-type-id="text-editor">
|
54
|
|
- <state relative-caret-position="360">
|
55
|
|
- <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
|
|
48
|
+ <state relative-caret-position="330">
|
|
49
|
+ <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
56
|
50
|
<folding />
|
57
|
51
|
</state>
|
58
|
52
|
</provider>
|
|
@@ -250,7 +244,7 @@
|
250
|
244
|
</list>
|
251
|
245
|
</option>
|
252
|
246
|
</component>
|
253
|
|
- <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest">
|
|
247
|
+ <component name="RunManager" selected="Application.ConwayGameOfLife">
|
254
|
248
|
<configuration default="true" type="Applet" factoryName="Applet">
|
255
|
249
|
<option name="HTML_USED" value="false" />
|
256
|
250
|
<option name="WIDTH" value="400" />
|
|
@@ -277,20 +271,6 @@
|
277
|
271
|
<module name="Game-Of-Life-Java" />
|
278
|
272
|
<envs />
|
279
|
273
|
</configuration>
|
280
|
|
- <configuration name="GameofLife" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
281
|
|
- <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
282
|
|
- <option name="MAIN_CLASS_NAME" value="GameofLife" />
|
283
|
|
- <option name="VM_PARAMETERS" />
|
284
|
|
- <option name="PROGRAM_PARAMETERS" />
|
285
|
|
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
286
|
|
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
287
|
|
- <option name="ALTERNATIVE_JRE_PATH" />
|
288
|
|
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
|
289
|
|
- <option name="ENV_VARIABLES" />
|
290
|
|
- <option name="PASS_PARENT_ENVS" value="true" />
|
291
|
|
- <module name="Game-Of-Life-Java" />
|
292
|
|
- <envs />
|
293
|
|
- </configuration>
|
294
|
274
|
<configuration default="true" type="Application" factoryName="Application">
|
295
|
275
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
|
296
|
276
|
<option name="MAIN_CLASS_NAME" />
|
|
@@ -355,6 +335,31 @@
|
355
|
335
|
<envs />
|
356
|
336
|
<patterns />
|
357
|
337
|
</configuration>
|
|
338
|
+ <configuration name="ConwayGameOfLifeTest.runTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
|
339
|
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
|
|
340
|
+ <pattern>
|
|
341
|
+ <option name="PATTERN" value="com.zipcodeconway.*" />
|
|
342
|
+ <option name="ENABLED" value="true" />
|
|
343
|
+ </pattern>
|
|
344
|
+ </extension>
|
|
345
|
+ <module name="Game-Of-Life-Java" />
|
|
346
|
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
|
347
|
+ <option name="ALTERNATIVE_JRE_PATH" />
|
|
348
|
+ <option name="PACKAGE_NAME" value="com.zipcodeconway" />
|
|
349
|
+ <option name="MAIN_CLASS_NAME" value="com.zipcodeconway.ConwayGameOfLifeTest" />
|
|
350
|
+ <option name="METHOD_NAME" value="runTest1" />
|
|
351
|
+ <option name="TEST_OBJECT" value="method" />
|
|
352
|
+ <option name="VM_PARAMETERS" value="-ea" />
|
|
353
|
+ <option name="PARAMETERS" />
|
|
354
|
+ <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
|
|
355
|
+ <option name="ENV_VARIABLES" />
|
|
356
|
+ <option name="PASS_PARENT_ENVS" value="true" />
|
|
357
|
+ <option name="TEST_SEARCH_SCOPE">
|
|
358
|
+ <value defaultName="singleModule" />
|
|
359
|
+ </option>
|
|
360
|
+ <envs />
|
|
361
|
+ <patterns />
|
|
362
|
+ </configuration>
|
358
|
363
|
<configuration name="ConwayGameOfLifeTest.runTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
|
359
|
364
|
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
|
360
|
365
|
<pattern>
|
|
@@ -463,19 +468,19 @@
|
463
|
468
|
</configuration>
|
464
|
469
|
<list size="6">
|
465
|
470
|
<item index="0" class="java.lang.String" itemvalue="Maven.ConwayLife" />
|
466
|
|
- <item index="1" class="java.lang.String" itemvalue="Application.GameofLife" />
|
467
|
|
- <item index="2" class="java.lang.String" itemvalue="Application.ConwayGameOfLife" />
|
468
|
|
- <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
|
469
|
|
- <item index="4" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
|
470
|
|
- <item index="5" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest" />
|
|
471
|
+ <item index="1" class="java.lang.String" itemvalue="Application.ConwayGameOfLife" />
|
|
472
|
+ <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
|
|
473
|
+ <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
|
|
474
|
+ <item index="4" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest" />
|
|
475
|
+ <item index="5" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
|
471
|
476
|
</list>
|
472
|
477
|
<recent_temporary>
|
473
|
478
|
<list size="5">
|
474
|
|
- <item index="0" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest" />
|
475
|
|
- <item index="1" class="java.lang.String" itemvalue="Application.ConwayGameOfLife" />
|
476
|
|
- <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
|
477
|
|
- <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
|
478
|
|
- <item index="4" class="java.lang.String" itemvalue="Application.GameofLife" />
|
|
479
|
+ <item index="0" class="java.lang.String" itemvalue="Application.ConwayGameOfLife" />
|
|
480
|
+ <item index="1" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
|
|
481
|
+ <item index="2" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest" />
|
|
482
|
+ <item index="3" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
|
|
483
|
+ <item index="4" class="java.lang.String" itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
|
479
|
484
|
</list>
|
480
|
485
|
</recent_temporary>
|
481
|
486
|
</component>
|
|
@@ -493,44 +498,44 @@
|
493
|
498
|
<option name="presentableId" value="Default" />
|
494
|
499
|
<updated>1519668901598</updated>
|
495
|
500
|
<workItem from="1519668902904" duration="14517000" />
|
496
|
|
- <workItem from="1520878020643" duration="8732000" />
|
|
501
|
+ <workItem from="1520878020643" duration="14894000" />
|
497
|
502
|
</task>
|
498
|
503
|
<servers />
|
499
|
504
|
</component>
|
500
|
505
|
<component name="TestHistory">
|
501
|
|
- <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 45m 01s.xml">
|
|
506
|
+ <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 19h 49m 15s.xml">
|
502
|
507
|
<configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
|
503
|
508
|
</history-entry>
|
504
|
|
- <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 15h 59m 00s.xml">
|
|
509
|
+ <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 19h 51m 07s.xml">
|
505
|
510
|
<configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
|
506
|
511
|
</history-entry>
|
507
|
|
- <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 02m 03s.xml">
|
|
512
|
+ <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 19h 52m 06s.xml">
|
508
|
513
|
<configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
|
509
|
514
|
</history-entry>
|
510
|
|
- <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 03m 01s.xml">
|
|
515
|
+ <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 19h 55m 16s.xml">
|
511
|
516
|
<configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
|
512
|
517
|
</history-entry>
|
513
|
|
- <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 05m 07s.xml">
|
|
518
|
+ <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 19h 57m 18s.xml">
|
514
|
519
|
<configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
|
515
|
520
|
</history-entry>
|
516
|
|
- <history-entry file="ConwayGameOfLifeTest - 2018.02.26 at 16h 06m 11s.xml">
|
|
521
|
+ <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 20h 04m 42s.xml">
|
517
|
522
|
<configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
|
518
|
523
|
</history-entry>
|
519
|
|
- <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 14h 51m 42s.xml">
|
|
524
|
+ <history-entry file="ConwayGameOfLifeTest - 2018.03.12 at 20h 09m 48s.xml">
|
520
|
525
|
<configuration name="ConwayGameOfLifeTest" configurationId="JUnit" />
|
521
|
526
|
</history-entry>
|
522
|
|
- <history-entry file="ConwayGameOfLifeTest_runTest - 2018.02.26 at 15h 41m 14s.xml">
|
523
|
|
- <configuration name="ConwayGameOfLifeTest.runTest" configurationId="JUnit" />
|
|
527
|
+ <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.03.12 at 20h 14m 36s.xml">
|
|
528
|
+ <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
|
524
|
529
|
</history-entry>
|
525
|
|
- <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 02s.xml">
|
526
|
|
- <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
|
|
530
|
+ <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.03.12 at 20h 18m 22s.xml">
|
|
531
|
+ <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
|
527
|
532
|
</history-entry>
|
528
|
|
- <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.02.26 at 15h 42m 18s.xml">
|
529
|
|
- <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
|
|
533
|
+ <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.03.12 at 20h 20m 40s.xml">
|
|
534
|
+ <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
|
530
|
535
|
</history-entry>
|
531
|
536
|
</component>
|
532
|
537
|
<component name="TimeTrackingManager">
|
533
|
|
- <option name="totallyTimeSpent" value="23249000" />
|
|
538
|
+ <option name="totallyTimeSpent" value="29411000" />
|
534
|
539
|
</component>
|
535
|
540
|
<component name="ToolWindowManager">
|
536
|
541
|
<frame x="0" y="0" width="1280" height="800" extended-state="0" />
|
|
@@ -544,12 +549,12 @@
|
544
|
549
|
<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" />
|
545
|
550
|
<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" />
|
546
|
551
|
<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" />
|
547
|
|
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15405777" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
552
|
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16781293" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
548
|
553
|
<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" />
|
549
|
554
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32970026" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
550
|
555
|
<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" />
|
551
|
556
|
<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" />
|
552
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11470113" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
557
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.0" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
553
|
558
|
<window_info id="Database" 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" />
|
554
|
559
|
<window_info id="Structure" active="false" anchor="left" 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" />
|
555
|
560
|
<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" />
|
|
@@ -592,12 +597,7 @@
|
592
|
597
|
<provider selected="true" editor-type-id="text-editor">
|
593
|
598
|
<state relative-caret-position="300">
|
594
|
599
|
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
|
595
|
|
- <folding>
|
596
|
|
- <element signature="e#906#907#0" expanded="true" />
|
597
|
|
- <element signature="e#942#943#0" expanded="true" />
|
598
|
|
- <element signature="e#997#998#0" expanded="true" />
|
599
|
|
- <element signature="e#1033#1034#0" expanded="true" />
|
600
|
|
- </folding>
|
|
600
|
+ <folding />
|
601
|
601
|
</state>
|
602
|
602
|
</provider>
|
603
|
603
|
</entry>
|
|
@@ -656,22 +656,17 @@
|
656
|
656
|
</entry>
|
657
|
657
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
|
658
|
658
|
<provider selected="true" editor-type-id="text-editor">
|
659
|
|
- <state relative-caret-position="360">
|
660
|
|
- <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
|
|
659
|
+ <state relative-caret-position="330">
|
|
660
|
+ <caret line="24" column="0" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
661
|
661
|
<folding />
|
662
|
662
|
</state>
|
663
|
663
|
</provider>
|
664
|
664
|
</entry>
|
665
|
665
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
|
666
|
666
|
<provider selected="true" editor-type-id="text-editor">
|
667
|
|
- <state relative-caret-position="710">
|
668
|
|
- <caret line="66" column="30" lean-forward="true" selection-start-line="66" selection-start-column="30" selection-end-line="66" selection-end-column="30" />
|
669
|
|
- <folding>
|
670
|
|
- <element signature="e#906#907#0" expanded="true" />
|
671
|
|
- <element signature="e#942#943#0" expanded="true" />
|
672
|
|
- <element signature="e#997#998#0" expanded="true" />
|
673
|
|
- <element signature="e#1033#1034#0" expanded="true" />
|
674
|
|
- </folding>
|
|
667
|
+ <state relative-caret-position="360">
|
|
668
|
+ <caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
669
|
+ <folding />
|
675
|
670
|
</state>
|
676
|
671
|
</provider>
|
677
|
672
|
</entry>
|