Changed startup messages for example collab plugin. Fixed invalid menu path for hello example

3 files changed, 11 insertions, 3 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
index b0694a81b..c96b29288 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
@@ -43,6 +43,7 @@ public class ClientPlugin extends AbstractUIPlugin implements
 	private FontRegistry fontRegistry = null;
 
 	private ServerStartup serverStartup = null;
+	private DiscoveryStartup discoveryStartup = null;
 	
 	public static URL getPluginTopLocation() {
 		return pluginLocation;
@@ -88,6 +89,7 @@ public class ClientPlugin extends AbstractUIPlugin implements
 		super.start(context);
 		setPreferenceDefaults();
 		serverStartup = new ServerStartup();
+		discoveryStartup = new DiscoveryStartup();
 	}
 
 	/**
@@ -101,6 +103,10 @@ public class ClientPlugin extends AbstractUIPlugin implements
 			serverStartup.dispose();
 			serverStartup = null;
 		}
+		if (discoveryStartup != null) {
+			discoveryStartup.dispose();
+			discoveryStartup = null;
+		}
 	}
 
 	public FontRegistry getFontRegistry() {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
index 23f3ff9bc..56716b95a 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
@@ -17,7 +17,7 @@ public class DiscoveryStartup {
 
 	public static final String DISCOVERY_CONTAINER = "org.eclipse.ecf.provider.jmdns.container.JmDNS";
 	public static final String TCPSERVER_DISCOVERY_TYPE = "_http._tcp._local.";
-
+	
 	static IDiscoveryContainer discovery = null;
 
 	public static IDiscoveryContainer getDefault() {
@@ -25,7 +25,9 @@ public class DiscoveryStartup {
 	}
 	
 	public DiscoveryStartup() {
-		setupDiscovery();
+		if (ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_REGISTER_SERVER)) {
+			setupDiscovery();
+		}
 	}
 	
 	public void dispose() {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
index 437c3d198..a9dc0bf64 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ServerStartup.java
@@ -83,7 +83,7 @@ public class ServerStartup {
 							connect.getTimeout());
 					DiscoveryStartup.registerServer(cont.getConfig().getID());
 					servers.add(cont);
-					ClientPlugin.log("ECF group created: "+cont.getConfig().getID().getName());
+					ClientPlugin.log("ECF group server created: "+cont.getConfig().getID().getName());
 				}
 				serverGroups[j].putOnTheAir();
 				j++;