Small changes were done.

boianaradkova · Feb 4, 2019 · 394c180 · 394c180
1 parent 5ca0d8b
commit 394c180
Show file tree

Hide file tree

Showing 28 changed files with 89 additions and 90 deletions.
diff --git a/data/gameinfo.txt b/data/gameinfo.txt
diff --git a/src/edu/asu/stratego/Client.java b/src/edu/asu/stratego/Client.java
@@ -1,13 +1,12 @@
 package edu.asu.stratego;
 
-import javafx.application.Application;
-import javafx.stage.Stage;
-
 import java.io.IOException;
 
 import edu.asu.stratego.game.ClientGameManager;
 import edu.asu.stratego.game.Game;
 import edu.asu.stratego.gui.ClientStage;
+import javafx.application.Application;
+import javafx.stage.Stage;
 
 /**
  * Client desktop application entry point.

diff --git a/src/edu/asu/stratego/Server.java b/src/edu/asu/stratego/Server.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;

diff --git a/src/edu/asu/stratego/game/BattleOutcome.java b/src/edu/asu/stratego/game/BattleOutcome.java
@@ -8,4 +8,4 @@
  */
 public enum BattleOutcome {
 	WIN, LOSE, DRAW;
-}
+}
diff --git a/src/edu/asu/stratego/game/ClientFileManager.java b/src/edu/asu/stratego/game/ClientFileManager.java
@@ -5,11 +5,19 @@
 import java.io.FileWriter;
 import java.util.Scanner;
 
