Changeset 32917 in osm for applications/editors/josm/plugins/splinex/src/org

Timestamp:

2016-09-03T21:48:17+02:00 (8 years ago)

Author:

donvip

Message:

fix error-prone warnings

Location:

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex

Files:

• DrawSplineAction.java (modified) (6 diffs)
• Spline.java (modified) (3 diffs)

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/DrawSplineAction.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
+import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -105 +106 @@
     @Override
     protected void readPreferences() {
-        rubberLineColor = Main.pref.getColor(marktr("helper line"), null);
+        rubberLineColor = new ColorProperty(marktr("helper line"), (Color) null).get();
         if (rubberLineColor == null)
             rubberLineColor = PaintColors.SELECTED.get();
@@ -215 +216 @@
         boolean existing = false;
         if (!ctrl) {
-            n = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive.isUsablePredicate);
+            n = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive::isUsable);
             existing = true;
         }
@@ -278 +279 @@
         } else {
             if (dragControl) {
-                Main.main.undoRedo.add(spl.new EditSplineCommand(ph.sn));
+                Main.main.undoRedo.add(new Spline.EditSplineCommand(ph.sn));
                 dragControl = false;
             }
@@ -312 +313 @@
                 Node n = null;
                 if (!ctrl)
-                    n = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive.isUsablePredicate);
+                    n = Main.map.mapView.getNearestNode(e.getPoint(), OsmPrimitive::isUsable);
                 if (n == null) {
                     redraw = removeHighlighting();
@@ -396 +397 @@
     }
 
-    public class BackSpaceAction extends AbstractAction {
+    public static class BackSpaceAction extends AbstractAction {
         @Override
         public void actionPerformed(ActionEvent e) {

applications/editors/josm/plugins/splinex/src/org/openstreetmap/josm/plugins/Splinex/Spline.java

@@ -18 +18 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.swing.Icon;
@@ -187 +188 @@
             PointHandle o = (PointHandle) other;
             return this.sn == o.sn && this.point == o.point;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(sn, point);
         }
     }
@@ -406 +412 @@
     }
 
-    public class EditSplineCommand extends Command {
+    public static class EditSplineCommand extends Command {
         EastNorth cprev;
         EastNorth cnext;