Changeset 30631 in osm for applications/editors/josm

Timestamp:

2014-09-14T19:56:42+02:00 (10 years ago)

Author:

donvip

Message:

[josm_alignways] fix #josm7883 - IndexOutOfBoundsException when aligning segment with free node using Angle preservation

File:

• applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysCmdKeepAngles.java (modified) (10 diffs)

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

@@ -19 +19 @@
 import com.tilusnet.josm.plugins.alignways.geometry.AlignWaysGeomLine.IntersectionStatus;
 import com.tilusnet.josm.plugins.alignways.geometry.AlignWaysGeomPoint;
-
 
 /**
@@ -27 +26 @@
 public class AlignWaysCmdKeepAngles extends AlignWaysCmdKeepLength {
 
-    AlignableStatus alignableStatKeepAngles = AlignableStatus.ALGN_VALID;
+    private AlignableStatus alignableStatKeepAngles = AlignableStatus.ALGN_VALID;
 
     public AlignWaysCmdKeepAngles() {
-        super();
-
         // Now the calculatedNodes reflect the coordinates that we'd have
         // without preserving the angles, i.e. preserving the length.
@@ -48 +45 @@
         recalculateNodesAndValidate(lineKeepLength, nodeArr[0]);
         recalculateNodesAndValidate(lineKeepLength, nodeArr[1]);
-
-    }
-
-
-    void recalculateNodesAndValidate(AlignWaysGeomLine alignedLineKeepLength, Node endpoint) {
+    }
+
+    private void recalculateNodesAndValidate(AlignWaysGeomLine alignedLineKeepLength, Node endpoint) {
 
         if (endpoint.getEastNorth().equals(pivot)) {
@@ -60 +55 @@
         
         ArrayList<WaySegment> alws = algnSeg.getAdjacentWaySegments(endpoint);
-        if (alws.size() <= 2) {
+        int alwsSize = alws.size();
+        if (0 < alwsSize && alwsSize <= 2) {
             // We need the intersection point of
             //  - the alignee following the keep length rule
@@ -70 +66 @@
             EastNorth enAdjOther2 = null;
 
-            if (alws.size() == 2) {
+            if (alwsSize == 2) {
                 adjOther2 = getNonEqualNode(alws.get(1), endpoint);
                 enAdjOther2 = adjOther2.getEastNorth();
@@ -106 +102 @@
             // triggers complications.
             // TODO - find a solution
-            if (alws.size() == 2 && enIsectPt != null) {
+            if (alwsSize == 2 && enIsectPt != null) {
                 int middlePtIdx = AlignWaysGeomPoint.getMiddleOf3(
                         new AlignWaysGeomPoint(enIsectPt), 
@@ -155 +151 @@
             alignableStatKeepAngles = AlignableStatus.ALGN_INV_TOOMANY_CONNECTED_WS;
         }
-
-    }
-
+    }
 
     private boolean isEnSetCollinear(ArrayList<EastNorth> enAdjPts) {
@@ -169 +163 @@
         return AlignWaysGeomPoint.isSetCollinear(awAdjPts);
     }
-
 
     private Node getNonEqualNode(WaySegment waySegment, Node endpoint) {
@@ -179 +172 @@
             return null;
     }
-
 
     /**
@@ -222 +214 @@
                 JOptionPane.WARNING_MESSAGE
                 );
-
-    }
-
+    }
 
     /**