Changeset 30709 in osm for applications/editors/josm

Timestamp:

2014-10-11T09:24:53+02:00 (11 years ago)

Author:

akks

Message:

JOSM/FastDraw: do not catch keys from other windows, fix default tags combobox

Location:

applications/editors/josm/plugins/FastDraw

Files:

• build.xml (modified) (1 diff)
• nbproject/project.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawConfigDialog.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java (modified) (2 diffs)

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

@@ -2 +2 @@
 <project name="FastDraw" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="JOSM/FastDraw: line stroke and point size customization"/>
+    <property name="commit.message" value="JOSM/FastDraw: do not catch keys from other windows, fix default tags combobox"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="7001"/>

applications/editors/josm/plugins/FastDraw/nbproject/project.xml ¶

@@ -4 +4 @@
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <name>FastDraw</name>
+        </general-data>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
             <!-- Не используйте диалоговое окно свойств проекта при редактировании данного файла вручную. -->
             <name>FastDraw</name>
@@ -13 +16 @@
                     <location>src</location>
                 </source-folder>
+                <build-file>
+                    <location>../../dist/FastDraw.jar</location>
+                </build-file>
             </folders>
             <ide-actions>
@@ -56 +62 @@
                 </context-menu>
             </view>
+            <subprojects/>
         </general-data>
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">../../core/src</classpath>
+                <classpath mode="compile">../../core/src;../../core/dist/josm-custom.jar</classpath>
                 <built-to>../../dist/FastDraw.jar</built-to>
                 <source-level>1.7</source-level>

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

@@ -7 +7 @@
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 
 import javax.swing.AbstractAction;
@@ -61 +64 @@
         });
         pasteButton.setToolTipText(tr("Try copying tags from properties table"));
-        
-        addTags.setPossibleItems(Main.pref.getCollection("fastdraw.tags-history"));
+        ArrayList<String> history = new ArrayList<>(Main.pref.getCollection("fastdraw.tags-history"));
+        while (history.remove("")) { };
+        addTags.setPossibleItems(history);
         
         all.add(label1,GBC.std().insets(10,0,0,0));
@@ -118 +122 @@
             settings.simplifyMode=combo1.getSelectedIndex();
             settings.autoTags=addTags.getText();
-            addTags.addCurrentItemToHistory();
+            if (!settings.autoTags.isEmpty()) {
+                addTags.addCurrentItemToHistory();
+            }
             Main.pref.putCollection("fastdraw.tags-history", addTags.getHistory());
             settings.savePrefs();

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

@@ -9 +9 @@
 import java.awt.AWTEvent;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Graphics2D;
+import java.awt.KeyboardFocusManager;
 import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.event.*;
 import java.util.*;
+import javax.swing.JFrame;
 import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
@@ -265 +269 @@
                   set.add((e.getKeyCode()));
                 }
-            doKeyEvent((KeyEvent) event);
+            // check if key press is done in main window, not in dialogs
+            Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
+            if (SwingUtilities.getWindowAncestor(focused) instanceof JFrame) {
+                doKeyEvent((KeyEvent) event);
+            }
         }
         if (event.getID() == KeyEvent.KEY_RELEASED) {