| commit | 2871715f391932aa35aee6370048ad799b326285 | [log] [tgz] |
|---|---|---|
| author | cbridgha <cbridgha> | Wed Oct 05 18:24:18 2005 +0000 |
| committer | cbridgha <cbridgha> | Wed Oct 05 18:24:18 2005 +0000 |
| tree | 21448140b560f6dd59e25af03b482f33667029d1 | |
| parent | 76312ec6558f0001f9856d960c55b161e52c68a6 [diff] |
*** empty log message ***
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageElement.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageElement.java index f73f5ac..c5e8d7d 100644 --- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageElement.java +++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/operation/extensionui/DMWizardPageElement.java
@@ -18,11 +18,6 @@ import org.eclipse.wst.common.frameworks.internal.enablement.IdentifiableComparator; public class DMWizardPageElement extends AbstractRegistryDescriptor implements Comparable { - /** Type designation for an {@link ExtendedEditorPage} */ - public static final int EXTENDED_EDITOR_PAGE = 0; - /** Type designation for a nested editor */ - public static final int NESTED_EDITOR = 1; - static final String[] EMPTY_STRING_ARRAY = new String[0]; static final String ELEMENT_PAGE_GROUP = "wizardPageGroup"; //$NON-NLS-1$ static final String ATT_PAGE_ID = "pageGroupID"; //$NON-NLS-1$ static final String ATT_WIZARD_ID = "wizardID"; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/PageGroupManager.java b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/PageGroupManager.java index e235a3d..cb053f4 100644 --- a/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/PageGroupManager.java +++ b/plugins/org.eclipse.wst.common.frameworks.ui/wtp_ui/org/eclipse/wst/common/frameworks/internal/ui/PageGroupManager.java
@@ -309,8 +309,8 @@ for (int index = 0; index < length; index++) { DMPageGroupElementImpl pageInsertGroup = new DMPageGroupElementImpl(elements[index]); - - if (pageInsertGroup.getWizardID().equals(wizardId) && pageInsertGroup.getPageGroupInsertionID().equals(pageGroupId)) { + String pageInsertGroupId = pageInsertGroup.getPageGroupInsertionID(); + if (pageInsertGroup.getWizardID().equals(wizardId) && (null == pageInsertGroupId || pageInsertGroupId.equals(pageGroupId))) { addPageGroup(pageGroup, pageInsertGroup); // If this page group has page then add them