Observerbranch

src/bejeweled/game/GameLogic.java

@@ -1,5 +1,8 @@
 package bejeweled.game;
 
+import java.util.Observable;
+import java.util.Observer;
+
 import javafx.scene.canvas.GraphicsContext;
 import bejeweled.Sounds;
 import bejeweled.board.Board;
@@ -12,7 +15,7 @@
  * @author Timo
  *
  */
-public final class GameLogic {
+public final class GameLogic implements Observer {
 
 	private Board board;
 	private static Time time;
@@ -142,4 +145,8 @@ public Score getScore() {
 	public void setScore(int s) {
 		score.setScore(s);
 	}
+
+	public void update(Observable obs, Object arg) {
+		score = (Score) obs;
+	}
 }

src/bejeweled/game/GameScene.java

@@ -112,6 +112,7 @@ public void handle(ActionEvent e) {
 		gc = canvas.getGraphicsContext2D();
 		gc.setFont(new Font("Helvetica", 15));
 		gamelogic = new GameLogic();
+		gamelogic.getScore().addObserver(gamelogic);
 
 		// this will handle mouse clicks
 		this.setOnMousePressed(new EventHandler<MouseEvent>() {

src/bejeweled/state/Score.java

@@ -1,13 +1,15 @@
 package bejeweled.state;
 
+import java.util.Observable;
+
 import bejeweled.Main;
 
 /**
  * Score class
  * @author Job
  *
  */
-public final class Score {
+public final class Score extends Observable {
 
 	private int score;
 	private int scorePerGem;
@@ -27,7 +29,8 @@ public void updateScore(int gems) {
 		if (gems*scorePerGem > goodscore) {
 			Main.shoutOut();
 		}
-
+		setChanged();
+		notifyObservers();
 	}
 
 	public int getScore() {
@@ -36,6 +39,8 @@ public int getScore() {
 
 	public void setScore(int s) {
 		score = s;
+		setChanged();
+		notifyObservers();
 	}
 
 }