diff --git a/bin/de/deadlocker8/roadgame/logic/Textures.class b/bin/de/deadlocker8/roadgame/logic/Textures.class
new file mode 100644
index 0000000000000000000000000000000000000000..9328b2686bb49ac6158a7a90a35af6482bc3a888
Binary files /dev/null and b/bin/de/deadlocker8/roadgame/logic/Textures.class differ
diff --git a/bin/de/deadlocker8/roadgame/resources/green.png b/bin/de/deadlocker8/roadgame/resources/grass.png
similarity index 100%
rename from bin/de/deadlocker8/roadgame/resources/green.png
rename to bin/de/deadlocker8/roadgame/resources/grass.png
diff --git a/bin/de/deadlocker8/roadgame/ui/Controller$1.class b/bin/de/deadlocker8/roadgame/ui/Controller$1.class
index 7eb98de5811738aeca0d5152a2424949583efdc8..0604c0c6edcc880fa96650c9ae1836001d286374 100644
Binary files a/bin/de/deadlocker8/roadgame/ui/Controller$1.class and b/bin/de/deadlocker8/roadgame/ui/Controller$1.class differ
diff --git a/bin/de/deadlocker8/roadgame/ui/Controller$2.class b/bin/de/deadlocker8/roadgame/ui/Controller$2.class
deleted file mode 100644
index 4655d134e5b719203dab9a37d493518fd11d6a38..0000000000000000000000000000000000000000
Binary files a/bin/de/deadlocker8/roadgame/ui/Controller$2.class and /dev/null differ
diff --git a/bin/de/deadlocker8/roadgame/ui/Controller.class b/bin/de/deadlocker8/roadgame/ui/Controller.class
index a729147f0a18ac72a3028e9479a690640cc6dbab..ed189f709b208353aa5da985c7e2b3a8652b7486 100644
Binary files a/bin/de/deadlocker8/roadgame/ui/Controller.class and b/bin/de/deadlocker8/roadgame/ui/Controller.class differ
diff --git a/src/de/deadlocker8/roadgame/logic/Textures.java b/src/de/deadlocker8/roadgame/logic/Textures.java
new file mode 100644
index 0000000000000000000000000000000000000000..5dd21b0d28a1b6c46b91f42af9cc4a6006a5529a
--- /dev/null
+++ b/src/de/deadlocker8/roadgame/logic/Textures.java
@@ -0,0 +1,36 @@
+package de.deadlocker8.roadgame.logic;
+
+import javafx.scene.image.Image;
+
+public class Textures
+{
+ private Image imageEmpty = new Image("de/deadlocker8/roadgame/resources/empty.png");
+ private Image imageBorder= new Image("de/deadlocker8/roadgame/resources/border.png");
+ private Image imageGrass = new Image("de/deadlocker8/roadgame/resources/grass.png");
+ private Image imageRoad = new Image("de/deadlocker8/roadgame/resources/road.png");
+
+ public Textures()
+ {
+
+ }
+
+ public Image getImageEmpty()
+ {
+ return imageEmpty;
+ }
+
+ public Image getImageBorder()
+ {
+ return imageBorder;
+ }
+
+ public Image getImageGrass()
+ {
+ return imageGrass;
+ }
+
+ public Image getImageRoad()
+ {
+ return imageRoad;
+ }
+}
\ No newline at end of file
diff --git a/src/de/deadlocker8/roadgame/resources/green.png b/src/de/deadlocker8/roadgame/resources/grass.png
similarity index 100%
rename from src/de/deadlocker8/roadgame/resources/green.png
rename to src/de/deadlocker8/roadgame/resources/grass.png
diff --git a/src/de/deadlocker8/roadgame/ui/Controller.java b/src/de/deadlocker8/roadgame/ui/Controller.java
index a87371ce6fd2d5b764f8a1b319543bb441bbecee..da34629b6c0823a4dbd9f7e81c530db5b18a9973 100644
--- a/src/de/deadlocker8/roadgame/ui/Controller.java
+++ b/src/de/deadlocker8/roadgame/ui/Controller.java
@@ -7,6 +7,7 @@ import java.util.ResourceBundle;
import de.deadlocker8.roadgame.logic.Board;
import de.deadlocker8.roadgame.logic.EdgeType;
import de.deadlocker8.roadgame.logic.Game;
+import de.deadlocker8.roadgame.logic.Textures;
import de.deadlocker8.roadgame.logic.Tile;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
@@ -23,8 +24,6 @@ import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.StackPane;
import javafx.stage.Stage;
-import javafx.stage.WindowEvent;
-import tools.Worker;
public class Controller
{
@@ -32,25 +31,16 @@ public class Controller
@FXML private StackPane stackPaneCurrentTile;
@FXML private Button buttonRotate;
@FXML private ScrollPane scrollPane;
-
- private Stage stage;
+
private Image icon = new Image("de/deadlocker8/roadgame/resources/icon.png");
private final ResourceBundle bundle = ResourceBundle.getBundle("de/deadlocker8/roadgame/main/", Locale.GERMANY);
private GridPane grid;
private Game game;
+ private Textures textures;
public void init(Stage stage)
- {
- this.stage = stage;
-
- stage.setOnCloseRequest(new EventHandler<WindowEvent>()
- {
- public void handle(WindowEvent event)
- {
- Worker.shutdown();
- System.exit(0);
- };
- });
+ {
+ textures = new Textures();
anchorPaneGame.setStyle("-fx-border-color: #333333; -fx-border-width: 2px");
stackPaneCurrentTile.setStyle("-fx-border-color: #333333; -fx-border-width: 2px");
@@ -136,13 +126,13 @@ public class Controller
{
StackPane stack = new StackPane();
- stack.getChildren().add(new ImageView(new Image("de/deadlocker8/roadgame/resources/empty.png")));
+ stack.getChildren().add(new ImageView(textures.getImageEmpty()));
if(tile == null)
{
if(possible)
{
- stack.getChildren().add(new ImageView(new Image("de/deadlocker8/roadgame/resources/border.png")));
+ stack.getChildren().add(new ImageView(textures.getImageBorder()));
stack.setOnMouseClicked(new EventHandler<MouseEvent>()
{
@Override
@@ -158,31 +148,31 @@ public class Controller
}
else
{
- stack.getChildren().add(new ImageView(new Image("de/deadlocker8/roadgame/resources/green.png")));
+ stack.getChildren().add(new ImageView(textures.getImageGrass()));
if(tile.getN().equals(EdgeType.ROAD))
{
- ImageView imageViewRoadNorth = new ImageView(new Image("de/deadlocker8/roadgame/resources/road.png"));
+ ImageView imageViewRoadNorth = new ImageView(textures.getImageRoad());
stack.getChildren().add(imageViewRoadNorth);
}
if(tile.getE().equals(EdgeType.ROAD))
{
- ImageView imageViewRoadEast = new ImageView(new Image("de/deadlocker8/roadgame/resources/road.png"));
+ ImageView imageViewRoadEast = new ImageView(textures.getImageRoad());
imageViewRoadEast.setRotate(90);
stack.getChildren().add(imageViewRoadEast);
}
if(tile.getS().equals(EdgeType.ROAD))
{
- ImageView imageViewRoadSouth = new ImageView(new Image("de/deadlocker8/roadgame/resources/road.png"));
+ ImageView imageViewRoadSouth = new ImageView(textures.getImageRoad());
imageViewRoadSouth.setRotate(180);
stack.getChildren().add(imageViewRoadSouth);
}
if(tile.getW().equals(EdgeType.ROAD))
{
- ImageView imageViewRoadWest = new ImageView(new Image("de/deadlocker8/roadgame/resources/road.png"));
+ ImageView imageViewRoadWest = new ImageView(textures.getImageRoad());
imageViewRoadWest.setRotate(270);
stack.getChildren().add(imageViewRoadWest);
}