Fix entity generation package name preference to honor the last used preference.

3 files changed, 12 insertions, 9 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/BaseEntityGenCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/BaseEntityGenCustomizer.java
index 4ff2e922f2..79abf3d86b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/BaseEntityGenCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/BaseEntityGenCustomizer.java
@@ -51,10 +51,8 @@ public class BaseEntityGenCustomizer extends ORMGenCustomizer
 	}
 
 	@Override
-	public void init(File file, Schema schema, JpaEntityGenPreferencesManager preferencesManager) {
-		super.init(file, schema, preferencesManager);
-		
-		this.setProperty(ORMGenTable.PACKAGE, preferencesManager.getDefaultPackagePreference(), ANY_TABLE, null);
+	public void init(File file, Schema schema) {
+		super.init(file, schema);
 	}
 
 	// -----------------------------------------
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/ORMGenCustomizer.java b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/ORMGenCustomizer.java
index e4ebf105ec..cb76bdd3a8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/ORMGenCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.gen/src/org/eclipse/jpt/jpa/gen/internal/ORMGenCustomizer.java
@@ -179,7 +179,7 @@ public abstract class ORMGenCustomizer implements java.io.Serializable
 	 * The file is created if necessary when the <code>save</code> 
 	 * method is called.
 	 */
-	public void init( File file, Schema schema, JpaEntityGenPreferencesManager preferencesManager) {
+	public void init( File file, Schema schema) {
 		this.mSchema = schema;
 		mFile = file;
 		
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
index e2e23de874..a9d97d4444 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/GenerateEntitiesFromSchemaWizard.java
@@ -159,14 +159,14 @@ public class GenerateEntitiesFromSchemaWizard extends Wizard
 	public ORMGenCustomizer createORMGenCustomizer(Schema schema) {
 		JpaPlatform jpaPlatform = this.jpaProject.getJpaPlatform();
 		ORMGenCustomizer obj = PlatformTools.getAdapter(jpaPlatform, ORMGenCustomizer.class);
-		JpaEntityGenPreferencesManager preferencesManager = this.buildEntityGenPreferencesManager();
+		
 		if (obj != null) {
 			this.customizer = (ORMGenCustomizer) obj; 
-			this.customizer.init(this.getCustomizationFile(), schema, preferencesManager);  
+			this.customizer.init(this.getCustomizationFile(), schema);  
 		} 
 		else {
 			this.customizer = new BaseEntityGenCustomizer();
-			this.customizer.init(this.getCustomizationFile(), schema, preferencesManager);  
+			this.customizer.init(this.getCustomizationFile(), schema);  
 		}
 
 		ORMGenTable newDefaultTable = this.getCustomizer().createGenTable(null);
@@ -179,7 +179,12 @@ public class GenerateEntitiesFromSchemaWizard extends Wizard
 					newDefaultTable.setSourceFolder(srcFolder.substring(1));
 				}
 			}
-		}		
+		}
+		else if (newDefaultTable.getPackage().isEmpty()) {
+			JpaEntityGenPreferencesManager preferencesManager = this.buildEntityGenPreferencesManager();
+			newDefaultTable.setPackage(preferencesManager.getDefaultPackageWorkspacePreference());
+		}
+			
 		return this.customizer;
 	}