Bug 462063 - During creation of New Form default Sub package is not filled
https://bugs.eclipse.org/bugs/show_bug.cgi?id=462063
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/code/type/CodeTypeNewWizard.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/code/type/CodeTypeNewWizard.java
index 3b9dd97..f1c3dfe 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/code/type/CodeTypeNewWizard.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/code/type/CodeTypeNewWizard.java
@@ -11,6 +11,7 @@
package org.eclipse.scout.sdk.ui.wizard.code.type;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.scout.commons.StringUtility;
import org.eclipse.scout.sdk.Texts;
import org.eclipse.scout.sdk.ui.action.create.CodeTypeNewAction;
import org.eclipse.scout.sdk.ui.executor.AbstractWizardExecutor;
@@ -37,7 +38,9 @@
String pck = UiUtility.getPackageSuffix(selection);
m_page1 = new CodeTypeNewWizardPage(sharedBundle);
- m_page1.setTargetPackage(pck);
+ if (StringUtility.hasText(pck)) {
+ m_page1.setTargetPackage(pck);
+ }
addPage(m_page1);
}
else {
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/FormNewWizard.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/FormNewWizard.java
index e97ada7..c9edea5 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/FormNewWizard.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/FormNewWizard.java
@@ -88,7 +88,9 @@
m_formPage = new FormNewWizardPage(m_clientBundle);
m_formPage.addPropertyChangeListener(new P_LocationPropertyListener());
- m_formPage.setTargetPackage(pck);
+ if (StringUtility.hasText(pck)) {
+ m_formPage.setTargetPackage(pck);
+ }
addPage(m_formPage);
if (m_clientBundle != null) {
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/SearchFormNewWizard.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/SearchFormNewWizard.java
index edc1a60..2351e61 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/SearchFormNewWizard.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/form/SearchFormNewWizard.java
@@ -86,7 +86,9 @@
P_StatusRevalidator statusProvider = new P_StatusRevalidator();
m_page1 = new SearchFormNewWizardPage(clientBundle);
- m_page1.setTargetPackage(pck);
+ if (StringUtility.hasText(pck)) {
+ m_page1.setTargetPackage(pck);
+ }
m_page1.addStatusProvider(statusProvider);
m_page1.setTablePageType(tablePageType);
m_page1.setNlsName(nlsEntry);
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizard.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizard.java
index 89b8f6f..c93a082 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizard.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizard.java
@@ -96,7 +96,9 @@
// init
String pck = UiUtility.getPackageSuffix(selection);
- m_page1.setTargetPackage(pck);
+ if (StringUtility.hasText(pck)) {
+ m_page1.setTargetPackage(pck);
+ }
m_page1.addPropertyChangeListener(new P_LocationPropertyListener());
}
}
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/page/PageNewWizard.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/page/PageNewWizard.java
index 45e2703..8928779 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/page/PageNewWizard.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/page/PageNewWizard.java
@@ -89,7 +89,9 @@
m_locationWizardPage.setExcludePage(true);
String pck = UiUtility.getPackageSuffix(selection);
- m_pageAttributePage.setTargetPackage(pck);
+ if (StringUtility.hasText(pck)) {
+ m_pageAttributePage.setTargetPackage(pck);
+ }
}
}
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/services/ProcessServiceNewWizard.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/services/ProcessServiceNewWizard.java
index 42f8698..3f0207b 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/services/ProcessServiceNewWizard.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/services/ProcessServiceNewWizard.java
@@ -69,7 +69,9 @@
m_serviceNewWizardPage = new ProcessServiceNewWizardPage(serverBundle);
m_serviceNewWizardPage.addPropertyChangeListener(new P_LocationPropertyListener());
- m_serviceNewWizardPage.setTargetPackage(pck);
+ if (StringUtility.hasText(pck)) {
+ m_serviceNewWizardPage.setTargetPackage(pck);
+ }
addPage(m_serviceNewWizardPage);
if (serverBundle != null) {
