From 672aef6799d4c3c5172ddec427f65cf238c683ce Mon Sep 17 00:00:00 2001
From: bancika <bancika@813357f0-ed8a-11de-91ba-91c70a792394>
Date: Sun, 9 Jan 2011 00:42:00 +0000
Subject: [PATCH]

---
 .../src/org/diylc/presenter/Presenter.java    | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java
index 600f1950..9ecdf24f 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java	
@@ -58,7 +58,7 @@ public class Presenter implements IPlugInPort {
 	private static final Logger LOG = Logger.getLogger(Presenter.class);
 
 	public static final VersionNumber CURRENT_VERSION = new VersionNumber(0, 0, 0);
-	public static final String DEFAULTS_KEY = "defaults";
+	public static final String DEFAULTS_KEY = "default.";
 	public static final String METRIC_KEY = "metric";
 
 	public static final int CONTROL_POINT_SENSITIVITY = 4;
@@ -642,16 +642,11 @@ public class Presenter implements IPlugInPort {
 	@Override
 	public void setDefaultPropertyValue(String propertyName, Object value) {
 		LOG.debug(String.format("setDefaultPropertyValue(%s, %s)", propertyName, value));
-		Map<String, Object> defaultMap = (Map<String, Object>) ConfigurationManager.getInstance()
-				.getConfigurationItem(DEFAULTS_KEY);
-		if (defaultMap == null) {
-			defaultMap = new HashMap<String, Object>();
-			ConfigurationManager.getInstance().setConfigurationItem(DEFAULTS_KEY, defaultMap);
-		}
 		for (IDIYComponent component : selectedComponents) {
 			String className = component.getClass().getName();
 			LOG.debug("Default property value set for " + className + ":" + propertyName);
-			defaultMap.put(className + ":" + propertyName, value);
+			ConfigurationManager.getInstance().setConfigurationItem(
+					DEFAULTS_KEY + className + ":" + propertyName, value);
 		}
 	}
 
@@ -672,10 +667,7 @@ public class Presenter implements IPlugInPort {
 		for (IDIYComponent<?> component : selectedComponents) {
 			Area componentArea = componentAreaMap.get(component);
 			if (componentArea != null) {
-				LOG.warn("Area added!" + componentArea.getBounds());
 				area.add(componentArea);
-			} else {
-				LOG.warn("No area!");
 			}
 		}
 		double width = area.getBounds2D().getWidth();
@@ -758,13 +750,9 @@ public class Presenter implements IPlugInPort {
 				componentType.getInstanceClass());
 		// Override with default values if available.
 		for (PropertyWrapper property : properties) {
-			Object defaultValue = null;
-			Map<String, Object> defaultMap = (Map<String, Object>) ConfigurationManager
-					.getInstance().getConfigurationItem(DEFAULTS_KEY);
-			if (defaultMap != null) {
-				defaultValue = defaultMap.get(componentType.getInstanceClass().getName() + ":"
-						+ property.getName());
-			}
+			Object defaultValue = ConfigurationManager.getInstance().getConfigurationItem(
+					DEFAULTS_KEY + componentType.getInstanceClass().getName() + ":"
+							+ property.getName());
 			if (defaultValue != null) {
 				property.setValue(cloner.deepClone(defaultValue));
 				property.writeTo(component);