Fixes for reporting of exceptional conditions

3 files changed, 4 insertions, 7 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
index d2be27984..793bbf169 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
+++ b/examples/bundles/org.eclipse.ecf.example.collab/plugin.xml
@@ -7,12 +7,9 @@
       <view
             icon="icons/person.gif"
             class="org.eclipse.ecf.example.collab.ui.LineChatView"
-            category="org.eclipse.ecf.client.category"
+            category="org.eclipse.ecf.ui.viewcategory"
             name="ECF Collaboration"
             id="org.eclipse.ecf.example.collab.ui.LineChatView"/>
-      <category
-            name="ECF"
-            id="org.eclipse.ecf.client.category"/>
    </extension>
    <extension
          point="org.eclipse.ui.actionSets">
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java
index a93645944..232f00388 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectAction.java
@@ -65,7 +65,7 @@ public class ClientConnectAction implements IWorkbenchWindowActionDelegate {
             targetID = IDFactory.makeStringID(DEFAULT_SERVER_ID);
             client = new Client();
         } catch (Exception e) {
-            
+            throw new RuntimeException("Exception in ClientConnectAction()",e);
         }
 	}
     
@@ -91,7 +91,7 @@ public class ClientConnectAction implements IWorkbenchWindowActionDelegate {
                             MessageDialog.openInformation(
                                     null,
                                     "Already connected",
-                                    "Already connected for provider "+containerType);
+                                    "Already connected for provider "+((containerType==null)?Client.GENERIC_CONTAINER_CLIENT_NAME:containerType));
                         }
                     });
                     return okStatus;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectComposentAction.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectComposentAction.java
index 56471bd59..3065557f7 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectComposentAction.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/actions/ClientConnectComposentAction.java
@@ -23,7 +23,7 @@ public class ClientConnectComposentAction extends ClientConnectAction {
         try {
             targetID = IDFactory.makeStringID(COMPOSENT_TARGET);
         } catch (Exception e) {
-            // 
+            throw new RuntimeException("Exception in ClientConnectAction()",e);
         }
 	}
 }
\ No newline at end of file