Removed isGroupServer from ISharedObjectContext (and replaced with isGroupManager in all implementations)

9 files changed, 8 insertions, 22 deletions

diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
index ebfc53519..07eceb981 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/EclipseCollabSharedObject.java
@@ -96,7 +96,7 @@ public class EclipseCollabSharedObject extends GenericSharedObject implements
 		super.activated(others);
 		if (localGUI == null) {
 			try {
-				if (!getContext().isGroupServer())
+				if (!getContext().isGroupManager())
 					destroySelfLocal();
 			} catch (Exception e) {
 				debugdump(e, "Unable to check whether we are server instance");
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
index e2fab9e81..72b30001a 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/GenericSharedObject.java
@@ -361,7 +361,7 @@ public void handleEvent(Event event) {
     public boolean isServer() {
         ISharedObjectContext context = getContext();
         if (context != null) {
-            return getContext().isGroupServer();
+            return getContext().isGroupManager();
         } else return false;
     }
 
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java
index ac07895c1..2b70dc2c7 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/EclipseFileTransfer.java
@@ -226,7 +226,7 @@ public class EclipseFileTransfer extends FileTransferSharedObject implements
 			}
 
 			try {
-				isServer = getContext().isGroupServer();
+				isServer = getContext().isGroupManager();
 			} catch (Exception e) {
 				e.printStackTrace(System.err);
 			}
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java
index 964a78638..79ec9ce4c 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/io/FileTransferSharedObject.java
@@ -96,7 +96,7 @@ public class FileTransferSharedObject extends TransactionSharedObject
     	debug("activated()");
         try {
             // Only try to open output file if this is not the host instance
-            if (!isHost() && !getContext().isGroupServer()) {
+            if (!isHost() && !getContext().isGroupManager()) {
                 // Then notify listener about starting the receive
                 if (progressListener != null) {
                     progressListener.receiveStart(this, transferParams.getRemoteFile(), transferParams.getLength(), transferParams.getRate());
@@ -147,7 +147,7 @@ public class FileTransferSharedObject extends TransactionSharedObject
         if (aFile == null) throw new IOException("File is null");
         // If this is a server, and we shouldn't create a copy of ourselves on a server
         // then we skip the file creation totally
-        if (getContext().isGroupServer() && !transferParams.getIncludeServer()) {
+        if (getContext().isGroupManager() && !transferParams.getIncludeServer()) {
             // Set myFile to null and outputStream to null
             debug("File "+aFile+" not created on server.");
             setOutputStream(null);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java
index b130179d4..a76fc17ad 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/share/url/ExecProg.java
@@ -128,7 +128,7 @@ public class ExecProg extends GenericSharedObject
     {
         debug("activated()");
         try {
-            if (!getContext().isGroupServer() || includeServer.equals(Boolean.TRUE)) {
+            if (!getContext().isGroupManager() || includeServer.equals(Boolean.TRUE)) {
                 startup();
             } else {
             	debug("Not executing commands because is server");
diff --git a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java
index ba19e9581..be91ce931 100644
--- a/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java
+++ b/examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java
@@ -263,7 +263,7 @@ public class PublishedGraphTracker implements ISharedObject {
 					getContext().getLocalContainerID()))
 				// this container joined
 				handleJoined();
-			else if (getContext().isGroupServer())
+			else if (getContext().isGroupManager())
 				// some other container joined and we're the server
 				handleJoined(e.getJoinedContainerID());
 		} else if (event instanceof ISharedObjectContainerDepartedEvent) {
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java
index 8ff66f2ab..d59e26b46 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/internal/datashare/ServerBootstrap.java
@@ -59,7 +59,7 @@ public class ServerBootstrap implements IBootstrap {
 	}
 
 	private void handleJoined(ID containerID) {
-		if (config.getContext().isGroupServer()) // TODO how about isGroupManager()?
+		if (config.getContext().isGroupManager()) 
 			agent.doBootstrap(containerID);
 	}
 	/*
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
index 9dd9f5896..886362f2d 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOContainer.java
@@ -784,13 +784,6 @@ public abstract class SOContainer implements ISharedObjectContainer {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.core.ISharedObjectContainer#isGroupServer()
-	 */
-	public abstract boolean isGroupServer();
-
-	/*
-	 * (non-Javadoc)
-	 * 
 	 * @see org.eclipse.ecf.core.ISharedObjectContainer#joinGroup(org.eclipse.ecf.core.identity.ID,
 	 *      org.eclipse.ecf.core.security.IJoinContext)
 	 */
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java
index 498bec330..15f406eb8 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ISharedObjectContext.java
@@ -89,13 +89,6 @@ public interface ISharedObjectContext extends IAdaptable {
 	/**
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.core.ISharedObjectContainer#isGroupServer()
-	 */
-	public boolean isGroupServer();
-
-	/**
-	 * (non-Javadoc)
-	 * 
 	 * @see org.eclipse.ecf.core.ISharedObjectContainer#getGroupMemberIDs()
 	 */
 	public ID[] getGroupMemberIDs();