From dd4c4ae10d2812168449b0cfce4e0edf1f07ac96 Mon Sep 17 00:00:00 2001
From: Uwe Stieber <uwe.stieber@windriver.com>
Date: Mon, 12 Feb 2007 14:04:31 +0000
Subject: [PATCH] [fix] required id is associated with
 newConnectionWizardDelegate element instead of extension

---
 discovery/org.eclipse.rse.discovery/plugin.xml           | 7 ++++---
 .../eclipse/rse/ui/wizards/IRSENewConnectionWizard.java  | 1 +
 .../eclipse/rse/ui/wizards/RSENewConnectionWizard.java   | 2 +-
 .../schema/newConnectionWizardDelegates.exsd             | 9 ++++++++-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/discovery/org.eclipse.rse.discovery/plugin.xml b/discovery/org.eclipse.rse.discovery/plugin.xml
index be1e673ff61..09a31684b08 100644
--- a/discovery/org.eclipse.rse.discovery/plugin.xml
+++ b/discovery/org.eclipse.rse.discovery/plugin.xml
@@ -15,9 +15,10 @@ Contributors:
 
 	<extension
        point="org.eclipse.rse.ui.newConnectionWizardDelegates">
-   	  <newConnectionWizardDelegate 
-   	  		class="org.eclipse.rse.discovery.ServiceDiscoveryWizardDelegate"
-    		systemType="org.eclipse.rse.systemtype.discovery"/>
+   	  <newConnectionWizardDelegate
+            class="org.eclipse.rse.discovery.ServiceDiscoveryWizardDelegate"
+            id="org.eclipse.rse.discovery.ServiceDiscoveryWizardDelegate"
+            systemType="org.eclipse.rse.systemtype.discovery"/>
    </extension>
   
    <extension
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java
index 0907a973c33..16d3e3ef65f 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/IRSENewConnectionWizard.java
@@ -23,6 +23,7 @@ public interface IRSENewConnectionWizard extends INewWizard {
 
 	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_POINT_ID = "org.eclipse.rse.ui.newConnectionWizardDelegates"; //$NON-NLS-1$
 	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_NAME = "newConnectionWizardDelegate"; //$NON-NLS-1$
+	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_ID = "id"; //$NON-NLS-1$
 	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_SYSTEMTYPE = "systemType"; //$NON-NLS-1$
 	public static final String NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_CLASS = "class"; //$NON-NLS-1$
 	
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java
index 16f573171e1..c1c922a829e 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSENewConnectionWizard.java
@@ -111,7 +111,7 @@ public class RSENewConnectionWizard extends AbstractSystemWizard implements IRSE
 							IRSESystemType[] systemTypes = RSECorePlugin.getDefault().getRegistry().getSystemTypes();
 							for (int j = 0; j < systemTypes.length; j++) {
 								IRSESystemType systemType = systemTypes[j];
-								if (systemType.acceptNewConnectionWizardDelegate(element.getDeclaringExtension().getUniqueIdentifier())
+								if (systemType.acceptNewConnectionWizardDelegate(element.getAttribute(NEW_CONNECTION_WIZARD_DELEGATE_EXTENSION_CONFIG_ATTRIBUTE_ID))
 										&& !wizardDelegates.containsKey(systemType.getId())) {
 									wizardDelegates.put(systemType.getId(), obj);
 								}
diff --git a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegates.exsd b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegates.exsd
index 7e64c9b6cce..ec56499c397 100644
--- a/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegates.exsd
+++ b/rse/plugins/org.eclipse.rse.ui/schema/newConnectionWizardDelegates.exsd
@@ -27,7 +27,7 @@
                </documentation>
             </annotation>
          </attribute>
-         <attribute name="id" type="string" use="required">
+         <attribute name="id" type="string">
             <annotation>
                <documentation>
                   
@@ -54,6 +54,13 @@
          </documentation>
       </annotation>
       <complexType>
+         <attribute name="id" type="string" use="required">
+            <annotation>
+               <documentation>
+                  A unique identifier for this extension.
+               </documentation>
+            </annotation>
+         </attribute>
          <attribute name="systemType" type="string">
             <annotation>
                <documentation>