Changeset 15719 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2020-01-18T14:14:04+01:00 (4 years ago)

Author:

simon04

Message:

Java 8: deprecate Utils.exists, Utils.find

File:

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

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

@@ -41 +41 @@
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -194 +193 @@
             }
             if (!hasProperLineStyle) {
-                AreaElement area = Utils.find(p.a, AreaElement.class);
-                LineElement line = area == null ? LineElement.UNTAGGED_WAY : LineElement.createSimpleLineStyle(area.color, true);
+                LineElement line = LineElement.UNTAGGED_WAY;
+                for (StyleElement element : p.a) {
+                    if (element instanceof AreaElement) {
+                        line = LineElement.createSimpleLineStyle(((AreaElement) element).color, true);
+                        break;
+                    }
+                }
                 p.a = new StyleElementList(p.a, line);
             }
@@ -288 +292 @@
                             break;
                         } else if (wayColor == null && isDefaultLines()) {
-                            AreaElement mpArea = Utils.find(mpElemStyles.a, AreaElement.class);
-                            if (mpArea != null) {
-                                wayColor = mpArea.color;
+                            for (StyleElement element : mpElemStyles.a) {
+                                if (element instanceof AreaElement) {
+                                    wayColor = ((AreaElement) element).color;
+                                    break;
+                                }
                             }
                         }