Changeset 3392 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2010-07-29T08:22:51+02:00 (15 years ago)

Author:

jttt

Message:

Allow SplitWayAction to work also when some non related ways are selected.

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -23 +23 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.MutableTreeNode;
 
 import org.openstreetmap.josm.Main;
@@ -185 +183 @@
 
     @Override public Collection<PseudoCommand> getChildren() {
-        if (toDelete.size() == 1) {
+        if (toDelete.size() == 1)
             return null;
-        } else {
+        else {
             List<PseudoCommand> children = new ArrayList<PseudoCommand>();
             for (final OsmPrimitive osm : toDelete) {
@@ -193 +191 @@
                     @Override public JLabel getDescription() {
                         return new JLabel(
-                            tr("Deleted ''{0}''",
-                                osm.getDisplayName(DefaultNameFormatter.getInstance())),
-                            ImageProvider.get(OsmPrimitiveType.from(osm)), JLabel.HORIZONTAL);
-                        }
+                                tr("Deleted ''{0}''",
+                                        osm.getDisplayName(DefaultNameFormatter.getInstance())),
+                                        ImageProvider.get(OsmPrimitiveType.from(osm)), JLabel.HORIZONTAL);
+                    }
                     @Override public Collection<? extends OsmPrimitive> getParticipatingPrimitives() {
                         return Collections.singleton(osm);
@@ -425 +423 @@
             chunks.add(n1);
             chunks.add(n2);
-            return SplitWayAction.splitWay(layer,ws.way, chunks).getCommand();
+            return SplitWayAction.splitWay(layer,ws.way, chunks, Collections.<OsmPrimitive>emptyList()).getCommand();
         }
     }
@@ -443 +441 @@
         if (a != null) {
             for (OsmPrimitive osm : primitivesToDelete) {
-                if (osm.isIncomplete())
+                if (osm.isIncomplete()) {
                     incomplete = true;
-                else if (osm instanceof Node && !osm.isNewOrUndeleted()
-                && !a.contains(((Node) osm).getCoor()))
+                } else if (osm instanceof Node && !osm.isNewOrUndeleted()
+                        && !a.contains(((Node) osm).getCoor())) {
                     outside = true;
+                }
             }
         }
@@ -453 +452 @@
         {
             for (OsmPrimitive osm : primitivesToDelete)
-                if (osm.isIncomplete())
+                if (osm.isIncomplete()) {
                     incomplete = true;
+                }
         }
         if(outside)