Removed ".generated" suffix in generated sources packages (issue #46).

realm · Sep 3, 2012 · 27e2385 · 27e2385
1 parent 09e2fed
commit 27e2385
Show file tree

Hide file tree

Showing 32 changed files with 98 additions and 118 deletions.
diff --git a/src/main/java/com/tightdb/example/Example.java b/src/main/java/com/tightdb/example/Example.java
@@ -5,11 +5,6 @@
 import java.util.Date;
 
 import com.tightdb.Group;
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.Phone;
-import com.tightdb.example.generated.PhoneTable;
 import com.tightdb.lib.AbstractColumn;
 import com.tightdb.lib.Table;
 import com.tightdb.lib.TightDB;

diff --git a/src/main/java/com/tightdb/example/NestedTablesExample.java b/src/main/java/com/tightdb/example/NestedTablesExample.java
@@ -2,9 +2,6 @@
 
 import java.util.Date;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.PhoneTable;
 import com.tightdb.lib.TightDB;
 
 public class NestedTablesExample {

diff --git a/src/main/java/com/tightdb/example/SearchExample.java b/src/main/java/com/tightdb/example/SearchExample.java
@@ -3,10 +3,6 @@
 import java.util.Arrays;
 import java.util.Date;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.EmployeeView;
 import com.tightdb.lib.TightDB;
 
 public class SearchExample {

diff --git a/src/main/java/com/tightdb/example/SmallExample.java b/src/main/java/com/tightdb/example/SmallExample.java
@@ -2,8 +2,6 @@
 
 import java.util.Date;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeTable;
 import com.tightdb.lib.Table;
 import com.tightdb.lib.TightDB;
 

diff --git a/src/main/java/com/tightdb/example/TutorialExample.java b/src/main/java/com/tightdb/example/TutorialExample.java
@@ -8,9 +8,6 @@
 import java.io.IOException;
 
 import com.tightdb.Group;
-import com.tightdb.example.generated.PeopleQuery;
-import com.tightdb.example.generated.PeopleRow;
-import com.tightdb.example.generated.PeopleTable;
 import com.tightdb.lib.Table;
 
 // @@Example: create_table @@

diff --git a/src/main/java/com/tightdb/generator/CodeGenProcessor.java b/src/main/java/com/tightdb/generator/CodeGenProcessor.java
@@ -288,7 +288,7 @@ private String calculatePackageName(TypeElement model) {
 		if (parent instanceof PackageElement) {
 			PackageElement pkg = (PackageElement) parent;
 			String pkgName = pkg.getQualifiedName().toString();
-			return pkgName.isEmpty() ? "" : pkgName + ".generated";
+			return pkgName.isEmpty() ? "" : pkgName;
 		} else {
 			logger.error("Couldn't calculate the target package! Using default: "
 					+ DEFAULT_PACKAGE);

diff --git a/src/test/java/com/tightdb/experiment/FailureExample.java b/src/test/java/com/tightdb/experiment/FailureExample.java
@@ -1,29 +1,29 @@
-package com.tightdb.experiment;
-
-import java.io.IOException;
-import java.util.Date;
-
-import com.tightdb.Group;
-import com.tightdb.example.generated.EmployeeTable;
-
-public class FailureExample {
-
-	public static void main(String[] args) {
-		Group group = new Group();
-		EmployeeTable employees = new EmployeeTable(group);
-
-		employees.add("John", "Doe", 10000, true, new byte[] { 1, 2, 3 }, new Date(), "extra");
-
-		employees.at(0).phones.get();
-
-		try {
-			group.writeToFile("employees.tdb");
-		} catch (IOException e) {
-			throw new RuntimeException("Couldn't save the data!", e);
-		}
-
-		employees.clear();
-		System.out.println("DONE");
-	}
-
-}
+package com.tightdb.experiment;
+
+import java.io.IOException;
+import java.util.Date;
+
+import com.tightdb.Group;
+import com.tightdb.example.EmployeeTable;
+
+public class FailureExample {
+
+	public static void main(String[] args) {
+		Group group = new Group();
+		EmployeeTable employees = new EmployeeTable(group);
+
+		employees.add("John", "Doe", 10000, true, new byte[] { 1, 2, 3 }, new Date(), "extra");
+
+		employees.at(0).phones.get();
+
+		try {
+			group.writeToFile("employees.tdb");
+		} catch (IOException e) {
+			throw new RuntimeException("Couldn't save the data!", e);
+		}
+
+		employees.clear();
+		System.out.println("DONE");
+	}
+
+}
diff --git a/src/test/java/com/tightdb/lib/AbstractDataOperationsTest.java b/src/test/java/com/tightdb/lib/AbstractDataOperationsTest.java
@@ -1,14 +1,15 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
 
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
 import com.tightdb.Mixed;
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeView;
 
 public abstract class AbstractDataOperationsTest {
 

diff --git a/src/test/java/com/tightdb/lib/AbstractNavigationTest.java b/src/test/java/com/tightdb/lib/AbstractNavigationTest.java
@@ -1,12 +1,13 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeView;
 
 public abstract class AbstractNavigationTest {
 

diff --git a/src/test/java/com/tightdb/lib/AbstractTest.java b/src/test/java/com/tightdb/lib/AbstractTest.java
@@ -13,10 +13,10 @@
 
 import com.tightdb.ColumnType;
 import com.tightdb.Mixed;
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.EmployeeView;
-import com.tightdb.example.generated.Phone;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeTable;
+import com.tightdb.example.EmployeeView;
+import com.tightdb.example.Phone;
 import com.tightdb.test.EmployeeData;
 import com.tightdb.test.PhoneData;
 

diff --git a/src/test/java/com/tightdb/lib/CursorColumnsTest.java b/src/test/java/com/tightdb/lib/CursorColumnsTest.java
@@ -9,9 +9,9 @@
 import org.testng.annotations.Test;
 
 import com.tightdb.Mixed;
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeView;
 import com.tightdb.test.EmployeesFixture;
 
 public class CursorColumnsTest extends AbstractTest {

diff --git a/src/test/java/com/tightdb/lib/GroupTest.java b/src/test/java/com/tightdb/lib/GroupTest.java
@@ -1,6 +1,8 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -9,7 +11,7 @@
 import org.testng.annotations.Test;
 
 import com.tightdb.Group;
-import com.tightdb.example.generated.EmployeeTable;
+import com.tightdb.example.EmployeeTable;
 
 public class GroupTest {
 

diff --git a/src/test/java/com/tightdb/lib/MixedSubtableTest.java b/src/test/java/com/tightdb/lib/MixedSubtableTest.java
@@ -1,12 +1,12 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.PhoneTable;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeTable;
+import com.tightdb.example.PhoneTable;
 
 public class MixedSubtableTest extends AbstractTest {
 

diff --git a/src/test/java/com/tightdb/lib/SubtableTest.java b/src/test/java/com/tightdb/lib/SubtableTest.java
@@ -1,14 +1,16 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.Phone;
-import com.tightdb.example.generated.PhoneQuery;
-import com.tightdb.example.generated.PhoneTable;
-import com.tightdb.example.generated.PhoneView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.Phone;
+import com.tightdb.example.PhoneQuery;
+import com.tightdb.example.PhoneTable;
+import com.tightdb.example.PhoneView;
 import com.tightdb.test.EmployeesFixture;
 
 public class SubtableTest extends AbstractTest {

diff --git a/src/test/java/com/tightdb/lib/TableColumnsTest.java b/src/test/java/com/tightdb/lib/TableColumnsTest.java
@@ -10,9 +10,9 @@
 import org.testng.annotations.Test;
 
 import com.tightdb.Mixed;
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeView;
-import com.tightdb.example.generated.PhoneTable;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeView;
+import com.tightdb.example.PhoneTable;
 import com.tightdb.test.EmployeesFixture;
 import com.tightdb.test.PhoneData;
 

diff --git a/src/test/java/com/tightdb/lib/TableCursorColumnTest.java b/src/test/java/com/tightdb/lib/TableCursorColumnTest.java
@@ -1,13 +1,15 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.util.Iterator;
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.Phone;
+import com.tightdb.example.Employee;
+import com.tightdb.example.Phone;
 import com.tightdb.test.EmployeesFixture;
 
 public class TableCursorColumnTest extends AbstractTest {

diff --git a/src/test/java/com/tightdb/lib/TableDataOperationsTest.java b/src/test/java/com/tightdb/lib/TableDataOperationsTest.java
@@ -1,15 +1,16 @@
 package com.tightdb.lib;
 
+import static org.testng.AssertJUnit.assertEquals;
+
 import java.util.Date;
 
-import static org.testng.AssertJUnit.*;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeTable;
+import com.tightdb.example.EmployeeView;
 
 @Test
 public class TableDataOperationsTest extends AbstractDataOperationsTest {

diff --git a/src/test/java/com/tightdb/lib/TableNavigationTest.java b/src/test/java/com/tightdb/lib/TableNavigationTest.java
@@ -4,10 +4,10 @@
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeTable;
+import com.tightdb.example.EmployeeView;
 
 @Test
 public class TableNavigationTest extends AbstractNavigationTest {

diff --git a/src/test/java/com/tightdb/lib/TableQueryTest.java b/src/test/java/com/tightdb/lib/TableQueryTest.java
@@ -1,11 +1,11 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeView;
 
 public class TableQueryTest extends AbstractTest {
 

diff --git a/src/test/java/com/tightdb/lib/TableTest.java b/src/test/java/com/tightdb/lib/TableTest.java
@@ -1,6 +1,6 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.Date;
 
@@ -9,7 +9,7 @@
 import org.testng.annotations.Test;
 
 import com.tightdb.Mixed;
-import com.tightdb.example.generated.EmployeeTable;
+import com.tightdb.example.EmployeeTable;
 
 public class TableTest {
 

diff --git a/src/test/java/com/tightdb/lib/ViewColumnsTest.java b/src/test/java/com/tightdb/lib/ViewColumnsTest.java
@@ -1,13 +1,14 @@
 package com.tightdb.lib;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
 
 import java.util.Date;
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeView;
 import com.tightdb.test.EmployeesFixture;
 
 public class ViewColumnsTest extends AbstractTest {

diff --git a/src/test/java/com/tightdb/lib/ViewDataOperationsTest.java b/src/test/java/com/tightdb/lib/ViewDataOperationsTest.java
@@ -5,10 +5,10 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeTable;
+import com.tightdb.example.EmployeeView;
 
 @Test
 public class ViewDataOperationsTest extends AbstractDataOperationsTest {

diff --git a/src/test/java/com/tightdb/lib/ViewNavigationTest.java b/src/test/java/com/tightdb/lib/ViewNavigationTest.java
@@ -4,10 +4,10 @@
 
 import org.testng.annotations.Test;
 
-import com.tightdb.example.generated.Employee;
-import com.tightdb.example.generated.EmployeeQuery;
-import com.tightdb.example.generated.EmployeeTable;
-import com.tightdb.example.generated.EmployeeView;
+import com.tightdb.example.Employee;
+import com.tightdb.example.EmployeeQuery;
+import com.tightdb.example.EmployeeTable;
+import com.tightdb.example.EmployeeView;
 
 @Test
 public class ViewNavigationTest extends AbstractNavigationTest {

diff --git a/tightdb-android/libs/tightdb.jar b/tightdb-android/libs/tightdb.jar
diff --git a/tightdb-android/libs/tightdb/tightdb-devkit.jar b/tightdb-android/libs/tightdb/tightdb-devkit.jar