removed generated resources from git, removed Domain annotation and

usage in domain objects (not going there!), removed ClassFinder, added Query Parser
bytor99999 · Jun 13, 2012 · 4763620 · 4763620
1 parent c1c592b
commit 4763620
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 198 deletions.
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -1,2 +1,7 @@
 /jarlist.cache
 /NonMavenAndroidSQLLiteOrm.apk
+/res
+/AndroidSqLiteOrm.apk
+/NonMavenAndroidSQLLiteOrmMerged.apk
+/classes.dex
+/resources.ap_
diff --git a/bin/classes.dex b/bin/classes.dex
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/Person.class b/bin/classes/com/perfectworldprogramming/mobile/orm/test/domain/Person.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/bin/resources.ap_ b/bin/resources.ap_
diff --git a/src/com/perfectworldprogramming/mobile/orm/annotations/Domain.java b/src/com/perfectworldprogramming/mobile/orm/annotations/Domain.java
diff --git a/test/com/perfectworldprogramming/mobile/orm/test/domain/Account.java b/test/com/perfectworldprogramming/mobile/orm/test/domain/Account.java
@@ -2,10 +2,8 @@
 
 import com.perfectworldprogramming.mobile.orm.annotations.Column;
 import com.perfectworldprogramming.mobile.orm.annotations.ColumnType;
-import com.perfectworldprogramming.mobile.orm.annotations.Domain;
 import com.perfectworldprogramming.mobile.orm.annotations.PrimaryKey;
 
-@Domain(databaseName="ormtest", databaseVersion=3)
 public class Account {
 	public static final String PK_ACCOUNT_ID = "ACCOUNT_ID";
     public static final String COL_ACCOUNT_TYPE = "ACCOUNT_TYPE";

diff --git a/test/com/perfectworldprogramming/mobile/orm/test/domain/Address.java b/test/com/perfectworldprogramming/mobile/orm/test/domain/Address.java
@@ -2,7 +2,6 @@
 
 import com.perfectworldprogramming.mobile.orm.annotations.Column;
 import com.perfectworldprogramming.mobile.orm.annotations.ColumnType;
-import com.perfectworldprogramming.mobile.orm.annotations.Domain;
 import com.perfectworldprogramming.mobile.orm.annotations.ForeignKey;
 import com.perfectworldprogramming.mobile.orm.annotations.PrimaryKey;
 
@@ -11,7 +10,6 @@
  * Date: 3/14/11
  * Time: 2:42 PM
  */
-@Domain(databaseName="ormtest", databaseVersion=3)
 public class Address {
 
     @PrimaryKey(value = "ADDRESS_ID")

diff --git a/test/com/perfectworldprogramming/mobile/orm/test/domain/Person.java b/test/com/perfectworldprogramming/mobile/orm/test/domain/Person.java
@@ -1,20 +1,18 @@
 package com.perfectworldprogramming.mobile.orm.test.domain;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.perfectworldprogramming.mobile.orm.annotations.Column;
 import com.perfectworldprogramming.mobile.orm.annotations.ColumnType;
-import com.perfectworldprogramming.mobile.orm.annotations.Domain;
 import com.perfectworldprogramming.mobile.orm.annotations.PrimaryKey;
 import com.perfectworldprogramming.mobile.orm.annotations.Transient;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * User: Mark Spritzler
  * Date: 3/14/11
  * Time: 2:42 PM
  */
-@Domain(databaseName="ormtest", databaseVersion=3)
 public class Person {
 
     public static final String PK_PERSON ="PERSON_ID";

diff --git a/test/com/perfectworldprogramming/mobile/orm/test/interfaces/CursorRowMapperTests.java b/test/com/perfectworldprogramming/mobile/orm/test/interfaces/CursorRowMapperTests.java
@@ -3,6 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import android.test.ActivityInstrumentationTestCase2;
+
 import com.perfectworldprogramming.mobile.orm.AndroidSQLiteTemplate;
 import com.perfectworldprogramming.mobile.orm.exception.ExtraResultsException;
 import com.perfectworldprogramming.mobile.orm.helper.DBHelper;
@@ -11,8 +13,6 @@
 import com.perfectworldprogramming.mobile.orm.test.domain.Address;
 import com.perfectworldprogramming.mobile.orm.test.domain.Person;
 
-import android.test.ActivityInstrumentationTestCase2;
-
 /**
  * User: Mark Spritzler Date: 4/6/11 Time: 10:50 AM
  */
@@ -33,6 +33,7 @@ public CursorRowMapperTests()
     public void setUp()
     {
         helper = new DBHelper(this.getInstrumentation().getContext(), new Class[] { Person.class, Address.class, Account.class }, "ormtest", 3);
+
         template = new AndroidSQLiteTemplate(helper.getSqlLiteDatabase());
         SampleDataHelper.addDataToDatabase(template);
     }

diff --git a/test/com/perfectworldprogramming/mobile/orm/test/reflection/ClassFinder.java b/test/com/perfectworldprogramming/mobile/orm/test/reflection/ClassFinder.java