Changeset 6561 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-29T12:43:55+01:00 (11 years ago)

Author:

simon04

Message:

see #9485 - MapCSS: add support for set .class_name instruction (with optional . before class), define Range.ZERO_TO_INFINITY

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• MultiCascade.java (modified) (1 diff)
• Range.java (modified) (2 diffs)
• mapcss/MapCSSParser.jj (modified) (1 diff)
• mapcss/Selector.java (modified) (3 diffs)
• xml/AreaPrototype.java (modified) (1 diff)
• xml/IconPrototype.java (modified) (1 diff)
• xml/LinePrototype.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java

@@ -21 +21 @@
     public MultiCascade() {
         layers = new HashMap<String, Cascade>();
-        range = new Range();
+        range = Range.ZERO_TO_INFINITY;
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/Range.java

@@ -11 +11 @@
     private double upper;
 
-    public Range() {
-        this.lower = 0;
-        this.upper = Double.POSITIVE_INFINITY;
-    }
+    public static final Range ZERO_TO_INFINITY = new Range(0.0, Double.POSITIVE_INFINITY);
 
     public Range(double lower, double upper) {
@@ -77 +74 @@
         return String.format("|s%s-%s", lower, upper);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Range range = (Range) o;
+
+        if (Double.compare(range.lower, lower) != 0) return false;
+        if (Double.compare(range.upper, upper) != 0) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        long temp;
+        temp = Double.doubleToLongBits(lower);
+        result = (int) (temp ^ (temp >>> 32));
+        temp = Double.doubleToLongBits(upper);
+        result = 31 * result + (int) (temp ^ (temp >>> 32));
+        return result;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

@@ -463 +463 @@
     (
         (
-        <SET> w() key=<IDENT> w()
-        ( <EQUAL> val=expression() )?
-        { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val)); }
-        ( <RBRACE> { return ins; } | <SEMICOLON> w() )
+            <SET> w()
+            (<FULLSTOP>)? // specification allows "set .class" to set "class". we also support "set class"
+            key=<IDENT> w()
+            ( <EQUAL> val=expression() )?
+            { ins.add(new Instruction.AssignmentInstruction(key.image, val == null ? true : val)); }
+            ( <RBRACE> { return ins; } | <SEMICOLON> w() )
         )
-        |
+    |
         key=<IDENT> w() <COLON> w()
         (

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

@@ -267 +267 @@
 
     public static class GeneralSelector extends AbstractSelector {
-        private String base;
-        public Range range;
-        private String subpart;
+        public final String base;
+        public final Range range;
+        public final String subpart;
 
         public GeneralSelector(String base, Pair<Integer, Integer> zoom, List<Condition> conds, String subpart) {
@@ -279 +279 @@
                 if (a <= b) {
                     range = fromLevel(a, b);
-                }
-            }
-            if (range == null) {
-                range = new Range();
+                } else {
+                    range = Range.ZERO_TO_INFINITY;
+                }
+            } else {
+                range = Range.ZERO_TO_INFINITY;
             }
             this.subpart = subpart;
@@ -348 +349 @@
         @Override
         public String toString() {
-            return base + (range == null ? "" : range) + Utils.join("", conds) + (subpart != null ? ("::" + subpart) : "");
+            return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + Utils.join("", conds) + (subpart != null ? ("::" + subpart) : "");
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/AreaPrototype.java

@@ -23 +23 @@
     {
         priority = 0;
-        range = new Range();
+        range = Range.ZERO_TO_INFINITY;
         closed = false;
         color = null;

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/IconPrototype.java

@@ -22 +22 @@
     public void init() {
         priority = 0;
-        range = new Range();
+        range = Range.ZERO_TO_INFINITY;
         icon = null;
         annotate = null;

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/LinePrototype.java

@@ -35 +35 @@
     {
         priority = 0;
-        range = new Range();
+        range = Range.ZERO_TO_INFINITY;
         width = -1;
         realWidth = null;