Merging api branch back to HEAD

2 files changed, 2 insertions, 20 deletions

diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java
index 0d1586053..7f888f7d2 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/ConfigData.java
@@ -22,23 +22,6 @@ import java.util.*;
  * @see Manipulator
  */
 public class ConfigData {
-
-	private static Properties appendProperties(Properties to, Properties from) {
-		if (from != null) {
-			if (to == null)
-				to = new Properties();
-			//			printoutProperties(System.out, "to", to);
-			//			printoutProperties(System.out, "from", from);
-
-			for (Enumeration enumeration = from.keys(); enumeration.hasMoreElements();) {
-				String key = (String) enumeration.nextElement();
-				to.setProperty(key, from.getProperty(key));
-			}
-		}
-		//		printoutProperties(System.out, "to", to);
-		return to;
-	}
-
 	final private String fwName;
 	final private String fwVersion;
 	final private String launcherName;
@@ -80,7 +63,7 @@ public class ConfigData {
 
 	public Properties getProperties() {
 		Properties ret = new Properties();
-		appendProperties(ret, properties);
+		ret.putAll(properties);
 		return ret;
 	}
 
@@ -142,7 +125,7 @@ public class ConfigData {
 
 	public void setProperties(Properties props) {
 		properties.clear();
-		appendProperties(properties, props);
+		properties.putAll(props);
 	}
 
 	public void setInitialBundleStartLevel(int startLevel) {
diff --git a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java
index 303290b8e..4159132bd 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin/src/org/eclipse/equinox/internal/provisional/frameworkadmin/Manipulator.java
@@ -12,7 +12,6 @@ package org.eclipse.equinox.internal.provisional.frameworkadmin;
 
 import java.io.File;
 import java.io.IOException;
-
 import org.eclipse.equinox.internal.provisional.configuratormanipulator.ConfiguratorManipulator;
 
 /**