Menu feature for JavaCheckers

.gitignore

@@ -3,4 +3,8 @@
 /build
 .gradle
 /gameCache
-JavaCheckers.jar
+JavaCheckers.jar
+.classpath
+.project
+.settings/
+bin/

.travis.yml

@@ -2,7 +2,7 @@ language: java
 dist: trusty
 
 jdk:
-  - oraclejdk8
+  - oraclejdk14
 
 script:
   - ./gradlew build

README.md

@@ -24,3 +24,12 @@ R and N keys - restart game
 
 ## Author
 Dawid "Sloenthran" Nogacz
+
+
+## Running
+
+```
+gradle build
+
+gradle run
+```

build.gradle

@@ -1,5 +1,11 @@
 plugins {
-    id 'java'
+    id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.9'
+
+    // https://imperceptiblethoughts.com/shadow/getting-started/#default-java-groovy-tasks
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
+
+    id 'jacoco'
 }
 
 group 'pl.nogacz'
@@ -12,7 +18,25 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+	testImplementation group: 'junit', name: 'junit', version: '4.12'
+	implementation 'javax.xml.bind:jaxb-api:2.3.1'
+
+	implementation 'commons-cli:commons-cli:1.4'
+
+	implementation 'com.fasterxml.jackson.core:jackson-databind:2.6.6'  
+	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.3'
+
+	implementation 'commons-io:commons-io:2.6'
+
+	implementation 'org.apache.commons:commons-lang3:3.11'
+
+	implementation 'com.h2database:h2:1.4.200'
+
+	implementation 'org.slf4j:slf4j-log4j12:1.7.30'
+
+	implementation 'org.apache.commons:commons-collections4:4.4'
+
+	testImplementation 'org.mockito:mockito-core:2.22.0'
 }
 
 jar {
@@ -21,4 +45,23 @@ jar {
                 'Main-Class': 'pl.nogacz.checkers.Checkers',
         )
     }
-}
+}
+
+mainClassName = 'pl.nogacz.checkers.Checkers'
+
+javafx {
+    version = "15.0.1"
+    modules = [ 'javafx.controls' ]
+}
+
+test {
+	testLogging {
+		showStandardStreams = true
+	}
+
+	finalizedBy jacocoTestReport
+}
+
+jacocoTestReport {
+	dependsOn test
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat May 18 21:40:07 CEST 2019
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

src/main/java/pl/nogacz/checkers/Checkers.java

@@ -6,6 +6,7 @@
 import javafx.stage.Stage;
 import pl.nogacz.checkers.application.Design;
 import pl.nogacz.checkers.board.Board;
+import pl.nogacz.checkers.application.Menu;
 
 /**
  * @author Dawid Nogacz on 17.05.2019
@@ -28,5 +29,6 @@ public void start(Stage primaryStage) {
         primaryStage.setScene(scene);
         primaryStage.setResizable(false);
         primaryStage.show();
+        Menu menu = new Menu(board);
     }
 }

src/main/java/pl/nogacz/checkers/application/Menu.java

@@ -0,0 +1,80 @@
+package pl.nogacz.checkers.application;
+
+import pl.nogacz.checkers.board.Board;
+import java.awt.Color;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+public class Menu extends JFrame implements ActionListener {
+    private static final int WIDTH = 500;
+    private static final int HEIGHT = 500;
+    private Board startBoard;
+    private JButton startGameButton = new JButton(Board.Commands.START.name());
+    private JButton quitButton = new JButton(Board.Commands.EXIT.name());
+    private boolean menuOpen;
+
+    public JButton getStartGameButton() {
+        return startGameButton;
+    }
+
+    public void setStartGameButton(JButton startGameButton) {
+        this.startGameButton = startGameButton;
+    }
+
+    public Board getStartBoard() {
+        return startBoard;
+    }
+
+    public boolean isMenuOpen() {
+        return menuOpen;
+    }
+
+    public void setStartBoard(Board startBoard) {
+        this.startBoard = startBoard;
+    }
+
+    public JButton getquitButton() {
+        return quitButton;
+    }
+
+    public void setQuitButton(JButton quitButton) {
+        this.quitButton = quitButton;
+    }
+
+    public Menu(Board board) {
+        super("Menu");
+        startBoard = board;
+        startBoard.setMenuActive(true);
+        menuOpen = true;
+        setSize(WIDTH, HEIGHT);
+        setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+        this.setUndecorated(true);
+        this.setBackground(new Color(102, 51, 0, 200));
+        this.add(startGameButton);
+        this.add(quitButton);
+        startGameButton.setIcon(board.getImageIconForFileName("start-game.png"));
+        quitButton.setIcon(board.getImageIconForFileName("quit-game.png"));
+        startGameButton.setBounds(150, 125, 190, 50);
+        quitButton.setBounds(150, 300, 180, 50);
+        startGameButton.addActionListener(this);
+        quitButton.addActionListener(this);
+        setLocationRelativeTo(null);
+        setLayout(null);
+        setVisible(true);
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent actionEvent) {
+        String command = actionEvent.getActionCommand();
+        if (command.equalsIgnoreCase(Board.Commands.START.name())) {
+            startBoard.setMenuActive(false);
+            menuOpen = false;
+            this.dispatchEvent(new WindowEvent(this, WindowEvent.WINDOW_CLOSING));
+        } else if (command.equalsIgnoreCase(Board.Commands.EXIT.name())) {
+            System.exit(7777);
+        }
+    }
+}