diff --git a/android/local.properties b/android/local.properties
new file mode 100644
index 0000000..e8732cd
--- /dev/null
+++ b/android/local.properties
@@ -0,0 +1 @@
+sdk.dir=/home/dorian/Coding/android-sdk-linux
diff --git a/android/src/main/java/org/justcheckers/android/GameActivity.java b/android/src/main/java/org/justcheckers/android/GameActivity.java
index bafbb2d..704292f 100644
--- a/android/src/main/java/org/justcheckers/android/GameActivity.java
+++ b/android/src/main/java/org/justcheckers/android/GameActivity.java
@@ -19,10 +19,10 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.android;
+package org.justcheckers.android;
-import main.java.org.justcheckers.game.Game;
-import main.java.org.justcheckers.game.Rulebook;
+import org.justcheckers.game.Game;
+import org.justcheckers.game.Rulebook;
import android.app.Activity;
import android.os.Bundle;
diff --git a/android/src/main/java/org/justcheckers/android/InfoActivity.java b/android/src/main/java/org/justcheckers/android/InfoActivity.java
index 0085f59..106be39 100644
--- a/android/src/main/java/org/justcheckers/android/InfoActivity.java
+++ b/android/src/main/java/org/justcheckers/android/InfoActivity.java
@@ -19,14 +19,14 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.android;
+package org.justcheckers.android;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import main.java.org.justcheckers.common.GlobalConstants;
+import org.justcheckers.common.GlobalConstants;
import android.app.Activity;
import android.os.Bundle;
diff --git a/android/src/main/java/org/justcheckers/android/MenuActivity.java b/android/src/main/java/org/justcheckers/android/MenuActivity.java
index 51075d3..bacbf95 100644
--- a/android/src/main/java/org/justcheckers/android/MenuActivity.java
+++ b/android/src/main/java/org/justcheckers/android/MenuActivity.java
@@ -19,10 +19,10 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.android;
+package org.justcheckers.android;
-import main.java.org.justcheckers.common.GlobalConstants;
-import main.java.org.justcheckers.common.LoggingAndStatistics;
+import org.justcheckers.common.GlobalConstants;
+import org.justcheckers.common.LoggingAndStatistics;
import android.app.Activity;
import android.content.Intent;
@@ -59,7 +59,7 @@ public class MenuActivity extends Activity implements OnClickListener {
menuButton.setOnClickListener(this);
// TODO: Move logging info in a better place.
- LoggingAndStatistics.logApplicationInfo(this);
+// LoggingAndStatistics.logApplicationInfo(this);
LoggingAndStatistics.logDeviceAndSystemInfo();
}
diff --git a/android/src/main/java/org/justcheckers/android/SettingsActivity.java b/android/src/main/java/org/justcheckers/android/SettingsActivity.java
index 2f4f934..c4aaa25 100644
--- a/android/src/main/java/org/justcheckers/android/SettingsActivity.java
+++ b/android/src/main/java/org/justcheckers/android/SettingsActivity.java
@@ -19,7 +19,7 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.android;
+package org.justcheckers.android;
import android.graphics.Color;
import android.os.Bundle;
diff --git a/core/build.gradle b/core/build.gradle
index 9d7f3ce..8b0d803 100755
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -32,6 +32,7 @@ repositories {
// Dependency management
dependencies {
compile 'jdom:jdom:0.7'
+ compile 'org.slf4j:slf4j-api:1.7.5'
testCompile 'org.testng:testng:6.8'
}
diff --git a/core/src/main/java/org/justcheckers/common/GlobalConstants.java b/core/src/main/java/org/justcheckers/common/GlobalConstants.java
index efdeb18..953c109 100644
--- a/core/src/main/java/org/justcheckers/common/GlobalConstants.java
+++ b/core/src/main/java/org/justcheckers/common/GlobalConstants.java
@@ -19,7 +19,7 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.common;
+package org.justcheckers.common;
/**
* Organizational class to keep all the constants in.
diff --git a/core/src/main/java/org/justcheckers/common/LoggingAndStatistics.java b/core/src/main/java/org/justcheckers/common/LoggingAndStatistics.java
index 776f617..7e87a8f 100644
--- a/core/src/main/java/org/justcheckers/common/LoggingAndStatistics.java
+++ b/core/src/main/java/org/justcheckers/common/LoggingAndStatistics.java
@@ -19,31 +19,39 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.common;import org.justcheckers.android.R;
+package org.justcheckers.common;
-import android.app.Activity;
-import android.os.Build;
-import android.util.Log;
+// TODO Resolve this with separation of various platform setups...
+//import org.justcheckers.android.R;
+//
+//import android.app.Activity;
+//import android.os.Build;
+//import android.util.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Functions for logging errors and gathering statistics.
*
* @author Dorian Pula
*/
-public class LoggingAndStatistics {
+public abstract class LoggingAndStatistics {
/**
* Logs information about the program. Displays the game's header and
* relevant system properties at runtime.
*/
- public static void logApplicationInfo(Activity caller) {
-
- String gameVersion = caller.getString(R.string.app_version);
- String gameWebsite = caller.getString(R.string.project_website);
+ public static void logApplicationInfo(String gameVersion, String gameWebsite) {
+
+ // TODO Fix
+// String gameVersion = caller.getString(R.string.app_version);
+// String gameWebsite = caller.getString(R.string.project_website);
String appInfo = "justCheckers -- Version:" + gameVersion
+ " - Website: " + gameWebsite;
-
- Log.i("ApplInfo", appInfo);
+
+ // TODO Clean up...
+ Logger log = LoggerFactory.getLogger(LoggingAndStatistics.class);
+ log.info("ApplInfo", appInfo);
}
/**
@@ -53,11 +61,14 @@ public class LoggingAndStatistics {
public static void logDeviceAndSystemInfo() {
// System properties.
- String sysList = "SDK version: " + Build.VERSION.RELEASE
- + " - API: " + Build.VERSION.SDK_INT
- + " - Device: " + Build.MANUFACTURER + " " + Build.MODEL;
+// String sysList = "SDK version: " + Build.VERSION.RELEASE
+// + " - API: " + Build.VERSION.SDK_INT
+// + " - Device: " + Build.MANUFACTURER + " " + Build.MODEL;
+ // TODO Fix
+ String sysList = "FIXME";
- Log.i("DevSysInfo", sysList);
+ Logger log = LoggerFactory.getLogger(LoggingAndStatistics.class);
+ log.info("DevSysInfo", sysList);
}
}
\ No newline at end of file
diff --git a/core/src/main/java/org/justcheckers/game/Board.java b/core/src/main/java/org/justcheckers/game/Board.java
index d46b2e7..0e6c6f0 100644
--- a/core/src/main/java/org/justcheckers/game/Board.java
+++ b/core/src/main/java/org/justcheckers/game/Board.java
@@ -19,7 +19,7 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
/**
* Container for the state of the checker board during a game.
diff --git a/core/src/main/java/org/justcheckers/game/Game.java b/core/src/main/java/org/justcheckers/game/Game.java
index d20b58b..b897021 100644
--- a/core/src/main/java/org/justcheckers/game/Game.java
+++ b/core/src/main/java/org/justcheckers/game/Game.java
@@ -19,9 +19,7 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.game;
-
-import android.graphics.Point;
+package org.justcheckers.game;
/**
* The main game handling object of GameLoop.
@@ -61,7 +59,7 @@ public class Game {
* for a piece whose move has not finished after 1 jump. This point is set
* to null if not in use.
*/
- private final Point jumpInProgress;
+ private final IPoint jumpInProgress;
/** Represents the light (usually attacking) player. */
private Player lightPlayer;
/** Represents whose turn it is. */
@@ -245,7 +243,7 @@ public class Game {
/**
* @return the jumpInProgress
*/
- public Point getJumpInProgress() {
+ public IPoint getJumpInProgress() {
return jumpInProgress;
}
}
diff --git a/core/src/main/java/org/justcheckers/game/GameEngine.java b/core/src/main/java/org/justcheckers/game/GameEngine.java
index 3b7bf38..7647911 100644
--- a/core/src/main/java/org/justcheckers/game/GameEngine.java
+++ b/core/src/main/java/org/justcheckers/game/GameEngine.java
@@ -19,7 +19,7 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
/**
* @author dpula
@@ -76,8 +76,8 @@ public class GameEngine {
if (realPositions && game.getJumpInProgress() != null) {
// Only allow the piece in movement to be moved.
- if (sourceRow == game.getJumpInProgress().y
- && sourceCol == game.getJumpInProgress().x) {
+ if (sourceRow == game.getJumpInProgress().getY()
+ && sourceCol == game.getJumpInProgress().getX()) {
legalMove = canJump(game, sourceRow, sourceCol, targetRow,
targetCol);
isJump = true;
diff --git a/core/src/main/java/org/justcheckers/game/IPoint.java b/core/src/main/java/org/justcheckers/game/IPoint.java
new file mode 100644
index 0000000..59e6923
--- /dev/null
+++ b/core/src/main/java/org/justcheckers/game/IPoint.java
@@ -0,0 +1,14 @@
+package org.justcheckers.game;
+
+/**
+ * @author dorian
+ * Created 2013-04-03 @ 4:59 PM by IntelliJ IDEA.
+ */
+public interface IPoint {
+
+ public void setX(double x);
+ public void setY(double y);
+ public double getX();
+ public double getY();
+
+}
diff --git a/core/src/main/java/org/justcheckers/game/Player.java b/core/src/main/java/org/justcheckers/game/Player.java
index af267e8..b211255 100644
--- a/core/src/main/java/org/justcheckers/game/Player.java
+++ b/core/src/main/java/org/justcheckers/game/Player.java
@@ -19,7 +19,7 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
/**
* Manages the information of a single player.
diff --git a/core/src/main/java/org/justcheckers/game/Rulebook.java b/core/src/main/java/org/justcheckers/game/Rulebook.java
index 9dd1ba5..41993fd 100644
--- a/core/src/main/java/org/justcheckers/game/Rulebook.java
+++ b/core/src/main/java/org/justcheckers/game/Rulebook.java
@@ -19,7 +19,7 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
/**
* The rules for a game of checkers. This class provides a reference object for
diff --git a/core/src/main/java/org/justcheckers/xml/ConfigSettings.java b/core/src/main/java/org/justcheckers/xml/ConfigSettings.java
index 9383b6d..774bbe2 100644
--- a/core/src/main/java/org/justcheckers/xml/ConfigSettings.java
+++ b/core/src/main/java/org/justcheckers/xml/ConfigSettings.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
/***************************************************************************
* *
diff --git a/core/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java b/core/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
index 4b14844..e4b37a8 100644
--- a/core/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
+++ b/core/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.io.BufferedWriter;
import java.io.File;
@@ -20,7 +20,8 @@ import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
-import android.util.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/***************************************************************************
* *
@@ -67,7 +68,10 @@ public class ConfigSettingsIO extends XML_IO{
catch(JDOMException e){
String msg = "Problem : " + getFile().toString()
+ " is not a well formed XML document";
- Log.e("ConfigSettingsIO", msg);
+
+ // TODO Clean up...
+ Logger log = LoggerFactory.getLogger(UserSettingsIO.class);
+ log.error("ConfigSettingsIO", msg);
}
}
@@ -91,7 +95,9 @@ public class ConfigSettingsIO extends XML_IO{
catch(IOException e){
String msg = "Problem : couldn't output to the given file : "
+ getFile().toString();
- Log.e("ConfigSettingsIO", msg);
+ // TODO Clean up...
+ Logger log = LoggerFactory.getLogger(ConfigSettingsIO.class);
+ log.error("ConfigSettingsIO", msg);
}
}
diff --git a/core/src/main/java/org/justcheckers/xml/GameSettings.java b/core/src/main/java/org/justcheckers/xml/GameSettings.java
index 0a8991b..3864785 100644
--- a/core/src/main/java/org/justcheckers/xml/GameSettings.java
+++ b/core/src/main/java/org/justcheckers/xml/GameSettings.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.util.HashMap;
diff --git a/core/src/main/java/org/justcheckers/xml/GameSettingsIO.java b/core/src/main/java/org/justcheckers/xml/GameSettingsIO.java
index 3268283..2b3b5ef 100644
--- a/core/src/main/java/org/justcheckers/xml/GameSettingsIO.java
+++ b/core/src/main/java/org/justcheckers/xml/GameSettingsIO.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.io.BufferedWriter;
import java.io.File;
@@ -20,7 +20,8 @@ import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
-import android.util.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/* **************************************************************************
* *
@@ -69,7 +70,9 @@ public class GameSettingsIO extends XML_IO{
catch(JDOMException e){
String msg = "Problem : " + getFile().toString()
+ " is not a well formed XML document";
- Log.e("GameSettingsIO", msg);
+ // TODO Clean up...
+ Logger log = LoggerFactory.getLogger(GameSettingsIO.class);
+ log.error("GameSettingsIO", msg);
}
}
@@ -93,7 +96,9 @@ public class GameSettingsIO extends XML_IO{
catch(IOException e){
String msg = "Problem : couldn't output to the given file : "
+ getFile().toString();
- Log.e("GameSettingsIO", msg);
+ // TODO Clean up...
+ Logger log = LoggerFactory.getLogger(GameSettingsIO.class);
+ log.error("GameSettingsIO", msg);
}
}
diff --git a/core/src/main/java/org/justcheckers/xml/Settings.java b/core/src/main/java/org/justcheckers/xml/Settings.java
index ef22b9a..2f48307 100644
--- a/core/src/main/java/org/justcheckers/xml/Settings.java
+++ b/core/src/main/java/org/justcheckers/xml/Settings.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.util.Set;
import java.util.HashMap;
diff --git a/core/src/main/java/org/justcheckers/xml/UserSettings.java b/core/src/main/java/org/justcheckers/xml/UserSettings.java
index d863368..8674439 100644
--- a/core/src/main/java/org/justcheckers/xml/UserSettings.java
+++ b/core/src/main/java/org/justcheckers/xml/UserSettings.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.util.HashMap;
diff --git a/core/src/main/java/org/justcheckers/xml/UserSettingsIO.java b/core/src/main/java/org/justcheckers/xml/UserSettingsIO.java
index 94e4033..5cf3ca1 100644
--- a/core/src/main/java/org/justcheckers/xml/UserSettingsIO.java
+++ b/core/src/main/java/org/justcheckers/xml/UserSettingsIO.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.io.BufferedWriter;
import java.io.File;
@@ -20,7 +20,8 @@ import org.jdom.JDOMException;
import org.jdom.input.SAXBuilder;
import org.jdom.output.XMLOutputter;
-import android.util.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/* **************************************************************************
* *
@@ -38,7 +39,7 @@ import android.util.Log;
*
* @author Brinick Simmons (brinick@users.sourceforge.net)
*/
-public class UserSettingsIO extends XML_IO{
+public class UserSettingsIO extends XML_IO {
//---------------------------//
// Class Methods //
@@ -69,7 +70,10 @@ public class UserSettingsIO extends XML_IO{
catch(JDOMException e){
String msg = "Problem : " + getFile().toString()
+ " is not a well formed XML document";
- Log.e("UserSettingsIO", msg);
+
+ // TODO Clean up...
+ Logger log = LoggerFactory.getLogger(UserSettingsIO.class);
+ log.error("UserSettingsIO", msg);
}
}
@@ -93,7 +97,10 @@ public class UserSettingsIO extends XML_IO{
catch(IOException e){
String msg = "Problem : couldn't output to the given file : "
+ getFile().toString();
- Log.e("UserSettingsIO", msg);
+
+ // TODO Clean up...
+ Logger log = LoggerFactory.getLogger(UserSettingsIO.class);
+ log.error("UserSettingsIO", msg);
}
}
diff --git a/core/src/main/java/org/justcheckers/xml/VisitDOM.java b/core/src/main/java/org/justcheckers/xml/VisitDOM.java
index 8fd4998..6beed14 100644
--- a/core/src/main/java/org/justcheckers/xml/VisitDOM.java
+++ b/core/src/main/java/org/justcheckers/xml/VisitDOM.java
@@ -9,7 +9,7 @@
// (at your option) any later version.
// ********************************************************************
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.util.Iterator;
import org.jdom.Element;
import org.jdom.Text;
diff --git a/core/src/main/java/org/justcheckers/xml/XMLFileFilter.java b/core/src/main/java/org/justcheckers/xml/XMLFileFilter.java
index a231da9..1b9c78c 100644
--- a/core/src/main/java/org/justcheckers/xml/XMLFileFilter.java
+++ b/core/src/main/java/org/justcheckers/xml/XMLFileFilter.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.io.File;
import java.io.FileFilter;
diff --git a/core/src/main/java/org/justcheckers/xml/XML_IO.java b/core/src/main/java/org/justcheckers/xml/XML_IO.java
index f93ecc5..2a73840 100644
--- a/core/src/main/java/org/justcheckers/xml/XML_IO.java
+++ b/core/src/main/java/org/justcheckers/xml/XML_IO.java
@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
import java.io.File;
import java.net.URL;
diff --git a/core/src/test/java/org/justcheckers/test/game/GameStateTest.java b/core/src/test/java/org/justcheckers/test/game/GameStateTest.java
index 916d507..b77d7a5 100644
--- a/core/src/test/java/org/justcheckers/test/game/GameStateTest.java
+++ b/core/src/test/java/org/justcheckers/test/game/GameStateTest.java
@@ -19,10 +19,10 @@
along with justCheckers. If not, see .
*****************************************************************************/
-package main.java.org.justcheckers.test.game;
+package org.justcheckers.test.game;
-import main.java.org.justcheckers.game.Game;
-import main.java.org.justcheckers.game.Rulebook;
+import org.justcheckers.game.Game;
+import org.justcheckers.game.Rulebook;
/**
* Test the game state logic. Tests the NQPOJO (not quite plain old Java