Changeset 25110 in osm for applications/editors/josm/plugins/scripting/scripts

Timestamp:

2011-01-22T16:39:26+01:00 (14 years ago)

Author:

guggis

Message:

Fixed help context

File:

• applications/editors/josm/plugins/scripting/scripts/AddHouseNumbers.groovy (modified) (9 diffs)

applications/editors/josm/plugins/scripting/scripts/AddHouseNumbers.groovy

@@ +1 @@
+/*
+ * This scripts sets a sequence of consecutive house numbers on the currently selected nodes.
+ *  
+ */
+import java.awt.event.WindowAdapter;
 
-/*
- * This scripts sets a sequence of house numbers on the currently selected nodes.
- * 
- * The user can enter a start number and and an increment.
- */
 
 import java.awt.BorderLayout;
@@ -10 +10 @@
 
 import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowListener;
 
 import javax.swing.KeyStroke;
 
 import groovy.swing.SwingBuilder;
+import groovy.util.ProxyGenerator;
+
 import javax.swing.JOptionPane;
 import org.openstreetmap.josm.Main;
@@ -35 +39 @@
 import java.awt.GridBagLayout;
 import javax.swing.JLabel;
+import java.awt.event.FocusListener;
 
 import javax.swing.Action;
@@ -43 +48 @@
 import java.awt.event.ActionListener;
 import java.awt.Dimension;
+import java.awt.Dialog.ModalityType;
+import java.awt.event.WindowEvent;
 
 class AddHouseNumberDialog extends JDialog {
@@ -56 +63 @@
         private JTextField tfStart;
         private JTextField tfIncrement;
+        private def actApply;
         
         public AddHouseNumberDialog(){
-                super(Main.parent, true /* modal */)
+                super(Main.parent,true)
                 build();
         }
@@ -95 +103 @@
                 SwingBuilder swing = new SwingBuilder()
                 return swing.panel(layout: new FlowLayout(FlowLayout.CENTER)) {
-                    def actApply = action(name: "Apply", smallIcon: ImageProvider.get("ok"), closure: {apply(); setVisible(false)})
+                    actApply = action(name: "Apply", smallIcon: ImageProvider.get("ok"), closure: {apply(); setVisible(false)})
                         def btnApply = button(action: actApply)
                         btnApply.setFocusable(true)
@@ -114 +122 @@
                         return
                 }
-                def cmds = getCurrentlySelectedNodes().collect { Node n ->
+                def nodes = Main?.map?.mapView?.editLayer?.data?.getSelectedNodes()?.asList()
+                if (nodes == null || nodes.isEmpty()) return
+                def cmds = nodes.collect { Node n ->
                         Node nn = new Node(n)
                         nn.put("addr:housenumber", start.toString())
@@ -120 +130 @@
                         return new ChangeCommand(n, nn)                 
                 }
-                if (cmds.isEmpty()) return
                 Main.main.undoRedo.add(new SequenceCommand("Setting house numbers", cmds))
         }
@@ -131 +140 @@
                 cp.add(buildInputPanel(), BorderLayout.CENTER)
                 cp.add(buildControlButtonPanel(), BorderLayout.SOUTH)
-        }       
-        
-        def getCurrentDataSet() {
-                def layer = Main?.map?.mapView?.activeLayer
-                if (layer == null) return null
-                if (! (layer instanceof OsmDataLayer)) return null
-                return layer.data
-        }
-        
-        def getCurrentlySelectedNodes() {
-                def DataSet ds = getCurrentDataSet()
-                if (ds == null) return []
-                return ds.getSelectedNodes().asList()
-        }
+                
+                addWindowListener([windowActivated: {tfStart.requestFocusInWindow()}] as WindowAdapter) 
+                getRootPane().registerKeyboardAction(actApply, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,KeyEvent.CTRL_MASK, false), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+        }               
 
         @Override