+/**
+ * Helper class for file system manipulation.
+ * 
+ * @author Curtis Sapp
+ */
 public class ClientFileManager {
-	private final static String GAME_INFO_PATH = "gameinfo.txt";
+	//TODO It will be changed with Android Shared Praferences.
+
+	/** Full file path and name for the game information. */
+	private final static String GAME_INFO_FILE = "./data/gameinfo.txt";
 
 	public static String getLastGameIp() {
-		File file = new File(GAME_INFO_PATH);
+		File file = new File(GAME_INFO_FILE);
 		Scanner scanner;
 		try {
 			scanner = new Scanner(file);
@@ -25,7 +33,7 @@ public static String getLastGameIp() {
 	}
 
 	public static int getLastPort() {
-		File file = new File(GAME_INFO_PATH);
+		File file = new File(GAME_INFO_FILE);
 		Scanner scanner;
 		try {
 			scanner = new Scanner(file);
@@ -41,7 +49,7 @@ public static int getLastPort() {
 	}
 
 	public static int getLastGameId() {
-		File file = new File(GAME_INFO_PATH);
+		File file = new File(GAME_INFO_FILE);
 		Scanner scanner;
 		try {
 			scanner = new Scanner(file);
@@ -74,7 +82,7 @@ public static void writeSessionData(String ip, int port, int sessionId) {
 	}
 
 	public static boolean doesGameInfoExist() {
-		File file = new File(GAME_INFO_PATH);
+		File file = new File(GAME_INFO_FILE);
 		try {
 			return file.exists();
 		} catch (Exception e) {

diff --git a/src/edu/asu/stratego/game/ClientGameManager.java b/src/edu/asu/stratego/game/ClientGameManager.java
@@ -1,6 +1,5 @@
 package edu.asu.stratego.game;
 
-//hello
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -11,7 +10,6 @@
 import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 
-import edu.asu.stratego.Session;
 import edu.asu.stratego.game.board.ClientSquare;
 import edu.asu.stratego.gui.BoardScene;
 import edu.asu.stratego.gui.ClientStage;
@@ -34,6 +32,8 @@
 
 /**
  * Task to handle the Stratego game on the client-side.
+ * 
+ * @author Curtis Sapp
  */
 public class ClientGameManager implements Runnable {
 
@@ -71,7 +71,6 @@ public void run() {
 			sendIsReconnectData();
 			playGame(true);
 		} else {
-
 			connectToServer();
 			sendIsReconnectData();
 			waitForOpponent();
@@ -117,7 +116,6 @@ private void sendIsReconnectData() {
 		} catch (Exception e) {
 			System.out.println(e);
 		}
-
 	}
 
 	private boolean isReconnectingFromPreviousGame() {
@@ -237,7 +235,6 @@ private void setupBoard() {
 
 	private void playGame(boolean wasReconnect) {
 		if (!wasReconnect) {
-
 			// Remove setup panel
 			Platform.runLater(() -> {
 				BoardScene.getRootPane().getChildren().remove(BoardScene.getSetupPanel());
@@ -524,7 +521,7 @@ else if (Game.getMove().getStart().x < Game.getMove().getEnd().x)
 				win = true;
 			}
 
-			File file = new File("Players.sav");
+			File file = new File("./data/Players.sav");
 			file.createNewFile();
 			BufferedReader stdin = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
 			ArrayList<String> list = new ArrayList<String>();

diff --git a/src/edu/asu/stratego/game/ClientSocket.java b/src/edu/asu/stratego/game/ClientSocket.java
@@ -1,10 +1,13 @@
 package edu.asu.stratego.game;
 
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
-import java.io.*;
-import java.util.*;
 
 import edu.asu.stratego.gui.ConnectionScene;
 

diff --git a/src/edu/asu/stratego/game/Player.java b/src/edu/asu/stratego/game/Player.java
@@ -2,8 +2,6 @@
 
 import java.io.Serializable;
 
-import edu.asu.stratego.game.PieceColor;
-
 /**
  * Contains information about a player.
  */

diff --git a/src/edu/asu/stratego/game/ServerGameManager.java b/src/edu/asu/stratego/game/ServerGameManager.java
@@ -7,7 +7,6 @@
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Queue;
-import java.util.concurrent.LinkedBlockingQueue;
 
 import edu.asu.stratego.Server;
 import edu.asu.stratego.Session;

diff --git a/src/edu/asu/stratego/gui/BoardScene.java b/src/edu/asu/stratego/gui/BoardScene.java
@@ -1,17 +1,16 @@
 package edu.asu.stratego.gui;
 
+import edu.asu.stratego.game.Game;
+import edu.asu.stratego.gui.board.BoardTurnIndicator;
+import edu.asu.stratego.gui.board.setup.SetupPanel;
+import edu.asu.stratego.media.ImageConstants;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
-import edu.asu.stratego.game.Game;
-import edu.asu.stratego.gui.board.BoardTurnIndicator;
-import edu.asu.stratego.gui.board.setup.SetupPanel;
-import edu.asu.stratego.media.ImageConstants;
-import edu.asu.stratego.media.PlaySound;
 
 /**
  * Wrapper class for a JavaFX scene. Contains a scene UI and its associated

diff --git a/src/edu/asu/stratego/gui/ConnectionScene.java b/src/edu/asu/stratego/gui/ConnectionScene.java
@@ -1,9 +1,15 @@
 package edu.asu.stratego.gui;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.UnknownHostException;
-import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
 
+import edu.asu.stratego.game.ClientSocket;
+import edu.asu.stratego.game.Game;
 import javafx.application.Platform;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
@@ -15,9 +21,6 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
 
-import edu.asu.stratego.game.ClientSocket;
-import edu.asu.stratego.game.Game;
-
 /**
  * Wrapper class for a JavaFX scene. Contains a scene UI and its associated
  * event handlers for retrieving network connection information from the player
@@ -58,7 +61,7 @@ public class ConnectionScene {
 	ConnectionScene() throws IOException {
 
 		// reads from saved ips file and stores in ArrayList
-		serverFile = new File("Servers.sav");
+		serverFile = new File("./data/Servers.sav");
 		serverFile.createNewFile();
 		BufferedReader stdin = new BufferedReader(new InputStreamReader(new FileInputStream(serverFile)));
 		serverList = new ArrayList<String>();
@@ -71,7 +74,7 @@ public class ConnectionScene {
 		stdin.close();
 
 		// reads from saved players file and stores in ArrayList
-		playerFile = new File("Players.sav");
+		playerFile = new File("./data/Players.sav");
 		playerFile.createNewFile();
 		BufferedReader stdin2 = new BufferedReader(new InputStreamReader(new FileInputStream(playerFile)));
 		playerList = new ArrayList<String>();

diff --git a/src/edu/asu/stratego/gui/board/BoardEventPane.java b/src/edu/asu/stratego/gui/board/BoardEventPane.java
@@ -1,8 +1,7 @@
 package edu.asu.stratego.gui.board;
 
-import javafx.scene.layout.GridPane;
-
 import edu.asu.stratego.game.board.ClientBoard;
+import javafx.scene.layout.GridPane;
 
 /**
  * Layered directly on top of the BoardPane. Allows the player to interact with

diff --git a/src/edu/asu/stratego/gui/board/BoardPane.java b/src/edu/asu/stratego/gui/board/BoardPane.java
@@ -1,9 +1,8 @@
 package edu.asu.stratego.gui.board;
 
-import javafx.scene.layout.GridPane;
-
 import edu.asu.stratego.game.board.ClientBoard;
 import edu.asu.stratego.media.ImageConstants;
+import javafx.scene.layout.GridPane;
 
 /**
  * A graphical representation of the Stratego board.

diff --git a/src/edu/asu/stratego/gui/board/BoardSquareEventPane.java b/src/edu/asu/stratego/gui/board/BoardSquareEventPane.java
@@ -4,13 +4,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import javafx.event.EventHandler;
-import javafx.scene.Node;
-import javafx.scene.effect.Glow;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.GridPane;
-
 import edu.asu.stratego.game.ClientGameManager;
 import edu.asu.stratego.game.Game;
 import edu.asu.stratego.game.GameStatus;
@@ -23,6 +16,12 @@
 import edu.asu.stratego.gui.board.setup.SetupPieces;
 import edu.asu.stratego.media.ImageConstants;
 import edu.asu.stratego.util.HashTables;
+import javafx.event.EventHandler;
+import javafx.scene.Node;
+import javafx.scene.effect.Glow;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
 
 /**
  * A single square within the BoardEventPane.

diff --git a/src/edu/asu/stratego/gui/board/BoardSquarePane.java b/src/edu/asu/stratego/gui/board/BoardSquarePane.java
@@ -4,8 +4,6 @@
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.StackPane;
 
-import edu.asu.stratego.gui.board.BoardSquareType;
-
 /**
  * JavaFX StackPane to graphically represent the individual squares of the
  * Stratego board.

diff --git a/src/edu/asu/stratego/gui/board/BoardTurnIndicator.java b/src/edu/asu/stratego/gui/board/BoardTurnIndicator.java
@@ -1,13 +1,13 @@
 package edu.asu.stratego.gui.board;
 
+import edu.asu.stratego.game.Game;
+import edu.asu.stratego.game.PieceColor;
+import edu.asu.stratego.gui.ClientStage;
 import javafx.animation.FillTransition;
 import javafx.application.Platform;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
-import edu.asu.stratego.game.Game;
-import edu.asu.stratego.game.PieceColor;
-import edu.asu.stratego.gui.ClientStage;
 
 /**
  * JavaFX rectangle that is layered behind the semi-transparent board border to

diff --git a/src/edu/asu/stratego/gui/board/setup/SetupPanel.java b/src/edu/asu/stratego/gui/board/setup/SetupPanel.java
@@ -1,5 +1,9 @@
 package edu.asu.stratego.gui.board.setup;
 
+import edu.asu.stratego.game.ClientGameManager;
+import edu.asu.stratego.game.Game;
+import edu.asu.stratego.gui.ClientStage;
+import edu.asu.stratego.media.ImageConstants;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -14,11 +18,6 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Font;
 import javafx.scene.text.FontWeight;
-import edu.asu.stratego.game.ClientGameManager;
-import edu.asu.stratego.game.Game;
-import edu.asu.stratego.gui.ClientStage;
-import edu.asu.stratego.media.ImageConstants;
-import edu.asu.stratego.media.PlaySound;
 
 /**
  * The panel that is shown during the SETTING_UP phase of a Stratego game.

diff --git a/src/edu/asu/stratego/gui/board/setup/SetupPieces.java b/src/edu/asu/stratego/gui/board/setup/SetupPieces.java
@@ -2,6 +2,11 @@
 
 import java.util.HashMap;
 
+import edu.asu.stratego.game.Game;
+import edu.asu.stratego.game.PieceType;
+import edu.asu.stratego.gui.ClientStage;
+import edu.asu.stratego.util.HashTables;
+import edu.asu.stratego.util.MutableBoolean;
 import javafx.event.EventHandler;
 import javafx.scene.control.Label;
 import javafx.scene.effect.ColorAdjust;
@@ -11,12 +16,6 @@
 import javafx.scene.layout.GridPane;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
-import edu.asu.stratego.game.Game;
-import edu.asu.stratego.game.PieceType;
-import edu.asu.stratego.gui.ClientStage;
-
-import edu.asu.stratego.util.HashTables;
-import edu.asu.stratego.util.MutableBoolean;
 
 /**
  * Pieces in the SetupPanel that the player can select when setting up the game.

diff --git a/src/edu/asu/stratego/gui/board/setup/SetupTimer.java b/src/edu/asu/stratego/gui/board/setup/SetupTimer.java
@@ -1,5 +1,7 @@
 package edu.asu.stratego.gui.board.setup;
 
+import edu.asu.stratego.gui.ClientStage;
+import edu.asu.stratego.gui.board.BoardSquareEventPane;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
 import javafx.animation.Timeline;
@@ -13,9 +15,6 @@
 import javafx.scene.text.Font;
 import javafx.util.Duration;
 
-import edu.asu.stratego.gui.ClientStage;
-import edu.asu.stratego.gui.board.BoardSquareEventPane;
-
 /**
  * A setup timer. This timer counts down from a start time.
  */

diff --git a/src/edu/asu/stratego/media/PlaySound.java b/src/edu/asu/stratego/media/PlaySound.java
@@ -1,8 +1,7 @@
 package edu.asu.stratego.media;
 
-import javafx.scene.media.AudioClip;
-
 import edu.asu.stratego.util.HashTables;
+import javafx.scene.media.AudioClip;
 
 public class PlaySound {
 	public static void playMusic(String file, int Volume) {

diff --git a/src/edu/asu/stratego/media/SoundConstants.java b/src/edu/asu/stratego/media/SoundConstants.java
@@ -1,7 +1,5 @@
 package edu.asu.stratego.media;
 
-import javafx.scene.media.AudioClip;
-
 public class SoundConstants {
 	// TODO Sound constant disabled
 	// public final static AudioClip CORNFIELD = new