Changeset 86 in josm for src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (8 diffs)

src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -26 +26 @@
  * @see #deleteWithReferences(OsmPrimitive)
  *
- * Pressing Alt will select the way instead of a line segment, as usual.
+ * Pressing Alt will select the way instead of a segment, as usual.
  * 
  * If the user did not press Ctrl and the object has any references, the user
@@ -46 +46 @@
         }
 
-        @Override
-        public void registerListener() {
+        @Override public void registerListener() {
                 super.registerListener();
                 mv.addMouseListener(this);
         }
 
-        @Override
-        public void unregisterListener() {
+        @Override public void unregisterListener() {
                 super.unregisterListener();
                 mv.removeMouseListener(this);
@@ -59 +57 @@
 
         
-        @Override
-        public void actionPerformed(ActionEvent e) {
+        @Override public void actionPerformed(ActionEvent e) {
                 super.actionPerformed(e);
                 boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
                 if (ctrl)
-                        deleteWithReferences(Main.main.ds.getSelected());
+                        deleteWithReferences(Main.ds.getSelected());
                 else
-                        delete(Main.main.ds.getSelected(), false);
+                        delete(Main.ds.getSelected(), false);
                 mv.repaint();
         }
@@ -74 +71 @@
          * position.
          */
-        @Override
-        public void mouseClicked(MouseEvent e) {
+        @Override public void mouseClicked(MouseEvent e) {
                 if (e.getButton() != MouseEvent.BUTTON1)
                         return;
@@ -94 +90 @@
          * Delete the primitives and everything they references.
          * 
-         * If a node is deleted, the node and all line segments, ways and areas
+         * If a node is deleted, the node and all segments, ways and areas
          * the node is part of are deleted as well.
          * 
-         * If a line segment is deleted, all ways the line segment is part of 
+         * If a segment is deleted, all ways the segment is part of 
          * are deleted as well. No nodes are deleted.
          * 
-         * If a way is deleted, only the way and no line segments or nodes are 
+         * If a way is deleted, only the way and no segments or nodes are 
          * deleted.
          * 
@@ -110 +106 @@
                 Collection<Command> deleteCommands = new LinkedList<Command>();
                 for (OsmPrimitive osm : selection)
-                        deleteCommands.add(new DeleteCommand(Main.main.ds, osm));
+                        deleteCommands.add(new DeleteCommand(osm));
                 if (!deleteCommands.isEmpty())
                         mv.editLayer().add(new SequenceCommand(deleteCommands));
@@ -126 +122 @@
                 Collection<Command> deleteCommands = new LinkedList<Command>();
                 for (OsmPrimitive osm : selection) {
-                        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.main.ds);
+                        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(Main.ds);
                         osm.visit(v);
                         if (!selection.containsAll(v.data)) {
@@ -132 +128 @@
                                         JOptionPane.showMessageDialog(Main.main, "This object is in use.");
                         } else
-                                deleteCommands.add(new DeleteCommand(Main.main.ds, osm));
+                                deleteCommands.add(new DeleteCommand(osm));
                 }
                 if (!deleteCommands.isEmpty())