renamed some methods in SOContainer and subclasses

4 files changed, 14 insertions, 14 deletions

diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
index 1e49e790c..f46eb15cc 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/SOConfig.java
@@ -42,9 +42,9 @@ public class SOConfig implements ISharedObjectConfig {
     protected void makeActive(IQueueEnqueue queue) {
         isActive = true;
         if (container.getID().equals(homeContainerID)) {
-            this.context = container.makeNewSharedObjectContext(this,queue);
+            this.context = container.makeSharedObjectContext(this,queue);
         } else {
-            this.context = container.makeNewRemoteSharedObjectContext(this,queue);
+            this.context = container.makeRemoteSharedObjectContext(this,queue);
         }
     }
 
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 e24f2e6b6..98f17277e 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
@@ -108,7 +108,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
 						ISharedObject obj = load(description);
 						// Create wrapper object and move from loading to active
 						// list.
-						SOWrapper wrap = makeNewRemoteSharedObjectWrapper(
+						SOWrapper wrap = makeRemoteSharedObjectWrapper(
 								fromID, description, obj);
                         
                         wrap.init();
@@ -286,7 +286,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
 
 	protected ISharedObject addSharedObject0(SharedObjectDescription sd,
 			ISharedObject s) throws Exception {
-		addSharedObjectWrapper(makeNewSharedObjectWrapper(sd, s));
+		addSharedObjectWrapper(makeSharedObjectWrapper(sd, s));
 		return s;
 	}
 
@@ -834,7 +834,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		return new ThreadGroup(getID() + ":load");
 	}
 
-	protected SOConfig makeNewSharedObjectConfig(SharedObjectDescription sd,
+	protected SOConfig makeSharedObjectConfig(SharedObjectDescription sd,
 			ISharedObject obj) {
 		ID homeID = sd.getHomeID();
 		if (homeID == null)
@@ -842,7 +842,7 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		return new SOConfig(sd.getID(), homeID, this, sd.getProperties());
 	}
 
-	protected SOConfig makeNewRemoteSharedObjectConfig(ID fromID,
+	protected SOConfig makeRemoteSharedObjectConfig(ID fromID,
 			SharedObjectDescription sd, ISharedObject obj) {
 		ID homeID = sd.getHomeID();
 		if (homeID == null)
@@ -850,27 +850,27 @@ public abstract class SOContainer implements ISharedObjectContainer {
 		return new SOConfig(sd.getID(), homeID, this, sd.getProperties());
 	}
 
-	protected SOContext makeNewSharedObjectContext(SOConfig config,
+	protected SOContext makeSharedObjectContext(SOConfig config,
 			IQueueEnqueue queue) {
 		return new SOContext(config.getSharedObjectID(), config
 				.getHomeContainerID(), this, config.getProperties(), queue);
 	}
 
-	protected SOContext makeNewRemoteSharedObjectContext(SOConfig config,
+	protected SOContext makeRemoteSharedObjectContext(SOConfig config,
 			IQueueEnqueue queue) {
 		return new SOContext(config.getSharedObjectID(), config
 				.getHomeContainerID(), this, config.getProperties(), queue);
 	}
 
-	protected SOWrapper makeNewSharedObjectWrapper(SharedObjectDescription sd,
+	protected SOWrapper makeSharedObjectWrapper(SharedObjectDescription sd,
 			ISharedObject s) {
-		SOConfig newConfig = makeNewSharedObjectConfig(sd, s);
+		SOConfig newConfig = makeSharedObjectConfig(sd, s);
 		return new SOWrapper(newConfig, s, this);
 	}
 
-	protected SOWrapper makeNewRemoteSharedObjectWrapper(ID fromID,
+	protected SOWrapper makeRemoteSharedObjectWrapper(ID fromID,
 			SharedObjectDescription sd, ISharedObject s) {
-		SOConfig newConfig = makeNewRemoteSharedObjectConfig(fromID, sd, s);
+		SOConfig newConfig = makeRemoteSharedObjectConfig(fromID, sd, s);
 		return new SOWrapper(newConfig, s, this);
 	}
 
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
index f4098e7e4..622b9d9e1 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
@@ -272,7 +272,7 @@ public class XMPPClientSOContainer extends ClientSOContainer {
 				groupID));
 	}
 
-	protected SOContext makeNewSharedObjectContext(SOConfig config,
+	protected SOContext makeSharedObjectContext(SOConfig config,
 			IQueueEnqueue queue) {
 		return new XMPPContainerContext(config.getSharedObjectID(), config
 				.getHomeContainerID(), this, config.getProperties(), queue);
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
index cb553aa85..83211f9c5 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPGroupChatSOContainer.java
@@ -191,7 +191,7 @@ public class XMPPGroupChatSOContainer extends ClientSOContainer {
                 groupID));
     }
 
-    protected SOContext makeNewSharedObjectContext(SOConfig config,
+    protected SOContext makeSharedObjectContext(SOConfig config,
             IQueueEnqueue queue) {
         return new XMPPContainerContext(config.getSharedObjectID(), config
                 .getHomeContainerID(), this, config.getProperties(), queue);