Changeset 9245 in josm for trunk/src/org

Timestamp:

2016-01-01T20:25:44+01:00 (8 years ago)

Author:

simon04

Message:

fix #12101 - Possibility to create a duplicate way with split dialog

File:

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

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -19 +19 @@
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.swing.DefaultListCellRenderer;
@@ -132 +133 @@
     public void actionPerformed(ActionEvent e) {
 
+        if (SegmentToKeepSelectionDialog.DISPLAY_COUNT.get() > 0) {
+            new Notification(tr("Cannot split since another split operation is already in progress"))
+                    .setIcon(JOptionPane.WARNING_MESSAGE).show();
+            return;
+        }
+
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 
@@ -216 +223 @@
      */
     static class SegmentToKeepSelectionDialog extends ExtendedDialog {
+        static final AtomicInteger DISPLAY_COUNT = new AtomicInteger();
         final Way selectedWay;
         final List<Way> newWays;
@@ -238 +246 @@
             pane.add(list, GBC.eop().fill(GBC.HORIZONTAL));
             setContent(pane);
+            setDefaultCloseOperation(HIDE_ON_CLOSE);
         }
 
@@ -283 +292 @@
             super.setVisible(visible);
             if (visible) {
+                DISPLAY_COUNT.incrementAndGet();
                 list.setSelectedValue(wayToKeep, true);
             } else {
                 setHighlightedWaySegments(Collections.<WaySegment>emptyList());
+                DISPLAY_COUNT.decrementAndGet();
             }
         }