diff --git a/src/main/java/fi/utu/tech/gui/javafx/Check.java b/src/main/java/fi/utu/tech/gui/javafx/Check.java
index 884ada6c8ad076668a5d3ddbfb36063d83971d08..bba25874e10b42940bd4920e7d8bd3e0dc635cf5 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/Check.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/Check.java
@@ -3,7 +3,7 @@ package fi.utu.tech.gui.javafx;
import javafx.scene.control.Alert;
public class Check {
- public static GameWindow check(Object grid, Object lentotuki, Object taistelu, Object risteily, Object sukellus, Object kevyt){
+ public static void check(Object grid, Object lentotuki, Object taistelu, Object risteily, Object sukellus, Object kevyt){
int l = (Integer) lentotuki;
int t = (Integer) taistelu;
int r = (Integer) risteily;
@@ -11,24 +11,24 @@ public class Check {
int k = (Integer) kevyt;
if (grid.equals("5 x 5") && (l+t+r+s+k)<=25){
- return GameWindow.game(5,l,t,r,s,k);
+ GameWindow.game(5,l,t,r,s,k);
}
if (grid.equals("6 x 6") && (l+t+r+s+k)<=36){
- return GameWindow.game(6,l,t,r,s,k);
+ GameWindow.game(6,l,t,r,s,k);
}
if (grid.equals("7 x 7") && (l+t+r+s+k)<=49){
- return GameWindow.game(7,l,t,r,s,k);
+ GameWindow.game(7,l,t,r,s,k);
}
if (grid.equals("8 x 8") && (l+t+r+s+k)<=64){
- return GameWindow.game(8,l,t,r,s,k);
+ GameWindow.game(8,l,t,r,s,k);
}
if (grid.equals("9 x 9") && (l+t+r+s+k)<=81){
- return GameWindow.game(9,l,t,r,s,k);
+ GameWindow.game(9,l,t,r,s,k);
}
if (grid.equals("10 x 10") && (l+t+r+s+k)<=100){
- return GameWindow.game(10,l,t,r,s,k);
+ GameWindow.game(10,l,t,r,s,k);
}
- else {
+ else{
Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Information Dialog");
alert.setHeaderText("Liikaa posankoita!!!");
diff --git a/src/main/java/fi/utu/tech/gui/javafx/Controller.java b/src/main/java/fi/utu/tech/gui/javafx/Controller.java
index 13f6fab4d3b97cf49359d79b3882c2c022979ca3..daa3b4abdb78bdf74a58c70a725563164e78c68b 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/Controller.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/Controller.java
@@ -28,11 +28,12 @@ public class Controller {
private Button start;
@FXML
- void startGamePressed(ActionEvent e){
+ void startGamePressed(ActionEvent e) {
Check.check(grid.getValue(),
lentotuki.getValue(),
taistelija.getValue(),
risteily.getValue(),
sukellus.getValue(),
kevyt.getValue());
+ }
}
diff --git a/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java b/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
index 78d2c71af159318223509e1d6bac8680354702ed..6914ad84f636309996b305b6e77bed4fd0e66fcc 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
@@ -7,4 +7,6 @@ public class GameWindow {
public static GameWindow game(int ruudukko, int lento, int taisto, int risse, int sukel, int kev ) {
//peli ikkunan sisältö
}
+
}
+