Changeset 5206 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

Timestamp:

2012-04-29T22:23:26+02:00 (12 years ago)

Author:

bastiK

Message:

applied #7624 - Allow MapCSS to style right and left side casings differently (patch by cmuelle8)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (4 diffs)

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

@@ -311 +311 @@
                 addIfNotNull(sl, LinePatternElemStyle.create(env));
                 addIfNotNull(sl, LineElemStyle.createLine(env));
+                addIfNotNull(sl, LineElemStyle.createLeftCasing(env));
+                addIfNotNull(sl, LineElemStyle.createRightCasing(env));
                 addIfNotNull(sl, LineElemStyle.createCasing(env));
                 addIfNotNull(sl, LineTextElemStyle.create(env));
@@ -347 +349 @@
      */
     private boolean isDefaultNodes() {
-        if (defaultNodesIdx == cacheIdx) {
+        if (defaultNodesIdx == cacheIdx)
             return defaultNodes;
-        }
         defaultNodes = fromCanvas("default-points", true, Boolean.class);
         defaultNodesIdx = cacheIdx;
@@ -359 +360 @@
      */
     private boolean isDefaultLines() {
-        if (defaultLinesIdx == cacheIdx) {
+        if (defaultLinesIdx == cacheIdx)
             return defaultLines;
-        }
         defaultLines = fromCanvas("default-lines", true, Boolean.class);
         defaultLinesIdx = cacheIdx;
@@ -420 +420 @@
      */
     public static AreaElemStyle getAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
-        if (MapPaintStyles.getStyles() == null) {
+        if (MapPaintStyles.getStyles() == null)
             return null;
-        }
         for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, null, pretendWayIsClosed).a) {
-            if (s instanceof AreaElemStyle) {
+            if (s instanceof AreaElemStyle)
                 return (AreaElemStyle) s;
-            }
         }
         return null;