Bladeren bron

testing some things

Trinh Tong 6 jaren geleden
bovenliggende
commit
f3888cdb26
2 gewijzigde bestanden met toevoegingen van 27 en 27 verwijderingen
  1. 27
    26
      .idea/workspace.xml
  2. 0
    1
      src/main/java/com/zipcodeconway/ConwayGameOfLife.java

+ 27
- 26
.idea/workspace.xml Bestand weergeven

@@ -2,8 +2,8 @@
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" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
5 6
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java" afterDir="false" />
7 7
     </list>
8 8
     <ignored path="$PROJECT_DIR$/target/" />
9 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,21 +16,21 @@
16 16
     <session id="-1655333311">
17 17
       <usages-collector id="statistics.lifecycle.project">
18 18
         <counts>
19
-          <entry key="project.closed" value="1" />
20
-          <entry key="project.open.time.1" value="1" />
19
+          <entry key="project.closed" value="2" />
20
+          <entry key="project.open.time.1" value="2" />
21 21
           <entry key="project.open.time.2" value="1" />
22
-          <entry key="project.opened" value="2" />
22
+          <entry key="project.opened" value="3" />
23 23
         </counts>
24 24
       </usages-collector>
25 25
       <usages-collector id="statistics.file.extensions.edit">
26 26
         <counts>
27 27
           <entry key="dummy" value="4" />
28
-          <entry key="java" value="2698" />
28
+          <entry key="java" value="2727" />
29 29
         </counts>
30 30
       </usages-collector>
31 31
       <usages-collector id="statistics.file.types.edit">
32 32
         <counts>
33
-          <entry key="JAVA" value="2698" />
33
+          <entry key="JAVA" value="2727" />
34 34
           <entry key="PLAIN_TEXT" value="4" />
35 35
         </counts>
36 36
       </usages-collector>
@@ -53,7 +53,7 @@
53 53
       <file pinned="false" current-in-tab="false">
54 54
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
55 55
           <provider selected="true" editor-type-id="text-editor">
56
-            <state relative-caret-position="297">
56
+            <state relative-caret-position="1035">
57 57
               <caret line="45" column="42" selection-start-line="45" selection-start-column="42" selection-end-line="45" selection-end-column="42" />
58 58
               <folding>
59 59
                 <element signature="imports" expanded="true" />
@@ -65,8 +65,8 @@
65 65
       <file pinned="false" current-in-tab="true">
66 66
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
67 67
           <provider selected="true" editor-type-id="text-editor">
68
-            <state relative-caret-position="272">
69
-              <caret line="39" column="36" selection-start-line="39" selection-start-column="36" selection-end-line="39" selection-end-column="36" />
68
+            <state relative-caret-position="2233">
69
+              <caret line="101" column="5" lean-forward="true" selection-start-line="101" selection-start-column="5" selection-end-line="101" selection-end-column="5" />
70 70
               <folding>
71 71
                 <element signature="imports" expanded="true" />
72 72
               </folding>
@@ -77,7 +77,7 @@
77 77
       <file pinned="false" current-in-tab="false">
78 78
         <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
79 79
           <provider selected="true" editor-type-id="text-editor">
80
-            <state relative-caret-position="318">
80
+            <state relative-caret-position="552">
81 81
               <caret line="26" selection-start-line="26" selection-end-line="26" />
82 82
             </state>
83 83
           </provider>
@@ -236,7 +236,7 @@
236 236
   <component name="PropertiesComponent">
237 237
     <property name="WebServerToolWindowFactoryState" value="false" />
238 238
     <property name="aspect.path.notification.shown" value="true" />
239
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542955398370" />
239
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542985985591" />
240 240
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
241 241
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
242 242
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -271,7 +271,7 @@
271 271
       </list>
272 272
     </option>
273 273
   </component>
274
-  <component name="RunManager" selected="JUnit.ConwayGameOfLifeTest.runTest1">
274
+  <component name="RunManager" selected="Application.ConwayGameOfLife">
275 275
     <configuration default="true" type="Applet" factoryName="Applet">
276 276
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
277 277
       <method v="2">
@@ -420,8 +420,8 @@
420 420
     </list>
421 421
     <recent_temporary>
422 422
       <list>
423
-        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
424 423
         <item itemvalue="Application.ConwayGameOfLife" />
