From 33dba0a7dd4329523f941d1008b81d24028f655a Mon Sep 17 00:00:00 2001 From: Haysel Santiago Date: Mon, 12 Mar 2018 18:21:13 -0400 Subject: [PATCH 1/2] Lab is complete --- .idea/.name | 1 + .idea/misc.xml | 4 +- .idea/modules.xml | 2 +- .idea/uiDesigner.xml | 124 ---- .idea/vcs.xml | 2 +- .idea/workspace.xml | 540 ++++-------------- ...-Of-Life-Java.iml => Game-Of-Life-Java.iml | 1 - .../com/zipcodeconway/ConwayGameOfLife.java | 89 ++- .../java/com/zipcodeconway/SimpleWindow.java | 7 +- 9 files changed, 203 insertions(+), 567 deletions(-) create mode 100644 .idea/.name delete mode 100644 .idea/uiDesigner.xml rename .idea/Game-Of-Life-Java.iml => Game-Of-Life-Java.iml (91%) diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..d920b20 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Game-Of-Life-Java \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 05e1d17..b2526f7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,5 +7,7 @@ - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f98eea2..6604c74 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 35eb1dd..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ce6df6f..7d3a125 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,17 @@ - + + + + + + + + + + + - - + + - - - - - + + + - - + + - - + + - - - - - + - - - - - JAVA - com.zipcodeconway.ConwayGameOfLife - - com.zipcodeconway.ConwayGameOfLife - - - - - - - Constructors - Methods - - All - private - - - - - - - - - - - - - - - - - - + - - - + + + + + - - - - end + random + white - - currentGeneration - nextGeneration -