Update to revised CSS specs for obtaining and changing propertiesv20120312-1221I20120312-1730I20120312-1200I20120312-0840

2 files changed, 9 insertions, 17 deletions

diff --git a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertiesContentProvider.java b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertiesContentProvider.java
index 8cc77280..7463dd00 100644
--- a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertiesContentProvider.java
+++ b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertiesContentProvider.java
@@ -11,12 +11,10 @@
 package org.eclipse.e4.tools.css.spy;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 
 import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler;
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
@@ -43,14 +41,11 @@ public class CSSPropertiesContentProvider implements IStructuredContentProvider
     }
 
     public Object[] getElements(Object inputElement) {
-		Map<String, ICSSPropertyHandler> handlerMap = cssEngine
-				.getCSSPropertyHandlers(input);
-        if (handlerMap == null) {
-            return null;
-        }
-        List<CSSPropertyProvider> properties = new ArrayList<CSSPropertyProvider>(handlerMap.size());
-        for (Entry<String, ICSSPropertyHandler> entry : handlerMap.entrySet()) {
-            properties.add(new CSSPropertyProvider(entry.getKey(), input, entry.getValue(), cssEngine));
+		Collection<String> propertyNames = cssEngine.getCSSProperties(input);
+		List<CSSPropertyProvider> properties = new ArrayList<CSSPropertyProvider>(
+				propertyNames.size());
+		for (String propertyName : propertyNames) {
+            properties.add(new CSSPropertyProvider(propertyName, input, cssEngine));
         }
         return properties.toArray();
     }
diff --git a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertyProvider.java b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertyProvider.java
index ffca1dda..fbc12b46 100644
--- a/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertyProvider.java
+++ b/bundles/org.eclipse.e4.tools.css.spy/src/org/eclipse/e4/tools/css/spy/CSSPropertyProvider.java
@@ -11,7 +11,6 @@
 package org.eclipse.e4.tools.css.spy;
 
 import org.eclipse.e4.ui.css.core.dom.CSSStylableElement;
-import org.eclipse.e4.ui.css.core.dom.properties.ICSSPropertyHandler;
 import org.eclipse.e4.ui.css.core.engine.CSSEngine;
 import org.w3c.dom.css.CSSValue;
 
@@ -22,14 +21,12 @@ public class CSSPropertyProvider {
 
 	private String propertyName;
 	private CSSStylableElement element;
-	private ICSSPropertyHandler handler;
 	private CSSEngine engine;
 
 	public CSSPropertyProvider(String propertyName, CSSStylableElement element,
-			ICSSPropertyHandler handler, CSSEngine engine) {
+			CSSEngine engine) {
 		this.propertyName = propertyName;
 		this.element = element;
-		this.handler = handler;
 		this.engine = engine;
 	}
 
@@ -38,12 +35,12 @@ public class CSSPropertyProvider {
 	}
 
 	public String getValue() throws Exception {
-		return handler.retrieveCSSProperty(element, propertyName, "", engine);
+		return engine.retrieveCSSProperty(element, propertyName, "");
 	}
 
 	public void setValue(String value) throws Exception {
 		CSSValue v = engine.parsePropertyValue(value);
-		handler.applyCSSProperty(element, propertyName, v, "", engine);
+		engine.applyCSSProperty(element, propertyName, v, "");
 	}