reverting module refactoring changes

forge-m-android/.classpath

@@ -1,31 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-  <classpathentry kind="src" path="target/generated-sources/r" including="**/*.java"/>
-  <classpathentry kind="src" path="target/generated-sources/aidl" including="**/*.java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="src" path="/forge-m-base"/>
-  <classpathentry kind="src" path="/forge-core"/>
-  <classpathentry kind="src" path="/forge-resources"/>
-  <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/15.0/guava-15.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
-  <classpathentry kind="src" path="/forge-game"/>
-  <classpathentry kind="var" path="M2_REPO/com/googlecode/minlog/1.2/minlog-1.2.jar"/>
-  <classpathentry kind="src" path="/forge-ai"/>
-  <classpathentry kind="var" path="M2_REPO/com/badlogicgames/gdx/gdx/0.9.9/gdx-0.9.9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/badlogicgames/gdx/gdx-freetype/0.9.9/gdx-freetype-0.9.9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/badlogicgames/gdx/gdx-backend-android/0.9.9/gdx-backend-android-0.9.9.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/badlogicgames/gdx/gdx-platform/0.9.9/gdx-platform-0.9.9-natives-armeabi.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/badlogicgames/gdx/gdx-platform/0.9.9/gdx-platform-0.9.9-natives-armeabi-v7a.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/google/android/android/4.1.1.4/android-4.1.1.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.0.1/httpclient-4.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/khronos/opengl-api/gl1.1-android-2.1_r1/opengl-api-gl1.1-android-2.1_r1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/json/json/20080701/json-20080701.jar"/>
-</classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="assets"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="lib" path="libs/gdx-backend-android.jar"/>
+	<classpathentry kind="lib" path="/forge-m-base/libs/gdx.jar" sourcepath="/forge-m-base/libs/gdx-sources.jar"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/forge-m-base"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="lib" path="/forge-m-base/libs/gdx-freetype.jar"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

forge-m-android/.project

@@ -1,31 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>forge-m-android</name>
-  <comment>Forge lets you play the card game Magic: The Gathering against a computer opponent
-        using all of the rules. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects>
-    <project>forge-m-base</project>
-    <project>forge-core</project>
-    <project>forge-resources</project>
-    <project>forge-game</project>
-    <project>forge-ai</project>
-  </projects>
-  <buildSpec>
-    <buildCommand>
-      <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>com.android.ide.eclipse.adt.ApkBuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
+	<name>forge-m-android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>assets</name>
+			<type>2</type>
+			<locationURI>PARENT-1-PROJECT_LOC/forge-gui/res</locationURI>
+		</link>
+	</linkedResources>
+</projectDescription>

forge-m-android/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,4 @@
-#Fri Feb 28 10:03:21 CET 2014
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

forge-m-android/gen/com/forge/BuildConfig.java

@@ -0,0 +1,6 @@
+/** Automatically generated file. DO NOT MODIFY */
+package com.forge;
+
+public final class BuildConfig {
+    public final static boolean DEBUG = true;
+}

forge-m-android/gen/com/forge/R.java

@@ -0,0 +1,68 @@
+/* AUTO-GENERATED FILE.  DO NOT MODIFY.
+ *
+ * This class was automatically generated by the
+ * aapt tool from the resource data it found.  It
+ * should not be modified by hand.
+ */
+
+package com.forge;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class dimen {
+        /**  Default screen margins, per the Android Design guidelines. 
+
+         Customize dimensions originally defined in res/values/dimens.xml (such as
+         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
+    
+         */
+        public static final int activity_horizontal_margin=0x7f040000;
+        public static final int activity_vertical_margin=0x7f040001;
+    }
+    public static final class drawable {
+        public static final int ic_launcher=0x7f020000;
+    }
+    public static final class id {
+        public static final int action_settings=0x7f080000;
+    }
+    public static final class layout {
+        public static final int activity_main=0x7f030000;
+    }
+    public static final class menu {
+        public static final int main=0x7f070000;
+    }
+    public static final class string {
+        public static final int action_settings=0x7f050001;
+        public static final int app_name=0x7f050000;
+        public static final int hello_world=0x7f050002;
+    }
+    public static final class style {
+        /** 
+        Base application theme, dependent on API level. This theme is replaced
+        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
+    
+
+            Theme customizations available in newer API levels can go in
+            res/values-vXX/styles.xml, while customizations related to
+            backward-compatibility can go here.
+        
+
+        Base application theme for API 11+. This theme completely replaces
+        AppBaseTheme from res/values/styles.xml on API 11+ devices.
+    
+ API 11 theme customizations can go here. 
+
+        Base application theme for API 14+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v11/styles.xml on API 14+ devices.
+    
+ API 14 theme customizations can go here. 
+         */
+        public static final int AppBaseTheme=0x7f060000;
+        /**  Application theme. 
+ All customizations that are NOT specific to a particular API-level can go here. 
+         */
+        public static final int AppTheme=0x7f060001;
+    }
+}

forge-m-android/pom.xml

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <artifactId>forge</artifactId>
-        <groupId>forge</groupId>
-        <version>1.5.14-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>forge-m-android</artifactId>
-    <name>Forge Mobile Android</name>
-	<packaging>apk</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>forge</groupId>
-            <artifactId>forge-m-base</artifactId>
-        </dependency>
-		<dependency>
-            <groupId>com.badlogicgames.gdx</groupId>
-            <artifactId>gdx-backend-android</artifactId>
-        </dependency>
-		<dependency>
-			<groupId>com.badlogicgames.gdx</groupId>
-			<artifactId>gdx-platform</artifactId>
-			<classifier>natives-armeabi</classifier>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.badlogicgames.gdx</groupId>
-			<artifactId>gdx-platform</artifactId>
-			<classifier>natives-armeabi-v7a</classifier>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-			<version>${android.version}</version>
-			<scope>provided</scope>
-        </dependency>
-    </dependencies>
-	
-	<build>
-		<!-- output APK doesn't contain version number, needed for Intellij Idea -->
-		<finalName>${project.artifactId}</finalName>
-
-		<plugins>
-			<plugin>
-				<groupId>com.googlecode.mavennatives</groupId>
-				<artifactId>maven-nativedependencies-plugin</artifactId>
-				<version>0.0.7</version>
-				<configuration>
-					<nativesTargetDir>libs</nativesTargetDir>
-					<separateDirs>true</separateDirs>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- responsible for being able to compile for Android -->
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-				<configuration>
-					<androidManifestFile>${project.basedir}/src/main/conf/AndroidManifest.xml</androidManifestFile>
-					<assetsDirectory>${project.basedir}/src/main/assets</assetsDirectory>
-					<resourceDirectory>${project.basedir}/src/main/resources</resourceDirectory>
-					<sdk>
-						<platform>16</platform>
-					</sdk>
-					<undeployBeforeDeploy>true</undeployBeforeDeploy>
-					<dex>
-						<jvmArguments>
-							<jvmArgument>-Xmx1024m</jvmArgument>
-						</jvmArguments>
-					</dex>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

forge-m-android/proguard-project.txt

@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}