Changeset 28167 in osm for applications/editors

Timestamp:

2012-03-30T19:47:33+02:00 (13 years ago)

Author:

akks

Message:

'FastDraw: better shortcut handling after core changes'

Location:

applications/editors/josm/plugins/FastDraw

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (modified) (6 diffs)

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

@@ -30 +30 @@
 <project name="FastDraw" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="FastDraw: shortcut parsing"/>
+    <property name="commit.message" value="FastDraw: better shortcut handling after core changes"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5035"/>

applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java

@@ -90 +90 @@
     private boolean lineWasSaved;
     private boolean deltaChanged;
-
+    private final int mainKeyCode;
+    
     FastDrawingMode(MapFrame mapFrame) {
         super(tr("FastDrawing"), "turbopen.png", tr("Fast drawing mode"), 
@@ -103 +104 @@
         cursorDrawing = ImageProvider.getCursor("crosshair", "mode");
         //loadPrefs();
+        mainKeyCode = getShortcut().getKeyStroke().getKeyCode();
     }
 
@@ -429 +431 @@
 
     private void doKeyEvent(KeyEvent e) {
-       // System.out.println(e);
+        if (getShortcut().isEvent(e)) { // repeated press
+            tryToLoadWay();
+            return;
+        }
         switch(e.getKeyCode()) {
         case KeyEvent.VK_BACK_SPACE:
@@ -464 +469 @@
         break;
         case KeyEvent.VK_DOWN:
+            if (ctrl || shift || alt) return;
             // more details
             e.consume();
@@ -470 +476 @@
         break;
         case KeyEvent.VK_UP:
+            if (ctrl || shift || alt) return;
             // less details
             e.consume();
@@ -494 +501 @@
             }
         break;
-        case KeyEvent.VK_T:
-            tryToLoadWay();
-        break;
+        
         case KeyEvent.VK_I:
            JOptionPane.showMessageDialog(Main.parent,