Changeset 18801 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2023-08-09T15:30:01+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22832: Code cleanup and some simplification, documentation fixes (patch by gaben)

There should not be any functional changes in this patch; it is intended to do
the following:

• Simplify and cleanup code (example: Arrays.asList(item) -> Collections.singletonList(item))
• Fix typos in documentation (which also corrects the documentation to match what actually happens, in some cases)

Location:

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

Files:

• ConditionFactory.java (modified) (2 diffs)
• MapCSSParser.jj (modified) (2 diffs)
• MapCSSStyleIndex.java (modified) (1 diff)

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

@@ -212 +212 @@
         /**
          * Create a new float operation that compares two float values
-         * @param comparatorResult A function to mapt the result of the comparison
+         * @param comparatorResult A function to map the result of the comparison
          */
         Op(IntFunction<Boolean> comparatorResult) {
@@ -830 +830 @@
          */
         static boolean unclosed_multipolygon(Environment e) {
-            return e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon() &&
+            return e.osm instanceof Relation && e.osm.isMultipolygon() &&
                     !e.osm.isIncomplete() && !((Relation) e.osm).hasIncompleteMembers() &&
                     !MultipolygonCache.getInstance().get((Relation) e.osm).getOpenEnds().isEmpty();

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

@@ -712 +712 @@
 {
     boolean not = false;
-    KeyMatchType matchType = null;;
+    KeyMatchType matchType = null;
     String key;
 }
@@ -733 +733 @@
     float f;
     int i;
-    KeyMatchType matchType = null;;
+    KeyMatchType matchType = null;
     Op op;
     boolean considerValAsKey = false;

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

@@ -149 +149 @@
             }
         } else if (p instanceof IRelation) {
-            if (((IRelation<?>) p).isMultipolygon()) {
+            if (p.isMultipolygon()) {
                 return multipolygonRules;
             } else if (p.hasKey("#canvas")) {