Changeset 1182 in josm for trunk/src/org

Timestamp:

2008-12-27T00:09:20+01:00 (16 years ago)

Author:

stoecker

Message:

fixed bug #1889

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (2 diffs)
• command/ChangePropertyCommand.java (modified) (1 diff)
• gui/preferences/prefJPanel.java (modified) (1 diff)
• tools/Shortcut.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JosmAction.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.InputEvent;
@@ -29 +31 @@
     public Shortcut getShortcut() {
         if (sc == null) {
-            sc = Shortcut.registerShortcut("core:none", "No Shortcut", 0, Shortcut.GROUP_NONE);
-            sc.setAutomatic(); // as this shortcut is shared by all action that don't want to have a shortcut,
-                               // we shouldn't allow the user to change it...
+            sc = Shortcut.registerShortcut("core:none", tr("No Shortcut"), 0, Shortcut.GROUP_NONE);
+            // as this shortcut is shared by all action that don't want to have a shortcut,
+            // we shouldn't allow the user to change it...
+            // this is handled by special name "core:none"
         }
         return sc;

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

@@ -89 +89 @@
 
     @Override public MutableTreeNode description() {
-        String text = value == null ? tr( "Remove \"{0}\" for", key) : tr("Set {0}={1} for",key,value);
+        String text;
         if (objects.size() == 1) {
             NameVisitor v = new NameVisitor();
             objects.iterator().next().visit(v);
-            text += " "+tr(v.className)+" "+v.name;
-        } else
-            text += " "+objects.size()+" "+trn("object","objects",objects.size());
+            text = value == null
+            ? tr("Remove \"{0}\" for {1} ''{2}''", key, tr(v.className), v.name)
+            : tr("Set {0}={1} for {1} ''{2}''",key,value, tr(v.className), v.name);
+        }
+        else
+        {
+            text = value == null
+            ? tr("Remove \"{0}\" for {1} {2}", key, objects.size(), trn("object","objects",objects.size()))
+            : tr("Set {0}={1} for {1} {2}",key,value, objects.size(), trn("object","objects",objects.size()));
+        }
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL));
         if (objects.size() == 1)

trunk/src/org/openstreetmap/josm/gui/preferences/prefJPanel.java

@@ -392 +392 @@
                     tfKey.setSelectedItem(keyList.get(-1));
                 }
-                if (sc.getAutomatic()) {
+                if (sc.isChangeable()) {
                     panel.cbDefault.setEnabled(false);
                     panel.cbDisable.setEnabled(false);

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -101 +101 @@
     }
 
+    public boolean isChangeable() {
+        return !automatic && !shortText.equals("core:none");
+    }
+
     private boolean getReset() {
         return reset;