Changeset 1448 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-02-28T18:53:22+01:00 (16 years ago)

Author:

stoecker

Message:

close #2249. patch by xeen

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (2 diffs)
• gui/dialogs/RelationEditor.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -119 +119 @@
             EventQueue.invokeLater(new Runnable() {
                 public void run() {
+                    // Don't change cursor when mode has changed already
+                    if(!(Main.map.mapMode instanceof DrawAction))
+                        return;
                     switch(c) {
                         case way:
@@ -194 +197 @@
     @Override public void enterMode() {
         super.enterMode();
+        currCursor = Cursors.crosshair;
         selectedColor = Main.pref.getColor(marktr("selected"), Color.red);
         drawHelperLine = Main.pref.getBoolean("draw.helper-line", true);

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java

@@ -349 +349 @@
 
         if (ordered) {
-            buttonPanel.add(createButton(marktr("Move Up"), "moveup", tr("Move the currently selected members up"), KeyEvent.VK_U, new ActionListener() {
+            buttonPanel.add(createButton(marktr("Move Up"), "moveup", tr("Move the currently selected members up"), KeyEvent.VK_N, new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     moveMembers(-1);
@@ -364 +364 @@
 
         buttonPanel.add(createButton(marktr("Remove Selected"),"removeselected",
-        tr("Remove all currently selected objects from relation"), KeyEvent.VK_G, new ActionListener() {
+        tr("Remove all currently selected objects from relation"), KeyEvent.VK_S, new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 deleteSelected();