Transitioned code to a more modular build.

android/local.properties

@@ -0,0 +1 @@
+sdk.dir=/home/dorian/Coding/android-sdk-linux

android/src/main/java/org/justcheckers/android/GameActivity.java

@@ -19,10 +19,10 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.android;
+package org.justcheckers.android;
 
-import main.java.org.justcheckers.game.Game;
+import org.justcheckers.game.Game;
-import main.java.org.justcheckers.game.Rulebook;
+import org.justcheckers.game.Rulebook;
 
 import android.app.Activity;
 import android.os.Bundle;

android/src/main/java/org/justcheckers/android/InfoActivity.java

@@ -19,14 +19,14 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-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;

android/src/main/java/org/justcheckers/android/MenuActivity.java

@@ -19,10 +19,10 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.android;
+package org.justcheckers.android;
 
-import main.java.org.justcheckers.common.GlobalConstants;
+import org.justcheckers.common.GlobalConstants;
-import main.java.org.justcheckers.common.LoggingAndStatistics;
+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();
 	}
 

android/src/main/java/org/justcheckers/android/SettingsActivity.java

@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.android;
+package org.justcheckers.android;
 
 import android.graphics.Color;
 import android.os.Bundle;

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'
 }
 

core/src/main/java/org/justcheckers/common/GlobalConstants.java

@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.common;
+package org.justcheckers.common;
 
 /**
  * Organizational class to keep all the constants in.

core/src/main/java/org/justcheckers/common/LoggingAndStatistics.java

@@ -19,31 +19,39 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.common;import org.justcheckers.android.R;
+package org.justcheckers.common;
 
-import android.app.Activity;
+// TODO Resolve this with separation of various platform setups...
-import android.os.Build;
+//import org.justcheckers.android.R;
-import android.util.Log;
+//
+//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) {
+	public static void logApplicationInfo(String gameVersion, String gameWebsite) {
 
-		String gameVersion = caller.getString(R.string.app_version);
+        // TODO Fix
-		String gameWebsite = caller.getString(R.string.project_website);
+//		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 
+//		String sysList = "SDK version: " + Build.VERSION.RELEASE
-			+ " - API: " + Build.VERSION.SDK_INT 
+//			+ " - API: " + Build.VERSION.SDK_INT
-			+ " - Device: " + Build.MANUFACTURER + " " + Build.MODEL;
+//			+ " - Device: " + Build.MANUFACTURER + " " + Build.MODEL;
+        // TODO Fix
+        String sysList = "FIXME";
 
-		Log.i("DevSysInfo", sysList);
+        Logger log = LoggerFactory.getLogger(LoggingAndStatistics.class);
+        log.info("DevSysInfo", sysList);
 	}
 
 }

core/src/main/java/org/justcheckers/game/Board.java

@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
 
 /**
  * Container for the state of the checker board during a game.

core/src/main/java/org/justcheckers/game/Game.java

@@ -19,9 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
-
-import android.graphics.Point;
 
 /**
  * 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;
 	}
 }

core/src/main/java/org/justcheckers/game/GameEngine.java

@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-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
+			if (sourceRow == game.getJumpInProgress().getY()
-					&& sourceCol == game.getJumpInProgress().x) {
+					&& sourceCol == game.getJumpInProgress().getX()) {
 				legalMove = canJump(game, sourceRow, sourceCol, targetRow,
 						targetCol);
 				isJump = true;

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();
+
+}

core/src/main/java/org/justcheckers/game/Player.java

@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
 
 /**
  * Manages the information of a single player.

core/src/main/java/org/justcheckers/game/Rulebook.java

@@ -19,7 +19,7 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.game;
+package org.justcheckers.game;
 
 /**
  * The rules for a game of checkers. This class provides a reference object for

core/src/main/java/org/justcheckers/xml/ConfigSettings.java

@@ -1,4 +1,4 @@
-package main.java.org.justcheckers.xml;
+package org.justcheckers.xml;
 
 /***************************************************************************
  *                                                                         *

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);
 		}
 	}	
 

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;
 

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);
 		}
 	}	
 

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;

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;
 

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;
 
 /* **************************************************************************
  *                                                                         *
@@ -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);
 		}
 	}	
 

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;

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;

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;

core/src/test/java/org/justcheckers/test/game/GameStateTest.java

@@ -19,10 +19,10 @@
     along with justCheckers.  If not, see <http://www.gnu.org/licenses/>.
  *****************************************************************************/
 
-package main.java.org.justcheckers.test.game;
+package org.justcheckers.test.game;
 
-import main.java.org.justcheckers.game.Game;
+import org.justcheckers.game.Game;
-import main.java.org.justcheckers.game.Rulebook;
+import org.justcheckers.game.Rulebook;
 
 /**
  * Test the game state logic.  Tests the NQPOJO (not quite plain old Java