Changeset 4007 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java

Timestamp:

2011-03-27T13:41:58+02:00 (15 years ago)

Author:

bastiK

Message:

see #6150 mapcss - extended functionality for instruction text: ... (patch by Gubaer)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Expression.java

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
 import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 
 public interface Expression {
-
     public Object evaluate(Environment env);
 
@@ -27 +29 @@
         Object literal;
 
-        public LiteralExpression(Object lit) {
-            this.literal = lit;
+        public LiteralExpression(Object literal) {
+            CheckParameterUtil.ensureParameterNotNull(literal);
+            this.literal = literal;
         }
 
@@ -38 +41 @@
         @Override
         public String toString() {
-            if (literal == null)
-                return "Lit{<null>}";
             if (literal instanceof float[])
                 return Arrays.toString((float[]) literal);
@@ -47 +48 @@
 
     public static class FunctionExpression implements Expression {
+        //static Logger logger = Logger.getLogger(FunctionExpression.class.getName());
+
         String name;
         List<Expression> args;
@@ -73 +76 @@
                 if (args.length == 0)
                     return 0f;
-                if (args.length == 1) { // unary minus
+                if (args.length == 1)
                     return -args[0];
-                }
                 float res = args[0];
                 for (int i=1; i<args.length; ++i) {
@@ -160 +162 @@
             }
 
-            public String get_tag_value(String key) {
+            public String tag(String key) {
                 return env.osm.get(key);
+            }
+
+            // FIXME: respect parent selector chain
+            public String parent_tag(String key) {
+                for (Relation parent: OsmPrimitive.getFilteredList(env.osm.getReferrers(), Relation.class)) {
+                    String value = parent.get(key);
+                    if (value != null) return value;
+                }
+                return null;
             }
 
@@ -286 +297 @@
             }
             for (Method m : allMethods) {
-                if (!m.getName().equals(name))
+                if (!m.getName().equals(name)) {
                     continue;
+                }
                 Class<?>[] expectedParameterTypes = m.getParameterTypes();
                 Object[] convertedArgs = new Object[expectedParameterTypes.length];
@@ -304 +316 @@
                     convertedArgs[0] = arrayArg;
                 } else {
-                    if (args.size() != expectedParameterTypes.length)
+                    if (args.size() != expectedParameterTypes.length) {
                         continue;
+                    }
                     for (int i=0; i<args.size(); ++i) {
                         convertedArgs[i] = Cascade.convertTo(args.get(i).evaluate(env), expectedParameterTypes[i]);