Changeset 99 in josm for src/org/openstreetmap/josm/gui/SelectionManager.java

Timestamp:

2006-04-27T01:29:55+02:00 (18 years ago)

Author:

imi

Message:

• added GeoImage feature (showing images on a tracklog)
• added zoom slider
• added Escape cancels selection rectangle
• added "Save password" option to Auth-dialog
• fixed that redo/undo buttons were not enabled
• fixed hotkeys beeing inaccessible when no data is loaded

File:

• src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (5 diffs)

src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -6 +6 @@
 import java.awt.Point;
 import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
 import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -15 +17 @@
 import java.util.LinkedList;
 
+import javax.swing.AbstractAction;
+import javax.swing.JComponent;
+import javax.swing.KeyStroke;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
 
@@ -121 +127 @@
                 eventSource.addMouseMotionListener(this);
                 selectionEndedListener.addPropertyChangeListener(this);
+                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "SelectionManager");
+        Main.contentPane.getActionMap().put("SelectionManager", new AbstractAction(){
+                        public void actionPerformed(ActionEvent e) {
+                                if (mousePos != null && mousePosStart != null)
+                                        paintRect();
+                                mousePosStart = null;
+                                mousePos = null;
+            }
+        });
         }
         /**
@@ -132 +147 @@
                 eventSource.removeMouseMotionListener(this);
                 selectionEndedListener.removePropertyChangeListener(this);
+                Main.contentPane.getInputMap().remove(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0));
+                Main.contentPane.getActionMap().remove("SelectionManager");
         }
 
@@ -327 +344 @@
         }
         
-        
-        /**
-         * Does nothing. Only to satisfy MouseListener
-         */
         public void mouseClicked(MouseEvent e) {}
-        /**
-         * Does nothing. Only to satisfy MouseListener
-         */
         public void mouseEntered(MouseEvent e) {}
-        /**
-         * Does nothing. Only to satisfy MouseListener
-         */
         public void mouseExited(MouseEvent e) {}
-        /**
-         * Does nothing. Only to satisfy MouseMotionListener
-         */
         public void mouseMoved(MouseEvent e) {}
-
 }