Another addition of new constructors for ReplicaSharedObjectDescription

and SharedObjectTypeDescription.

4 files changed, 47 insertions, 12 deletions

diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF
index d9c6fc2ed..942a56ca8 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.sharedobject;singleton:=true
-Bundle-Version: 2.2.100.qualifier
+Bundle-Version: 2.3.0.qualifier
 Bundle-Activator: org.eclipse.ecf.internal.core.sharedobject.Activator
 Bundle-Localization: plugin
 Bundle-Vendor: %plugin.provider
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java
index 3cb109903..d86068717 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/ReplicaSharedObjectDescription.java
@@ -29,6 +29,20 @@ public class ReplicaSharedObjectDescription extends SharedObjectDescription impl
 
 	protected long identifier;
 
+	/**
+	 * @since 2.3
+	 */
+	public ReplicaSharedObjectDescription(SharedObjectTypeDescription type, ID soID, ID homeID) {
+		this(type, soID, homeID, null, getNextUniqueIdentifier());
+	}
+
+	/**
+	 * @since 2.3
+	 */
+	public ReplicaSharedObjectDescription(SharedObjectTypeDescription type, ID soID, ID homeID, Map props) {
+		this(type, soID, homeID, props, getNextUniqueIdentifier());
+	}
+
 	public ReplicaSharedObjectDescription(SharedObjectTypeDescription type, ID objectID, ID homeID, Map props, long ident) {
 		super(type, objectID, props);
 		this.homeID = homeID;
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java
index 0d7e40b94..d14df93e2 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectDescription.java
@@ -26,28 +26,37 @@ public class SharedObjectDescription implements Serializable {
 
 	protected Map properties = null;
 
-	protected SharedObjectDescription(
-			SharedObjectTypeDescription typeDescription, ID id, Map properties) {
+	/**
+	 * @since 2.3
+	 */
+	public SharedObjectDescription(SharedObjectTypeDescription typeDescription, ID id, Map properties) {
 		this.typeDescription = typeDescription;
 		this.id = id;
 		this.properties = (properties == null) ? new HashMap() : properties;
 	}
 
-	protected SharedObjectDescription(
-			SharedObjectTypeDescription typeDescription, ID id) {
+	/**
+	 * @since 2.3
+	 */
+	public SharedObjectDescription(SharedObjectTypeDescription typeDescription, ID id) {
 		this(typeDescription, id, null);
 	}
 
+	/**
+	 * @since 2.3
+	 */
+	public SharedObjectDescription(String typeName, ID id) {
+		this(typeName, id, null);
+	}
+
 	public SharedObjectDescription(String typeName, ID id, Map properties) {
-		this.typeDescription = new SharedObjectTypeDescription(typeName, null,
-				null, null);
+		this.typeDescription = new SharedObjectTypeDescription(typeName, null, null, null);
 		this.id = id;
 		this.properties = (properties == null) ? new HashMap() : properties;
 	}
 
 	public SharedObjectDescription(Class clazz, ID id, Map properties) {
-		this.typeDescription = new SharedObjectTypeDescription(clazz.getName(),
-				null);
+		this.typeDescription = new SharedObjectTypeDescription(clazz.getName(), null);
 		this.id = id;
 		this.properties = (properties == null) ? new HashMap() : properties;
 	}
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java
index 88dd55fee..2bf5a1d67 100644
--- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java
+++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/SharedObjectTypeDescription.java
@@ -10,7 +10,6 @@ package org.eclipse.ecf.core.sharedobject;
 
 import java.io.Serializable;
 import java.util.Map;
-
 import org.eclipse.ecf.core.sharedobject.provider.ISharedObjectInstantiator;
 
 /**
@@ -35,19 +34,32 @@ public class SharedObjectTypeDescription implements Serializable {
 
 	protected String className;
 
-	public SharedObjectTypeDescription(String name,
-			ISharedObjectInstantiator instantiator, String desc, Map props) {
+	public SharedObjectTypeDescription(String name, ISharedObjectInstantiator instantiator, String desc, Map props) {
 		this.name = name;
 		this.instantiator = instantiator;
 		this.description = desc;
 		this.typeProperties = props;
 	}
 
+	/**
+	 * @since 2.3
+	 */
+	public SharedObjectTypeDescription(String name, ISharedObjectInstantiator instantiator, String desc) {
+		this(name, instantiator, desc, null);
+	}
+
 	public SharedObjectTypeDescription(String className, Map props) {
 		this.className = className;
 		this.typeProperties = props;
 	}
 
+	/**
+	 * @since 2.3
+	 */
+	public SharedObjectTypeDescription(String className) {
+		this(className, null);
+	}
+
 	public String getClassName() {
 		return className;
 	}