[275958] change logic so that a passed in selection will be used for package default - patch from Danny.

1 files changed, 11 insertions, 3 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
index 1fe628fa31..60367a7361 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DefaultTableGenerationWizardPage.java
@@ -86,8 +86,13 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 	 * @param selection used to initialize the fields
 	 */
 	void init(IStructuredSelection selection) {
-		if ( jpaProject != null ) {
-			IJavaElement jelem = this.jpaProject.getJavaProject();
+		IJavaElement jelem = null;
+		if ( selection.getFirstElement() instanceof IJavaElement ) {
+			jelem = (IJavaElement) selection.getFirstElement();
+		}else{
+			jelem = this.jpaProject.getJavaProject();			
+		}
+		if( jelem !=null ){
 			initContainerPage(jelem);
 			initTypePage(jelem);
 		}
@@ -130,7 +135,10 @@ public class DefaultTableGenerationWizardPage extends NewTypeWizardPage {
 				setSuperClass(baseClass, true);
 				setSuperInterfaces(defaultsTable.getImplements(), true);
 				IPackageFragmentRoot root = getSourceFolder( defaultsTable.getSourceFolder());
-				setPackageName( root, defaultsTable.getPackage() );
+				String initPackageName = this.getPackageText();
+				if( initPackageName.length()==0 ){
+					setPackageName( root, defaultsTable.getPackage() );
+				}
 				setPackageFragmentRoot(root, true/*canBeModified*/);
 			}
 		}