Changes to provider descriptions. Added code to joingroupwizard that checks for existence of isServer property to exclude items from the provider combo box.

2 files changed, 15 insertions, 12 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
index d9670cfd8..78897a7de 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/JoinGroupWizardPage.java
@@ -35,7 +35,7 @@ public class JoinGroupWizardPage extends WizardPage {
     
     protected static final String USER_NAME_SYSTEM_PROPERTY = "user.name";
     
-    protected static final String ISCLIENT_PROP_NAME = CLASSNAME+".isClient";
+    protected static final String ISSERVER_PROP_NAME = CLASSNAME+".isServer";
     protected static final String DEFAULTGROUPID_PROP_NAME = CLASSNAME+".defaultgroupid";
     protected static final String EXAMPLEGROUPID_PROP_NAME = CLASSNAME+".examplegroupid";
     protected static final String USEPASSWORD_PROP_NAME = CLASSNAME+".usepassword";
@@ -119,14 +119,17 @@ public class JoinGroupWizardPage extends WizardPage {
             String name = desc.getName();
             String description = desc.getDescription();
             Map props = desc.getProperties();
-            if (DEFAULT_CLIENT.equals(name)) {
-                def = index;
-                defProps = props;
+            String isServer = (String) props.get(ISSERVER_PROP_NAME);
+            if (isServer == null || !isServer.equalsIgnoreCase("true")) {
+                if (DEFAULT_CLIENT.equals(name)) {
+                    def = index;
+                    defProps = props;
+                }
+                combo.add(description+" - "+name,index);
+                combo.setData(""+index,desc);
+                containerDescriptions.add(desc);
+                index++;
             }
-            combo.add(description+" - "+name,index);
-            combo.setData(""+index,desc);
-            containerDescriptions.add(desc);
-            index++;
         }
         combo.addSelectionListener(new SelectionListener() {
             public void widgetSelected(SelectionEvent e) {
diff --git a/framework/bundles/org.eclipse.ecf.provider/plugin.xml b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
index 1f2f154c0..52c434f7b 100644
--- a/framework/bundles/org.eclipse.ecf.provider/plugin.xml
+++ b/framework/bundles/org.eclipse.ecf.provider/plugin.xml
@@ -5,7 +5,7 @@
          point="org.eclipse.ecf.containerFactory">
       <containerFactory
             class="org.eclipse.ecf.provider.generic.ContainerInstantiator"
-            description="ECF Generic Provider"
+            description="ECF Generic Client"
             name="org.eclipse.ecf.provider.generic.Client">
          <defaultargument
                type="org.eclipse.ecf.core.identity.ID"
@@ -22,9 +22,6 @@
                name="org.eclipse.ecf.example.collab.ui.JoinGroupWizardPage.defaultgroupid"/>
          <property
                value="true"
-               name="org.eclipse.ecf.example.collab.ui.JoinGroupWizardPage.isClient"/>
-         <property
-               value="true"
                name="org.eclipse.ecf.example.collab.ui.JoinGroupWizardPage.usenickname"/>
       </containerFactory>
    </extension>
@@ -54,6 +51,9 @@
                value="10000"
                type="java.lang.Integer"
                name="keepAlive"/>
+         <property
+               value="true"
+               name="org.eclipse.ecf.example.collab.ui.JoinGroupWizardPage.isServer"/>
       </containerFactory>
    </extension>
 </plugin>