Changeset 198 in josm for src/org/openstreetmap/josm/actions

Timestamp:

2007-01-14T09:41:24+01:00 (18 years ago)

Author:

imi

Message:

• added different cursors for mapmodes (actually just finished what was begun)
• added feature to change the key in property dialog as well as the value
• added dockable toggle dialogs
• fixed exception when loading GPX files at command line

Location:

src/org/openstreetmap/josm/actions/mapmode

Files:

• AddNodeAction.java (modified) (4 diffs)
• MapMode.java (modified) (3 diffs)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -54 +53 @@
 
         public AddNodeAction(MapFrame mapFrame, String name, Mode mode, String desc) {
-                super(name, "node/"+mode, desc, mapFrame, ImageProvider.getCursor("crosshair", "node"));
+                super(name, "node/"+mode, desc, mapFrame, Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
                 this.mode = mode;
                 putValue("help", "Action/AddNode/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1));
@@ -62 +61 @@
                 super.enterMode();
                 Main.map.mapView.addMouseListener(this);
-                Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
         }
 
@@ -68 +66 @@
                 super.exitMode();
                 Main.map.mapView.removeMouseListener(this);
-                Main.map.mapView.setCursor(Cursor.getDefaultCursor());
         }
 

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

@@ -21 +21 @@
  */
 abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener {
-//      private final Cursor cursor;
-//      private Cursor oldCursor;
+        private final Cursor cursor;
+        private Cursor oldCursor;
 
         /**
@@ -29 +29 @@
         public MapMode(String name, String iconName, String tooltip, int keystroke, MapFrame mapFrame, Cursor cursor) {
                 super(name, "mapmode/"+iconName, tooltip, keystroke, 0, false);
-//              this.cursor = cursor;
+                this.cursor = cursor;
                 putValue("active", false);
         }
@@ -40 +40 @@
                 putValue(SMALL_ICON, ImageProvider.get("mapmode", iconName));
                 putValue(SHORT_DESCRIPTION, tooltip);
-//              this.cursor = cursor;
+                this.cursor = cursor;
         }
 
         public void enterMode() {
                 putValue("active", true);
-//              oldCursor = Main.map.mapView.getCursor();
-//              Main.map.mapView.setCursor(cursor);
+                oldCursor = Main.map.mapView.getCursor();
+                Main.map.mapView.setCursor(cursor);
                 
         }
         public void exitMode() {
                 putValue("active", false);
-//              Main.map.mapView.setCursor(oldCursor);
+                Main.map.mapView.setCursor(oldCursor);
         }