Changeset 32920 in osm for applications/editors/josm

Timestamp:

2016-09-03T22:06:48+02:00 (8 years ago)

Author:

donvip

Message:

fix error-prone warnings

Location:

applications/editors/josm/plugins/alignways

Files:

• .settings/org.eclipse.jdt.ui.prefs (added)
• src/com/tilusnet/josm/plugins/alignways/AlignWaysAlgnSegment.java (modified) (6 diffs)
• src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java (modified) (4 diffs)
• src/com/tilusnet/josm/plugins/alignways/AlignWaysSegment.java (modified) (3 diffs)
• src/com/tilusnet/josm/plugins/alignways/AlignWaysWhatsNewPanel.java (modified) (5 diffs)
• src/com/tilusnet/josm/plugins/alignways/geometry/AlignWaysGeomLine.java (modified) (5 diffs)

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAlgnSegment.java

@@ -26 +26 @@
 /**
  * @author tilusnet <tilusnet@gmail.com>
- * 
+ *
  * The segment to be aligned to the reference segment. Actions it can do:
  *         - remember its selected pivot point
@@ -32 +32 @@
  *         - rotate itself
  *         - paint itself and its selected pivot point
- * 
+ *
  */
 public class AlignWaysAlgnSegment extends AlignWaysSegment {
@@ -109 +109 @@
      * Returns the EastNorth of the specified pivot point pp. It always returns
      * up-to-date data from dataset. Assumes segment is not null.
-     * 
+     *
      * @param pp
      *            The pivot location
@@ -177 +177 @@
      * Given a Node (usually an endpoint), it will return a collection of way segments that are adjacently
      * connected to it. The current alignee waysegment is not added to the collection.
-     * 
+     *
      * @param node The Node (endpoint) to analyse.
      * @return The collection of the adjacent waysegments.
@@ -194 +194 @@
             Point pnew = new Point();
             pnew.setLocation(x, y);
-            WaySegment ws = Main.map.mapView.getNearestWaySegment(pnew, OsmPrimitive.isUsablePredicate);
+            WaySegment ws = Main.map.mapView.getNearestWaySegment(pnew, OsmPrimitive::isUsable);
             if (ws != null &&  !ws.equals(this.segment) &&
                     (ws.getFirstNode().equals(node) || ws.getSecondNode().equals(node))) {
@@ -211 +211 @@
      * The node is normally a valid endpoint of the segment.
      * If it isn't, null may be returned.
-     * 
+     *
      * @param node The (endpoint) node.
      * @return Collection of the adjacent way segments.

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java

@@ -1 +1 @@
 /**
- * 
+ *
  */
 package com.tilusnet.josm.plugins.alignways;
@@ -29 +29 @@
  * @author tilusnet <tilusnet@gmail.com>
  * Handles the state machine and user interaction (mouse clicks).
- * 
+ *
  */
 public class AlignWaysMode extends MapMode /* implements MapViewPaintable */{
@@ -209 +209 @@
 
         Main.pref.put("alignways.showtips", !atp.isChkBoxSelected());
-
-    }
-
+    }
 
     private void showWhatsNew() {
@@ -226 +224 @@
         wnDialog.dispose();
 
-        Main.pref.put("alignways.majorver", new Integer(AlignWaysPlugin.AlignWaysMajorVersion).toString());
-
+        Main.pref.put("alignways.majorver", Integer.toString(AlignWaysPlugin.AlignWaysMajorVersion));
     }
 

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysSegment.java

@@ -1 +1 @@
 /**
- * 
+ *
  */
 package com.tilusnet.josm.plugins.alignways;
@@ -23 +23 @@
 /**
  * @author tilusnet <tilusnet@gmail.com>
- * 
+ *
  */
 public class AlignWaysSegment implements MapViewPaintable {
@@ -60 +60 @@
             segmentEndPoints.add(node1);
             segmentEndPoints.add(node2);
-
         }
     }
 
     protected WaySegment getNearestWaySegment(Point p) {
-
-        return mapview.getNearestWaySegment(p, OsmPrimitive.isUsablePredicate);
-
+        return mapview.getNearestWaySegment(p, OsmPrimitive::isUsable);
     }
 

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysWhatsNewPanel.java

@@ -1 +1 @@
 /**
- * 
+ *
  */
 package com.tilusnet.josm.plugins.alignways;
@@ -46 +46 @@
         newItem2 = new javax.swing.JLabel();
 
