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

Timestamp:

2016-07-23T18:46:45+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - sonar - squid:S1604 - Java 8: Anonymous inner classes containing only one method should become lambdas

Location:

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

Files:

• ElemStyles.java (modified) (1 diff)
• MapPaintStyles.java (modified) (1 diff)
• mapcss/ExpressionFactory.java (modified) (3 diffs)
• styleelement/MapImage.java (modified) (1 diff)

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

@@ -59 +59 @@
     public void clearCached() {
         // run in EDT to make sure this isn't called during rendering run
-        GuiHelper.runInEDT(new Runnable() {
-            @Override
-            public void run() {
-                cacheIdx++;
-                preferenceCache.clear();
-            }
+        GuiHelper.runInEDT(() -> {
+            cacheIdx++;
+            preferenceCache.clear();
         });
     }

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

@@ -365 +365 @@
         @Override
         protected void finish() {
-            SwingUtilities.invokeLater(new Runnable() {
-                @Override
-                public void run() {
-                    fireMapPaintSylesUpdated();
-                    styles.clearCached();
-                    if (Main.isDisplayingMapView()) {
-                        Main.map.mapView.preferenceChanged(null);
-                        Main.map.mapView.repaint();
-                    }
+            SwingUtilities.invokeLater(() -> {
+                fireMapPaintSylesUpdated();
+                styles.clearCached();
+                if (Main.isDisplayingMapView()) {
+                    Main.map.mapView.preferenceChanged(null);
+                    Main.map.mapView.repaint();
                 }
             });

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

@@ -39 +39 @@
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.Utils.Function;
 
 /**
@@ -1127 +1128 @@
 
         public Float aggregateList(List<?> lst) {
-            final List<Float> floats = Utils.transform(lst, new Utils.Function<Object, Float>() {
-                @Override
-                public Float apply(Object x) {
-                    return Cascade.convertTo(x, float.class);
-                }
-            });
+            final List<Float> floats = Utils.transform(lst, (Function<Object, Float>) x -> Cascade.convertTo(x, float.class));
             final Collection<Float> nonNullList = Utils.filter(floats, Predicates.not(Predicates.isNull()));
             return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
@@ -1141 +1137 @@
             List<?> l = Cascade.convertTo(args.get(0).evaluate(env), List.class);
             if (args.size() != 1 || l == null)
-                l = Utils.transform(args, new Utils.Function<Expression, Object>() {
-                    @Override
-                    public Object apply(Expression x) {
-                        return x.evaluate(env);
-                    }
-                });
+                l = Utils.transform(args, (Function<Expression, Object>) x -> x.evaluate(env));
             return aggregateList(l);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/MapImage.java

@@ -99 +99 @@
                 .setHeight(height)
                 .setOptional(true)
-                .getInBackground(new ImageCallback() {
-                    @Override
-                    public void finished(ImageIcon result) {
-                        synchronized (MapImage.this) {
-                            if (result == null) {
-                                source.logWarning(tr("Failed to locate image ''{0}''", name));
-                                ImageIcon noIcon = MapPaintStyles.getNoIcon_Icon(source);
-                                img = noIcon == null ? null : (BufferedImage) noIcon.getImage();
-                            } else {
-                                img = (BufferedImage) rescale(result.getImage());
-                            }
-                            if (temporary) {
-                                disabledImgCache = null;
-                                Main.map.mapView.preferenceChanged(null); // otherwise repaint is ignored, because layer hasn't changed
-                                Main.map.mapView.repaint();
-                            }
-                            temporary = false;
+                .getInBackground((ImageCallback) result -> {
+                    synchronized (MapImage.this) {
+                        if (result == null) {
+                            source.logWarning(tr("Failed to locate image ''{0}''", name));
+                            ImageIcon noIcon = MapPaintStyles.getNoIcon_Icon(source);
+                            img = noIcon == null ? null : (BufferedImage) noIcon.getImage();
+                        } else {
+                            img = (BufferedImage) rescale(result.getImage());
                         }
+                        if (temporary) {
+                            disabledImgCache = null;
+                            Main.map.mapView.preferenceChanged(null); // otherwise repaint is ignored, because layer hasn't changed
+                            Main.map.mapView.repaint();
+                        }
+                        temporary = false;
                     }
                 }