From e61997176219a988e000ee553ebf36dbebdfa45b Mon Sep 17 00:00:00 2001 From: Kristian Knarvik Date: Mon, 16 Apr 2018 13:40:41 +0200 Subject: [PATCH] Merge --- .idea/artifacts/Four_In_A_Row.xml | 11 + .idea/libraries/junit_junit_5_0_SNAPSHOT.xml | 11 + .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/uiDesigner.xml | 124 ++ .idea/workspace.xml | 1038 +++++++++++++++++ Four-In-A-Row.iml | 13 + META-INF/MANIFEST.MF | 3 + out/artifacts/Four_In_A_Row/Four-In-A-Row.jar | Bin 0 -> 31196 bytes out/artifacts/Four_In_A_Row/Four-In-A-Row.zip | Bin 0 -> 28388 bytes out/production/Four-In-A-Row/Main$1.class | Bin 0 -> 669 bytes .../Four-In-A-Row/Main$Gamemode.class | Bin 0 -> 1003 bytes out/production/Four-In-A-Row/Main.class | Bin 0 -> 2344 bytes out/production/Four-In-A-Row/Plan.txt | 70 ++ .../Four-In-A-Row/board/Board.class | Bin 0 -> 4183 bytes out/production/Four-In-A-Row/board/Grid.class | Bin 0 -> 3117 bytes .../Four-In-A-Row/board/IBoard.class | Bin 0 -> 439 bytes .../Four-In-A-Row/board/IGrid.class | Bin 0 -> 496 bytes .../Four-In-A-Row/events/Block.class | Bin 0 -> 763 bytes .../Four-In-A-Row/events/Bomb.class | Bin 0 -> 2110 bytes .../Four-In-A-Row/events/FourInARow.class | Bin 0 -> 461 bytes .../Four-In-A-Row/events/IRandomEvent.class | Bin 0 -> 192 bytes .../Four-In-A-Row/events/IWinCondition.class | Bin 0 -> 153 bytes .../Four-In-A-Row/events/InARow.class | Bin 0 -> 1115 bytes .../Four-In-A-Row/events/RandomEvent.class | Bin 0 -> 853 bytes .../Four-In-A-Row/events/ThreeInARow.class | Bin 0 -> 464 bytes .../interfaces/FourInARowGUI$1.class | Bin 0 -> 726 bytes .../interfaces/FourInARowGUI.class | Bin 0 -> 5695 bytes .../Four-In-A-Row/interfaces/GUI.class | Bin 0 -> 2857 bytes .../interfaces/IGameInterface.class | Bin 0 -> 198 bytes .../interfaces/NInARowGUI$1.class | Bin 0 -> 708 bytes .../Four-In-A-Row/interfaces/NInARowGUI.class | Bin 0 -> 7029 bytes .../interfaces/TicTacToeGUI$1.class | Bin 0 -> 712 bytes .../interfaces/TicTacToeGUI.class | Bin 0 -> 5925 bytes .../Four-In-A-Row/objects/Empty.class | Bin 0 -> 258 bytes .../Four-In-A-Row/objects/GameObject.class | Bin 0 -> 463 bytes .../Four-In-A-Row/objects/Immovable.class | Bin 0 -> 360 bytes .../Four-In-A-Row/objects/Player.class | Bin 0 -> 1140 bytes .../Four-In-A-Row/objects/Token.class | Bin 0 -> 552 bytes out/test/Four-In-A-Row/FourInARowTest.class | Bin 0 -> 1883 bytes out/test/Four-In-A-Row/GridTest.class | Bin 0 -> 1481 bytes out/test/Four-In-A-Row/TicTacToeTest.class | Bin 0 -> 2100 bytes src/Main.java | 47 + src/Plan.txt | 70 ++ src/board/Board.java | 149 +++ src/board/Grid.java | 100 ++ src/board/IBoard.java | 50 + src/board/IGrid.java | 70 ++ src/events/Block.java | 17 + src/events/Bomb.java | 47 + src/events/FourInARow.java | 10 + src/events/IRandomEvent.java | 8 + src/events/IWinCondition.java | 18 + src/events/InARow.java | 47 + src/events/RandomEvent.java | 43 + src/events/ThreeInARow.java | 10 + src/interfaces/FourInARowGUI.java | 136 +++ src/interfaces/GUI.java | 61 + src/interfaces/IGameInterface.java | 6 + src/interfaces/NInARowGUI.java | 181 +++ src/interfaces/TicTacToeGUI.java | 151 +++ src/objects/Empty.java | 3 + src/objects/GameObject.java | 11 + src/objects/Immovable.java | 9 + src/objects/Player.java | 38 + src/objects/Token.java | 14 + test/FourInARowTest.java | 63 + test/GridTest.java | 34 + test/TicTacToeTest.java | 82 ++ 69 files changed, 2759 insertions(+) create mode 100644 .idea/artifacts/Four_In_A_Row.xml create mode 100644 .idea/libraries/junit_junit_5_0_SNAPSHOT.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/workspace.xml create mode 100644 Four-In-A-Row.iml create mode 100644 META-INF/MANIFEST.MF create mode 100644 out/artifacts/Four_In_A_Row/Four-In-A-Row.jar create mode 100644 out/artifacts/Four_In_A_Row/Four-In-A-Row.zip create mode 100644 out/production/Four-In-A-Row/Main$1.class create mode 100644 out/production/Four-In-A-Row/Main$Gamemode.class create mode 100644 out/production/Four-In-A-Row/Main.class create mode 100644 out/production/Four-In-A-Row/Plan.txt create mode 100644 out/production/Four-In-A-Row/board/Board.class create mode 100644 out/production/Four-In-A-Row/board/Grid.class create mode 100644 out/production/Four-In-A-Row/board/IBoard.class create mode 100644 out/production/Four-In-A-Row/board/IGrid.class create mode 100644 out/production/Four-In-A-Row/events/Block.class create mode 100644 out/production/Four-In-A-Row/events/Bomb.class create mode 100644 out/production/Four-In-A-Row/events/FourInARow.class create mode 100644 out/production/Four-In-A-Row/events/IRandomEvent.class create mode 100644 out/production/Four-In-A-Row/events/IWinCondition.class create mode 100644 out/production/Four-In-A-Row/events/InARow.class create mode 100644 out/production/Four-In-A-Row/events/RandomEvent.class create mode 100644 out/production/Four-In-A-Row/events/ThreeInARow.class create mode 100644 out/production/Four-In-A-Row/interfaces/FourInARowGUI$1.class create mode 100644 out/production/Four-In-A-Row/interfaces/FourInARowGUI.class create mode 100644 out/production/Four-In-A-Row/interfaces/GUI.class create mode 100644 out/production/Four-In-A-Row/interfaces/IGameInterface.class create mode 100644 out/production/Four-In-A-Row/interfaces/NInARowGUI$1.class create mode 100644 out/production/Four-In-A-Row/interfaces/NInARowGUI.class create mode 100644 out/production/Four-In-A-Row/interfaces/TicTacToeGUI$1.class create mode 100644 out/production/Four-In-A-Row/interfaces/TicTacToeGUI.class create mode 100644 out/production/Four-In-A-Row/objects/Empty.class create mode 100644 out/production/Four-In-A-Row/objects/GameObject.class create mode 100644 out/production/Four-In-A-Row/objects/Immovable.class create mode 100644 out/production/Four-In-A-Row/objects/Player.class create mode 100644 out/production/Four-In-A-Row/objects/Token.class create mode 100644 out/test/Four-In-A-Row/FourInARowTest.class create mode 100644 out/test/Four-In-A-Row/GridTest.class create mode 100644 out/test/Four-In-A-Row/TicTacToeTest.class create mode 100644 src/Main.java create mode 100644 src/Plan.txt create mode 100644 src/board/Board.java create mode 100644 src/board/Grid.java create mode 100644 src/board/IBoard.java create mode 100644 src/board/IGrid.java create mode 100644 src/events/Block.java create mode 100644 src/events/Bomb.java create mode 100644 src/events/FourInARow.java create mode 100644 src/events/IRandomEvent.java create mode 100644 src/events/IWinCondition.java create mode 100644 src/events/InARow.java create mode 100644 src/events/RandomEvent.java create mode 100644 src/events/ThreeInARow.java create mode 100644 src/interfaces/FourInARowGUI.java create mode 100644 src/interfaces/GUI.java create mode 100644 src/interfaces/IGameInterface.java create mode 100644 src/interfaces/NInARowGUI.java create mode 100644 src/interfaces/TicTacToeGUI.java create mode 100644 src/objects/Empty.java create mode 100644 src/objects/GameObject.java create mode 100644 src/objects/Immovable.java create mode 100644 src/objects/Player.java create mode 100644 src/objects/Token.java create mode 100644 test/FourInARowTest.java create mode 100644 test/GridTest.java create mode 100644 test/TicTacToeTest.java diff --git a/.idea/artifacts/Four_In_A_Row.xml b/.idea/artifacts/Four_In_A_Row.xml new file mode 100644 index 0000000..f273109 --- /dev/null +++ b/.idea/artifacts/Four_In_A_Row.xml @@ -0,0 +1,11 @@ + + + $PROJECT_DIR$/out/artifacts/Four_In_A_Row + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/junit_junit_5_0_SNAPSHOT.xml b/.idea/libraries/junit_junit_5_0_SNAPSHOT.xml new file mode 100644 index 0000000..2eed548 --- /dev/null +++ b/.idea/libraries/junit_junit_5_0_SNAPSHOT.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..0548357 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..28ec4c4 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..eae84e7 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,1038 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + four + checkWin + + + + + + + + + + + + + + + + + + + Java + + + Probable bugsJava + + + + + SuspiciousSystemArraycopy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +