Changeset 27876 in osm for applications/editors/josm/plugins/turnrestrictions

Timestamp:

2012-02-19T15:42:30+01:00 (13 years ago)

Author:

stoecker

Message:

remove nonstandrad shortcut handling

Location:

applications/editors/josm/plugins/turnrestrictions

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java (deleted)

applications/editors/josm/plugins/turnrestrictions/build.xml

@@ -32 +32 @@
     <property name="commit.message" value="Adapt to JOSM core change (DefaultNameFormatter)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4968"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java

@@ -4 +4 @@
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import java.util.Collection;
-import java.util.logging.Logger;
-
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -13 +11 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditor;
 import org.openstreetmap.josm.plugins.turnrestrictions.editor.TurnRestrictionEditorManager;
@@ -26 +25 @@
  */
 public class CreateOrEditTurnRestrictionAction extends JosmAction {
-    static private final Logger logger = Logger.getLogger(CreateOrEditTurnRestrictionAction.class.getName());
-  
-    /**
-     * Installs  global key stroke configured in the preferences.
-     *
-     * @param keyStroke the key stroke
-     */
-    static public void install(){
-        String value = Main.pref.get(PreferenceKeys.EDIT_SHORTCUT, "shift ctrl T");
-        KeyStroke key = KeyStroke.getKeyStroke(value);
-        if (key == null){
-            System.out.println(tr("Warning: illegal value ''{0}'' for preference key ''{1}''. Falling back to default value ''shift ctrl T''.", value, PreferenceKeys.EDIT_SHORTCUT));
-            key = KeyStroke.getKeyStroke("shift ctrl T");
-        }
-        Main.registerActionShortcut(getInstance(), key);
-    }
-
     /** the singleton instance of this action */
     private static CreateOrEditTurnRestrictionAction instance;
@@ -63 +45 @@
             null,
             tr("Create or edit a turn restriction."),
-            null, // shortcut is going to be registered later
+            Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"),
+                KeyEvent.VK_2, Shortcut.ALT_SHIFT),
             false
         );

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java

@@ -35 +35 @@
     private ButtonGroup bgIconSet;
     private JCheckBox cbShowViaListInBasicEditor;
-    private ShortcutPreferencePanel pnlShortcutPreference;
     
     protected JPanel buildShowViaListInBasicEditorPanel() {
@@ -161 +160 @@
         add(new JSeparator(), gc);
         gc.gridy++;
-        add(pnlShortcutPreference = new ShortcutPreferencePanel(), gc);
         
         // filler - just grab remaining space
@@ -184 +182 @@
     public void initFromPreferences(Preferences prefs){
         String set = prefs.get(PreferenceKeys.ROAD_SIGNS, "set-a");
-        set = set.trim().toLowerCase();
         if (! set.equals("set-a") && ! set.equals("set-b")) {
             System.out.println(tr("Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. Assuming the default value ''set-a''.", PreferenceKeys.ROAD_SIGNS, set));
@@ -197 +194 @@
         boolean b = prefs.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false);
         cbShowViaListInBasicEditor.setSelected(b);
-        
-        pnlShortcutPreference.initFromPreferences(prefs);
     }
     
@@ -207 +202 @@
      */
     public void saveToPreferences(Preferences prefs){
-        String set = null;
-        if (rbSetA.isSelected()){
-            set = "set-a";
-        } else {
-            set = "set-b";
-        }
-        String oldSet = prefs.get(PreferenceKeys.ROAD_SIGNS, "set-a");      
-        if (!set.equals(oldSet)){
-            prefs.put(PreferenceKeys.ROAD_SIGNS, set);
-        }
-        
-        boolean newValue = cbShowViaListInBasicEditor.isSelected();
-        boolean oldValue = prefs.getBoolean(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, false);
-        if (newValue != oldValue){
-            prefs.put(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, newValue);
-        }       
-        
-        pnlShortcutPreference.saveToPreferences(prefs);
+        prefs.put(PreferenceKeys.ROAD_SIGNS, rbSetA.isSelected() ? "set-a" : "set-b");
+        prefs.put(PreferenceKeys.SHOW_VIAS_IN_BASIC_EDITOR, cbShowViaListInBasicEditor.isSelected());
     }