Added preferences for determining whether servers are started and registered via discovery container

5 files changed, 38 insertions, 26 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
index 6ec4849a3..a71e106c8 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/Client.java
@@ -75,7 +75,6 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
 public class Client {
-    private static final int CONTAINER_DISPOSE = 1000;
     public static final String JOIN_TIME_FORMAT = "hh:mm:ss a z";
     public static final String GENERIC_CONTAINER_CLIENT_NAME = "org.eclipse.ecf.provider.generic.Client";
     public static final String GENERIC_CONTAINER_SERVER_NAME = "org.eclipse.ecf.provider.generic.Server";
@@ -188,7 +187,6 @@ public class Client {
 
     protected User getUserData(String containerType, ID clientID, String usernick, IResource project) {
         Vector topElements = new Vector();
-        String contType = containerType.substring(containerType.lastIndexOf(".")+1);
         topElements.add(new TreeItem("Project", getNameForResource(project)));
         SimpleDateFormat sdf = new SimpleDateFormat(JOIN_TIME_FORMAT);
         topElements.add(new TreeItem("Time",sdf.format(new Date())));
@@ -570,15 +568,15 @@ public class Client {
 					ServiceID svcID = event.getServiceInfo().getServiceID();
 					discoveryView.addServiceTypeInfo(svcID.getServiceType());
 					dc.addServiceListener(event.getServiceInfo().getServiceID(), new IServiceListener() {
-						public void serviceAdded(IServiceEvent event) {
-							discoveryView.addServiceInfo(event.getServiceInfo().getServiceID());
-							dc.requestServiceInfo(event.getServiceInfo().getServiceID(),3000);
+						public void serviceAdded(IServiceEvent evt) {
+							discoveryView.addServiceInfo(evt.getServiceInfo().getServiceID());
+							dc.requestServiceInfo(evt.getServiceInfo().getServiceID(),3000);
 						}
-						public void serviceRemoved(IServiceEvent event) {
-							discoveryView.removeServiceInfo(event.getServiceInfo());
+						public void serviceRemoved(IServiceEvent evt) {
+							discoveryView.removeServiceInfo(evt.getServiceInfo());
 						}
-						public void serviceResolved(IServiceEvent event) {
-							discoveryView.addServiceInfo(event.getServiceInfo());
+						public void serviceResolved(IServiceEvent evt) {
+							discoveryView.addServiceInfo(evt.getServiceInfo());
 						}});
 					dc.registerServiceType(svcID);
 				}});
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 3063d648c..b0694a81b 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
@@ -38,7 +38,6 @@ public class ClientPlugin extends AbstractUIPlugin implements
 
 	// Resource bundle.
 	private ResourceBundle resourceBundle;
-	private static String appShareBinPath;
 	private static URL pluginLocation;
 	private ImageRegistry registry = null;
 	private FontRegistry fontRegistry = null;
@@ -67,20 +66,27 @@ public class ClientPlugin extends AbstractUIPlugin implements
 		super();
 		plugin = this;
 		this.fontRegistry = new FontRegistry();
-		/*
-		 * The the plugin preferences to automatically define defaults.
-		 */
-		/*
-		 * ClientPreferencePage prefs = new ClientPreferencePage();
-		 * prefs.performDefaults(); prefs.dispose();
-		 */
 	}
 
+	protected void setPreferenceDefaults() {
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_USE_CHAT_WINDOW, false);
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_DISPLAY_TIMESTAMP, true);
+		
+		//this.getPreferenceStore().setDefault(ClientPlugin.PREF_CHAT_FONT, "");
+
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_FILE_SEND, true);
+		//this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_FILE_RECEIVE, true);
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_REMOTE_VIEW, true);
+		
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_START_SERVER,false);
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_REGISTER_SERVER,false);
+	}
 	/**
 	 * This method is called upon plug-in activation
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+		setPreferenceDefaults();
 		serverStartup = new ServerStartup();
 	}
 
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java
index e117dea08..7d41019ed 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPluginConstants.java
@@ -31,6 +31,9 @@ public interface ClientPluginConstants {
 	public static final String PREF_OTHER_TEXT_COLOR = "prefOtherTextColor";
 	public static final String PREF_SYSTEM_TEXT_COLOR = "prefSystemTextColor";
 	
+	public static final String PREF_START_SERVER = "startServerOnStartup";
+	public static final String PREF_REGISTER_SERVER = "registerServerOnStartup";
+	
 	/*
 	 * Contstants used to describe decoration images.
 	 */
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 237e27067..437c3d198 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
@@ -23,15 +23,16 @@ public class ServerStartup {
 	static List servers = new ArrayList();
 	
 	public ServerStartup() {
-		try {
-			InputStream ins = this.getClass().getResourceAsStream(SERVER_FILE_NAME);
-			if (ins != null) {
-				createServers(ins);
+		if (ClientPlugin.getDefault().getPreferenceStore().getBoolean(ClientPlugin.PREF_START_SERVER)) {
+			try {
+				InputStream ins = this.getClass().getResourceAsStream(SERVER_FILE_NAME);
+				if (ins != null) {
+					createServers(ins);
+				}
+			} catch (Exception e) {
+				ClientPlugin.log("Exception in ServerStartup initialization",e);
 			}
-		} catch (Exception e) {
-			ClientPlugin.log("Exception in ServerStartup initialization",e);
 		}
-
 	}
 	
 	public void dispose() {
@@ -82,9 +83,9 @@ public class ServerStartup {
 							connect.getTimeout());
 					DiscoveryStartup.registerServer(cont.getConfig().getID());
 					servers.add(cont);
+					ClientPlugin.log("ECF group created: "+cont.getConfig().getID().getName());
 				}
 				serverGroups[j].putOnTheAir();
-				ClientPlugin.log("Server listening on local port: "+serverGroups[j].getPort()+" with path "+serverGroups[j].getName());
 				j++;
 			}
 		}
@@ -101,7 +102,6 @@ public class ServerStartup {
 			TCPServerSOContainerGroup group, String path, int keepAlive)
 			throws IDInstantiationException {
 		ID newServerID = IDFactory.makeStringID(id);
-		ClientPlugin.log("Created server " + newServerID);
 		SOContainerConfig config = new SOContainerConfig(newServerID);
 		return new TCPServerSOContainer(config, group, path, keepAlive);
 	}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java
index d03a7c130..2396cf350 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ui/ClientPreferencePage.java
@@ -37,6 +37,8 @@ public class ClientPreferencePage extends FieldEditorPreferencePage implements
 		//this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_FILE_RECEIVE, true);
 		this.getPreferenceStore().setDefault(ClientPlugin.PREF_CONFIRM_REMOTE_VIEW, true);
 		
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_START_SERVER,false);
+		this.getPreferenceStore().setDefault(ClientPlugin.PREF_REGISTER_SERVER,false);
 	}
 	public ClientPreferencePage() {
 		super(GRID);
@@ -55,6 +57,9 @@ public class ClientPreferencePage extends FieldEditorPreferencePage implements
 		addField(new ColorFieldEditor(ClientPlugin.PREF_OTHER_TEXT_COLOR, "Chat Text Color For Other:", getFieldEditorParent()));
 		addField(new ColorFieldEditor(ClientPlugin.PREF_SYSTEM_TEXT_COLOR, "Chat Text Color For System:", getFieldEditorParent()));
 		
+		addField(new BooleanFieldEditor(ClientPlugin.PREF_START_SERVER,"Start ECF Group Server on Startup",getFieldEditorParent()));
+		addField(new BooleanFieldEditor(ClientPlugin.PREF_REGISTER_SERVER,"Register ECF Group Server on Startup",getFieldEditorParent()));
+		
 		/*IntegerFieldEditor rate = new IntegerFieldEditor(ClientPlugin.PREF_FILE_TRANSFER_RATE,
 				"Maximum transfer rate for file transfers.", getFieldEditorParent());*/
 		/*rate.setTextLimit(5);