Merge pull request #5 from jdavo/master

Pull request with new features
bytor99999 · Jul 10, 2012 · 41dad22 · 41dad22
2 parents 7dd7c39 + 936b4ec
commit 41dad22
Show file tree

Hide file tree

Showing 97 changed files with 4,298 additions and 1,681 deletions.
diff --git a/.project b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>NonMavenAndroidSQLLiteOrm</name>
+	<name>AndroidSqLiteOrm</name>
 	<comment></comment>
 	<projects>
 	</projects>

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -3,7 +3,7 @@
       package="com.perfectworldprogramming.mobile.orm"
       android:versionCode="1"
       android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8"/>
 
     <instrumentation android:targetPackage="com.perfectworldprogramming.mobile.orm" android:name="android.test.InstrumentationTestRunner" />
 
@@ -12,22 +12,23 @@
     	<uses-library android:name="android.test.runner" />
     </application-->
 
+    <uses-permission android:name="android.permission.PERSISTENT_ACTIVITY"/>
     <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".Mainnnnnnperfectworldprogramming.mobile.orm.Main"
+        <activity android:name=".Main"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
+        <activity android:name=".test.Main" />
+
 		<uses-library android:name="android.test.runner" />
     </application>
 
     <!--instrumentation android:label="ORM Unit Tests" 
     				 android:targetPackage="com.perfectworldprogramming.mobile.orm.test" 
     				 android:name="android.test.InstrumentationTestRunner" /--><!-- com.perfectworldprogramming.mobile.orm.test.MyInstrumentationTestRunner -->
 
