Fix problem with new entityGenPrefManager usage for default package name. Fixes NPE when generating with schema for first time.

1 files changed, 6 insertions, 2 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
index e9005e7651..058a2f6f00 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
@@ -75,6 +75,7 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 		this.jpaProject = jpaProject;
 		setTitle(JptUiEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_title);
 		setDescription( JptUiEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_desc);
+		this.prefrencesManager = buildEntityGenPreferencesManager();
 	}
 	
 	
@@ -102,7 +103,6 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 	
 	public void createControl(Composite parent) {
 		this.initializeDialogUnits(parent);
-		this.prefrencesManager = new JpaEntityGenPreferencesManager(this.jpaProject.getProject());
 		
 		Composite composite = new Composite(parent, SWT.NULL);
 		int nColumns= 4	;
@@ -323,8 +323,12 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 		GenerateEntitiesFromSchemaWizard wizard = (GenerateEntitiesFromSchemaWizard) this.getWizard();
 		return wizard.getCustomizer();
 	}	
+	
+    private JpaEntityGenPreferencesManager buildEntityGenPreferencesManager() {
+		return new JpaEntityGenPreferencesManager(this.jpaProject.getProject());
+	}
 
-    @Override
+	@Override
     public final void performHelp() {
         this.getHelpSystem().displayHelp( GenerateEntitiesFromSchemaWizard.HELP_CONTEXT_ID );
     }