Changeset 2009 in josm for trunk/src/org

Timestamp:

2009-08-30T15:57:46+02:00 (15 years ago)

Author:

Gubaer

Message:

applied #2595: patch by plaicy: Draw Mode: Click-to-Select fails under certain conditions
clean up for @deprecated OptionPaneUtil

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -136 +135 @@
                         default:
                             Main.map.mapView.setCursor(cursorCrosshair);
-                        break;
+                            break;
                     }
                 }
@@ -340 +339 @@
         if (n != null) {
             // user clicked on node
-            if (selection.isEmpty()) {
+            if (selection.isEmpty() || wayIsFinished) {
                 // select the clicked node and do nothing else
                 // (this is just a convenience option so that people don't
@@ -355 +354 @@
             n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY()));
             if (n.getCoor().isOutSideWorld()) {
-                OptionPaneUtil.showMessageDialog(
+                JOptionPane.showMessageDialog(
                         Main.parent,
                         tr("Cannot add a node outside of the world."),
@@ -855 +854 @@
             default:
                 EastNorth P = n.getEastNorth();
-            seg = segs.iterator().next();
-            A = seg.a.getEastNorth();
-            B = seg.b.getEastNorth();
-            double a = P.distanceSq(B);
-            double b = P.distanceSq(A);
-            double c = A.distanceSq(B);
-            q = (a - b + c) / (2*c);
-            n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
+                seg = segs.iterator().next();
+                A = seg.a.getEastNorth();
+                B = seg.b.getEastNorth();
+                double a = P.distanceSq(B);
+                double b = P.distanceSq(A);
+                double c = A.distanceSq(B);
+                q = (a - b + c) / (2*c);
+                n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
         }
     }