-        lblWhatsNew.setText("<html><div style=\"font-family: sans-serif; font-weight: bold; font-style: italic;\"><span style=\"font-size: large;\"><span style=\"font-size: x-large;\">" 
-                            + tr("What''s new...") 
+        lblWhatsNew.setText("<html><div style=\"font-family: sans-serif; font-weight: bold; font-style: italic;\"><span style=\"font-size: large;\"><span style=\"font-size: x-large;\">"
+                            + tr("What''s new...")
                             + "</span></div></html>");
 
@@ -53 +53 @@
 
         newItem1.setText("<html><div style=\"font-family: sans-serif;\"><ul style=\"margin-left: 20px;\"><li>"
-                         + tr("Added <b>angle preserving</b> aligning mode") 
+                         + tr("Added <b>angle preserving</b> aligning mode")
                          + "</li></ul></div></html>");
 
@@ -67 +67 @@
         btnHelpItem1.setPreferredSize(new java.awt.Dimension(69, 25));
         btnHelpItem1.addActionListener(new java.awt.event.ActionListener() {
+            @Override
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 btnHelpItem1ActionPerformed(evt);
@@ -136 +137 @@
           } catch (URISyntaxException ex) {
                 Logger.getLogger(AlignWaysWhatsNewPanel.class.getName()).log(Level.SEVERE, null, ex);
-          } catch (IOException e) { 
+          } catch (IOException e) {
               JOptionPane.showMessageDialog(this, e, tr("Errr..."), JOptionPane.WARNING_MESSAGE);
           }
-        } else { 
+        } else {
              JOptionPane.showMessageDialog(this, tr("Browser not supported."), tr("Errr..."), JOptionPane.WARNING_MESSAGE);
         }
     }
-    
+
     /*** End of Matisse generated code section ***/
 

applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/geometry/AlignWaysGeomLine.java

@@ -1 +1 @@
 package com.tilusnet.josm.plugins.alignways.geometry;
 
+import java.util.Objects;
 
 /**
@@ -131 +132 @@
     /**
      * Get the Y coordinate on the line of a point with the given X coordinate.
-     * 
-     * @param X The x-coordinate of the given point.
+     *
+     * @param x The x-coordinate of the given point.
      * @return The calculated y-coordinate or Double.NaN if the line is vertical.
      */
-    public Double getYonLine(double X) {
-
-        Double Y = new Double((-coef_a*X - coef_c)/coef_b);
-
-        if (Y.isInfinite() || Y.isNaN())
+    public Double getYonLine(double x) {
+
+        Double y = Double.valueOf((-coef_a*x - coef_c)/coef_b);
+
+        if (y.isInfinite() || y.isNaN())
             // Vertical line
             return Double.NaN;
         else
-            return Y;
-
-    }
-
+            return y;
+    }
 
     /**
      * Get the X coordinate on the line of a point with the given Y coordinate.
-     * 
-     * @param Y The y-coordinate of the given point.
+     *
+     * @param y The y-coordinate of the given point.
      * @return The calculated x-coordinate or Double.NaN if the line is horizontal.
      */
-    public Double getXonLine(double Y) {
-
-        Double X = new Double((-coef_b*Y - coef_c)/coef_a);
-
-        if (X.isInfinite() || X.isNaN())
+    public Double getXonLine(double y) {
+
+        Double x = Double.valueOf((-coef_b*y - coef_c)/coef_a);
+
+        if (x.isInfinite() || x.isNaN())
             // Horizontal line
             return Double.NaN;
         else
-            return X;
-
+            return x;
     }
 
@@ -184 +182 @@
     }
 
+    @Override
+    public int hashCode() {
+        return Objects.hash(coef_a, coef_b, coef_c);
+    }
+
     public boolean isPointOnLine(AlignWaysGeomPoint awPt) {
         // Method:
@@ -189 +192 @@
         // 2. check getIntersectionStatus of the two lines
         // 3. if status is LINES_OVERLAP, the point os one the line, otherwise not
-        
+
         // Need an arbitrary point on this line; let it be (x, y)
         Double x = 0.0;
         Double y = getYonLine(x);
         if (y.isNaN()) y = 0.0;
-        
+
         AlignWaysGeomLine line2 = new AlignWaysGeomLine(awPt, new AlignWaysGeomPoint(x, y));
         getIntersection(line2);
@@ -201 +204 @@
         else
             return false;
-        
+
     }