Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2006-01-13 19:53:11 +0000
committerslewis2006-01-13 19:53:11 +0000
commit4a4cc6061ee50f3941f1399798fabbd9f886e1e3 (patch)
tree7009ea27890e576d466cc722fceda587fb7a3156
parent654642751380f1138a8a669b286ceec3e2817e95 (diff)
downloadorg.eclipse.ecf-4a4cc6061ee50f3941f1399798fabbd9f886e1e3.tar.gz
org.eclipse.ecf-4a4cc6061ee50f3941f1399798fabbd9f886e1e3.tar.xz
org.eclipse.ecf-4a4cc6061ee50f3941f1399798fabbd9f886e1e3.zip
Removed superfluous constructors from SharedObjectDescription
-rw-r--r--examples/bundles/org.eclipse.ecf.example.sdo.editor/src/org/eclipse/ecf/example/sdo/editor/PublishedGraphTracker.java4
-rw-r--r--framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ReplicaSharedObjectDescription.java28
2 files changed, 15 insertions, 17 deletions
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 8188f5af9..b43f243f5 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
@@ -307,7 +307,7 @@ public class PublishedGraphTracker implements ISharedObject {
getContext().sendCreate(
null,
new ReplicaSharedObjectDescription(config.getSharedObjectID(),
- getClass()));
+ getClass().getName()));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -322,7 +322,7 @@ public class PublishedGraphTracker implements ISharedObject {
getContext().sendCreate(
containerID,
new ReplicaSharedObjectDescription(config.getSharedObjectID(),
- getClass(), props));
+ getClass().getName(), props));
} catch (IOException ex) {
// TODO Auto-generated catch block
ex.printStackTrace();
diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ReplicaSharedObjectDescription.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ReplicaSharedObjectDescription.java
index a0f65f726..a4531bb42 100644
--- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ReplicaSharedObjectDescription.java
+++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/ReplicaSharedObjectDescription.java
@@ -31,18 +31,20 @@ public class ReplicaSharedObjectDescription extends SharedObjectDescription
protected Map properties;
protected long identifier;
- public ReplicaSharedObjectDescription(ID id, Class clazz) {
- this(id, clazz, null);
- }
- public ReplicaSharedObjectDescription(ID id, Class clazz, long ident) {
- this(id, clazz, null, ident);
- }
- public ReplicaSharedObjectDescription(ID id, Class clazz, Map dict) {
- this(id, clazz, dict, getNextUniqueIdentifier());
+ public ReplicaSharedObjectDescription(String name,
+ ISharedObjectInstantiator inst, String desc, Map props) {
+ super(name, inst, desc, props);
}
- public ReplicaSharedObjectDescription(ID id, Class clazz, Map dict,
- long ident) {
- this(id, clazz.getName(), dict, ident);
+ public ReplicaSharedObjectDescription(String name, ID objectID, ID homeID, Map dict, long ident) {
+ super(name,null,null,null);
+ this.id = objectID;
+ this.homeID = homeID;
+ if (dict != null) {
+ this.properties = dict;
+ } else {
+ this.properties = new HashMap();
+ }
+ this.identifier = ident;
}
public ReplicaSharedObjectDescription(ID objectID, ID homeID,
String className, Map dict, long ident) {
@@ -70,10 +72,6 @@ public class ReplicaSharedObjectDescription extends SharedObjectDescription
long ident) {
this(id, null, className, dict, ident);
}
- public ReplicaSharedObjectDescription(String name,
- ISharedObjectInstantiator inst, String desc, Map props) {
- super(name, inst, desc, props);
- }
public String getClassname() {
return className;
}

Back to the top