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

Timestamp:

2006-04-21T14:31:51+02:00 (20 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/MoveAction.java (modified) (7 diffs)

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

@@ -5 +5 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.util.Arrays;
 import java.util.Collection;
 
@@ -51 +52 @@
         }
 
-        @Override
-        public void registerListener() {
+        @Override public void registerListener() {
                 super.registerListener();
                 mv.addMouseListener(this);
@@ -58 +58 @@
         }
 
-        @Override
-        public void unregisterListener() {
+        @Override public void unregisterListener() {
                 super.unregisterListener();
                 mv.removeMouseListener(this);
@@ -70 +69 @@
          * objects.
          */
-        @Override
-        public void mouseDragged(MouseEvent e) {
+        @Override public void mouseDragged(MouseEvent e) {
                 if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == 0)
                         return;
@@ -87 +85 @@
                         return;
 
-                Collection<OsmPrimitive> selection = Main.main.ds.getSelected();
+                Collection<OsmPrimitive> selection = Main.ds.getSelected();
                 Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
                 
@@ -117 +115 @@
          * cursor to movement.
          */
-        @Override
-        public void mousePressed(MouseEvent e) {
+        @Override public void mousePressed(MouseEvent e) {
                 if (e.getButton() != MouseEvent.BUTTON1)
                         return;
 
-                if (Main.main.ds.getSelected().size() == 0) {
+                if (Main.ds.getSelected().size() == 0) {
                         OsmPrimitive osm = mv.getNearest(e.getPoint(), (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0);
                         if (osm != null)
-                                osm.setSelected(true);
+                                Main.ds.setSelected(Arrays.asList(new OsmPrimitive[]{osm}));
                         singleOsmPrimitive = osm;
                         mv.repaint();
@@ -139 +136 @@
          * Restore the old mouse cursor.
          */
-        @Override
-        public void mouseReleased(MouseEvent e) {
+        @Override public void mouseReleased(MouseEvent e) {
                 mv.setCursor(oldCursor);
                 if (singleOsmPrimitive != null) {
-                        singleOsmPrimitive.setSelected(false);
+                        Main.ds.clearSelection();
                         mv.repaint();
                 }