424
+        <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest1" />
425 425
         <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest2" />
426 426
         <item itemvalue="JUnit.ConwayGameOfLifeTest" />
427 427
         <item itemvalue="JUnit.ConwayGameOfLifeTest.runTest" />
@@ -440,17 +440,12 @@
440 440
       <updated>1519668901598</updated>
441 441
       <workItem from="1519668902904" duration="14517000" />
442 442
       <workItem from="1542812060099" duration="11608000" />
443
-      <workItem from="1542954442477" duration="943000" />
443
+      <workItem from="1542954442477" duration="1000000" />
444
+      <workItem from="1542985773221" duration="266000" />
444 445
     </task>
445 446
     <servers />
446 447
   </component>
447 448
   <component name="TestHistory">
448
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.11.21 at 18h 56m 47s.xml">
449
-      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
450
-    </history-entry>
451
-    <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.11.21 at 19h 30m 38s.xml">
452
-      <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
453
-    </history-entry>
454 449
     <history-entry file="ConwayGameOfLifeTest_runTest2 - 2018.11.21 at 19h 30m 43s.xml">
455 450
       <configuration name="ConwayGameOfLifeTest.runTest2" configurationId="JUnit" />
456 451
     </history-entry>
@@ -475,15 +470,21 @@
475 470
     <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.11.23 at 01h 41m 45s.xml">
476 471
       <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
477 472
     </history-entry>
473
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.11.23 at 01h 43m 12s.xml">
474
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
475
+    </history-entry>
476
+    <history-entry file="ConwayGameOfLifeTest_runTest1 - 2018.11.23 at 01h 43m 22s.xml">
477
+      <configuration name="ConwayGameOfLifeTest.runTest1" configurationId="JUnit" />
478
+    </history-entry>
478 479
   </component>
479 480
   <component name="TimeTrackingManager">
480
-    <option name="totallyTimeSpent" value="27068000" />
481
+    <option name="totallyTimeSpent" value="27391000" />
481 482
   </component>
482 483
   <component name="ToolWindowManager">
483 484
     <frame x="0" y="32" width="1440" height="821" extended-state="0" />
484 485
     <editor active="true" />
485 486
     <layout>
486
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25679544" />
487
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26037195" />
487 488
       <window_info id="Structure" order="1" weight="0.25" />
488 489
       <window_info id="Image Layers" order="2" />
489 490
       <window_info id="Designer" order="3" />
@@ -564,7 +565,7 @@
564 565
     </entry>
565 566
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/SimpleWindow.java">
566 567
       <provider selected="true" editor-type-id="text-editor">
567
-        <state relative-caret-position="297">
568
+        <state relative-caret-position="1035">
568 569
           <caret line="45" column="42" selection-start-line="45" selection-start-column="42" selection-end-line="45" selection-end-column="42" />
569 570
           <folding>
570 571
             <element signature="imports" expanded="true" />
@@ -574,15 +575,15 @@
574 575
     </entry>
575 576
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodeconway/ConwayGameOfLifeTest.java">
576 577
       <provider selected="true" editor-type-id="text-editor">
577
-        <state relative-caret-position="318">
578
+        <state relative-caret-position="552">
578 579
           <caret line="26" selection-start-line="26" selection-end-line="26" />
579 580
         </state>
580 581
       </provider>
581 582
     </entry>
582 583
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodeconway/ConwayGameOfLife.java">
583 584
       <provider selected="true" editor-type-id="text-editor">
584
-        <state relative-caret-position="272">
585
-          <caret line="39" column="36" selection-start-line="39" selection-start-column="36" selection-end-line="39" selection-end-column="36" />
585
+        <state relative-caret-position="2233">
586
+          <caret line="101" column="5" lean-forward="true" selection-start-line="101" selection-start-column="5" selection-end-line="101" selection-end-column="5" />
586 587
           <folding>
587 588
             <element signature="imports" expanded="true" />
588 589
           </folding>

+ 0
- 1
src/main/java/com/zipcodeconway/ConwayGameOfLife.java Bestand weergeven

@@ -98,7 +98,6 @@ public class ConwayGameOfLife {
98 98
         if (count == 3 || (world[row][col] == 1 && count == 2)) {
99 99
             returnValue = 1;
100 100
         }
101
-
102 101
         return returnValue;
103 102
     }
104 103