Added missing cloning of the properties

Signed-off-by: maclean <gilleain.torrance@gmail.com>
cdk · Sep 18, 2011 · aeaa993 · aeaa993
1 parent 496f242
commit aeaa993
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/main/org/openscience/cdk/ReactionScheme.java b/src/main/org/openscience/cdk/ReactionScheme.java
@@ -25,7 +25,10 @@
 package org.openscience.cdk;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.interfaces.IReaction;
@@ -125,6 +128,18 @@ public Object clone() throws CloneNotSupportedException {
 		for (IReaction reaction : reactions()) {
 			clone.addReaction((IReaction)reaction.clone());
 		}
+        // clone the properties
+        if (getProperties() != null) {
+            Map<Object, Object> properties = getProperties();
+            Map<Object, Object> clonedHashtable = new HashMap<Object, Object>();
+            Iterator<Object> keys = properties.keySet().iterator();
+            while (keys.hasNext()) {
+                Object key = keys.next();
+                Object value = properties.get(key);
+                clonedHashtable.put(key, value);
+            }
+            clone.setProperties(clonedHashtable);
+        }
 
 		return clone;
 	}

diff --git a/src/main/org/openscience/cdk/silent/ReactionScheme.java b/src/main/org/openscience/cdk/silent/ReactionScheme.java
@@ -19,7 +19,10 @@
 package org.openscience.cdk.silent;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.openscience.cdk.annotations.TestMethod;
 import org.openscience.cdk.interfaces.IReaction;
@@ -119,6 +122,18 @@ public Object clone() throws CloneNotSupportedException {
 		for (IReaction reaction : reactions()) {
 			clone.addReaction((IReaction)reaction.clone());
 		}
+        // clone the properties
+        if (getProperties() != null) {
+            Map<Object, Object> properties = getProperties();
+            Map<Object, Object> clonedHashtable = new HashMap<Object, Object>();
+            Iterator<Object> keys = properties.keySet().iterator();
+            while (keys.hasNext()) {
+                Object key = keys.next();
+                Object value = properties.get(key);
+                clonedHashtable.put(key, value);
+            }
+            clone.setProperties(clonedHashtable);
+        }
 
 		return clone;
 	}