-   	<uses-permission android:name="android.permission.PERSISTENT_ACTIVITY"/>
 
 </manifest>
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -0,0 +1,8 @@
+/jarlist.cache
+/NonMavenAndroidSQLLiteOrm.apk
+/res
+/AndroidSqLiteOrm.apk
+/NonMavenAndroidSQLLiteOrmMerged.apk
+/classes.dex
+/resources.ap_
+/classes
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/AndroidSQLiteTemplate.class b/bin/classes/com/perfectworldprogramming/mobile/orm/AndroidSQLiteTemplate.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/CursorAdapter.class b/bin/classes/com/perfectworldprogramming/mobile/orm/CursorAdapter.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/Main.class b/bin/classes/com/perfectworldprogramming/mobile/orm/Main.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/annotations/Column.class b/bin/classes/com/perfectworldprogramming/mobile/orm/annotations/Column.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/annotations/ColumnType.class b/bin/classes/com/perfectworldprogramming/mobile/orm/annotations/ColumnType.class
diff --git a/...sses/com/perfectworldprogramming/mobile/orm/creator/SQLLiteCreateStatementGenerator.class b/...sses/com/perfectworldprogramming/mobile/orm/creator/SQLLiteCreateStatementGenerator.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/exception/DataAccessException.class b/bin/classes/com/perfectworldprogramming/mobile/orm/exception/DataAccessException.class
diff --git a/...classes/com/perfectworldprogramming/mobile/orm/exception/EmptySQLStatementException.class b/...classes/com/perfectworldprogramming/mobile/orm/exception/EmptySQLStatementException.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/exception/ExtraResultsException.class b/bin/classes/com/perfectworldprogramming/mobile/orm/exception/ExtraResultsException.class
diff --git a/...es/com/perfectworldprogramming/mobile/orm/exception/InvalidCursorExtractorException.class b/...es/com/perfectworldprogramming/mobile/orm/exception/InvalidCursorExtractorException.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/exception/InvalidQueryTypeException.class b/bin/classes/com/perfectworldprogramming/mobile/orm/exception/InvalidQueryTypeException.class
diff --git a/...classes/com/perfectworldprogramming/mobile/orm/exception/NoPrimaryKeyFieldException.class b/...classes/com/perfectworldprogramming/mobile/orm/exception/NoPrimaryKeyFieldException.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/exception/NoRowsReturnedException.class b/bin/classes/com/perfectworldprogramming/mobile/orm/exception/NoRowsReturnedException.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/helper/AndroidSQLLiteOpenHelper.class b/bin/classes/com/perfectworldprogramming/mobile/orm/helper/AndroidSQLLiteOpenHelper.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/helper/DBHelper.class b/bin/classes/com/perfectworldprogramming/mobile/orm/helper/DBHelper.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/reflection/DomainClassAnalyzer.class b/bin/classes/com/perfectworldprogramming/mobile/orm/reflection/DomainClassAnalyzer.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/AndroidSQLiteTemplateTests.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/AndroidSQLiteTemplateTests.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/creator/TableCreatorTest.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/creator/TableCreatorTest.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/Account.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/Account.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/Address.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/Address.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/NoPKDomain.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/NoPKDomain.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/Person.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/Person.class
diff --git a/...ses/com/perfectworldprogramming/mobile/orm/test/helper/AndroidSQLLiteOpenHelperTest.class b/...ses/com/perfectworldprogramming/mobile/orm/test/helper/AndroidSQLLiteOpenHelperTest.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/helper/DBHelperTests.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/helper/DBHelperTests.class
diff --git a/...asses/com/perfectworldprogramming/mobile/orm/test/interfaces/AddressCursorExtractor.class b/...asses/com/perfectworldprogramming/mobile/orm/test/interfaces/AddressCursorExtractor.class
diff --git a/...asses/com/perfectworldprogramming/mobile/orm/test/interfaces/AddressCursorRowMapper.class b/...asses/com/perfectworldprogramming/mobile/orm/test/interfaces/AddressCursorRowMapper.class
diff --git a/...classes/com/perfectworldprogramming/mobile/orm/test/interfaces/CursorExtractorTests.class b/...classes/com/perfectworldprogramming/mobile/orm/test/interfaces/CursorExtractorTests.class
diff --git a/...classes/com/perfectworldprogramming/mobile/orm/test/interfaces/CursorRowMapperTests.class b/...classes/com/perfectworldprogramming/mobile/orm/test/interfaces/CursorRowMapperTests.class
diff --git a/...lasses/com/perfectworldprogramming/mobile/orm/test/interfaces/PersonCursorExtractor.class b/...lasses/com/perfectworldprogramming/mobile/orm/test/interfaces/PersonCursorExtractor.class
diff --git a/...lasses/com/perfectworldprogramming/mobile/orm/test/interfaces/PersonCursorRowMapper.class b/...lasses/com/perfectworldprogramming/mobile/orm/test/interfaces/PersonCursorRowMapper.class
diff --git a/bin/classes/com/perfectworldprogramming/mobile/orm/test/interfaces/SampleDataHelper.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/interfaces/SampleDataHelper.class
diff --git a/...ses/com/perfectworldprogramming/mobile/orm/test/reflection/DomainClassAnalyzerTests.class b/...ses/com/perfectworldprogramming/mobile/orm/test/reflection/DomainClassAnalyzerTests.class
diff --git a/bin/res/drawable-hdpi/icon.png b/bin/res/drawable-hdpi/icon.png
diff --git a/bin/res/drawable-ldpi/icon.png b/bin/res/drawable-ldpi/icon.png
diff --git a/bin/res/drawable-mdpi/icon.png b/bin/res/drawable-mdpi/icon.png
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/perfectworldprogramming/mobile/orm/R.java b/gen/com/perfectworldprogramming/mobile/orm/R.java
@@ -1,23 +1,23 @@
-/* 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.perfectworldprogramming.mobile.orm;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040001;
-        public static final int hello=0x7f040000;
-    }
-}
+/* 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.perfectworldprogramming.mobile.orm;
+
+public final class R {
+    public static final class attr {
+    }
+    public static final class drawable {
+        public static final int icon=0x7f020000;
+    }
+    public static final class layout {
+        public static final int main=0x7f030000;
+    }
+    public static final class string {
+        public static final int app_name=0x7f040001;
+        public static final int hello=0x7f040000;
+    }
+}
diff --git a/proguard.cfg b/proguard.cfg
@@ -14,15 +14,15 @@
 -keep public class * extends android.preference.Preference
 -keep public class com.android.vending.licensing.ILicensingService
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
     native <methods>;
 }
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet);
 }
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
     public <init>(android.content.Context, android.util.AttributeSet, int);
 }