Changeset 15983 in josm

Timestamp:

2020-03-01T23:35:55+01:00 (5 years ago)

Author:

simon04

Message:

see #18802 - Extract org.openstreetmap.josm.gui.mappaint.mapcss.Declaration

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/Declaration.java (added)
• gui/mappaint/mapcss/Instruction.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSParser.jj (modified) (2 diffs)
• gui/mappaint/mapcss/MapCSSRule.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.mappaint.MultiCascade;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Declaration;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Expression;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule.Declaration;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource.MapCSSRuleIndex;

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

@@ -16 +16 @@
  * For example a simple assignment like <code>width: 3;</code>, but may also
  * be a set instruction (<code>set highway;</code>).
- * A MapCSS {@link MapCSSRule.Declaration} is a list of instructions.
+ * A MapCSS {@link Declaration} is a list of instructions.
  */
 @FunctionalInterface

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.KeyMatchType;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.Op;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Declaration;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Expression;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory;
@@ -33 +34 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSException;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSRule.Declaration;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
-import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.openstreetmap.josm.gui.mappaint.Environment;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -27 +23 @@
      */
     public final Declaration declaration;
-
-    /**
-     * A declaration is a set of {@link Instruction}s
-     */
-    public static class Declaration {
-        /**
-         * The instructions in this declaration
-         */
-        public final List<Instruction> instructions;
-        /**
-         * The index of this declaration
-         * <p>
-         * declarations in the StyleSource are numbered consecutively
-         */
-        public final int idx;
-
-        /**
-         * Create a new {@link Declaration}
-         * @param instructions The instructions for this dectlaration
-         * @param idx The index in the {@link StyleSource}
-         */
-        public Declaration(List<Instruction> instructions, int idx) {
-            this.instructions = Utils.toUnmodifiableList(instructions);
-            this.idx = idx;
-        }
-
-        /**
-         * <p>Executes the instructions against the environment {@code env}</p>
-         *
-         * @param env the environment
-         */
-        public void execute(Environment env) {
-            for (Instruction i : instructions) {
-                i.execute(env);
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(instructions, idx);
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) return true;
-            if (obj == null || getClass() != obj.getClass()) return false;
-            Declaration that = (Declaration) obj;
-            return idx == that.idx &&
-                    Objects.equals(instructions, that.instructions);
-        }
-
-        @Override
-        public String toString() {
-            return "Declaration [instructions=" + instructions + ", idx=" + idx + ']';
-        }
-    }
 
     /**