Refactored SGF code

vapour101 · Sep 13, 2017 · 592b702 · 592b702
1 parent 71ab169
commit 592b702
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/src/main/java/logic/GameTree.java b/src/main/java/logic/GameTree.java
@@ -17,9 +17,10 @@
 
 package logic;
 
-import sgf.SGFWriter;
 import util.Move;
 
+import java.util.List;
+
 public interface GameTree {
 
 	void playMove(Move move);
@@ -34,5 +35,5 @@ public interface GameTree {
 
 	Move getLastMove();
 
-	SGFWriter getSGFWriter();
+	List<Move> getSequence();
 }
diff --git a/src/main/java/logic/SimpleGameTree.java b/src/main/java/logic/SimpleGameTree.java
@@ -17,11 +17,10 @@
 
 package logic;
 
-import sgf.SGFWriter;
-import sgf.SimpleGameTreeSGFConverter;
 import util.Move;
 
 import java.util.LinkedList;
+import java.util.List;
 
 public class SimpleGameTree implements GameTree {
 
@@ -73,7 +72,7 @@ public Move getLastMove() {
 	}
 
 	@Override
-	public SGFWriter getSGFWriter() {
-		return new SimpleGameTreeSGFConverter(this.moveList);
+	public List<Move> getSequence() {
+		return moveList;
 	}
 }
diff --git a/.../java/sgf/SimpleGameTreeSGFConverter.java → src/main/java/sgf/SimpleSGFWriter.java b/.../java/sgf/SimpleGameTreeSGFConverter.java → src/main/java/sgf/SimpleSGFWriter.java
@@ -19,17 +19,17 @@
 
 import util.Move;
 
-import java.util.LinkedList;
+import java.util.List;
 
 import static util.Move.Type.PLAY;
 import static util.StoneColour.BLACK;
 
-public class SimpleGameTreeSGFConverter implements SGFWriter {
+public class SimpleSGFWriter implements SGFWriter {
 
-	private LinkedList<Move> tree;
+	private List<Move> tree;
 
-	public SimpleGameTreeSGFConverter(LinkedList<Move> gameTree) {
-		tree = gameTree;
+	public SimpleSGFWriter(List<Move> gameSequence) {
+		tree = gameSequence;
 	}
 
 	@Override

diff --git a/src/main/java/ui/controller/BoardController.java b/src/main/java/ui/controller/BoardController.java
@@ -36,6 +36,8 @@
 import logic.GameHandler;
 import logic.GameHandlerEventDecorator;
 import logic.LocalGameHandler;
+import sgf.SGFWriter;
+import sgf.SimpleSGFWriter;
 import ui.drawer.BoardDrawer;
 import ui.drawer.BoardScoreDrawer;
 import util.*;
@@ -145,7 +147,9 @@ private void save(ActionEvent event) {
 
 				Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)));
 
-				writer.write(game.getGameTree().getSGFWriter().getSGFString());
+				SGFWriter sgf = new SimpleSGFWriter(game.getGameTree().getSequence());
+
+				writer.write(sgf.getSGFString());
 				writer.close();
 			}
 			catch (Exception e) {

diff --git a/src/main/resources/localGame.fxml b/src/main/resources/localGame.fxml
@@ -3,8 +3,8 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.layout.*?>
-<SplitPane dividerPositions="0.7" prefHeight="1000000" prefWidth="1000000" xmlns="http://javafx.com/javafx/8.0.111"
-           xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.BoardController">
+<SplitPane xmlns:fx="http://javafx.com/fxml/1" dividerPositions="0.7" prefHeight="1000000" prefWidth="1000000"
+           xmlns="http://javafx.com/javafx/8.0.111" fx:controller="ui.controller.BoardController">
 
     <Pane fx:id="boardPane" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0"/>
     <VBox fx:id="sideBar" prefHeight="200.0" prefWidth="100.0">