Changeset 206 in josm

Timestamp:

2007-04-03T15:31:33+02:00 (17 years ago)

Author:

imi

Message:

• added hidden config option "osm-primitives.showid" (true/false) to show the id of every object
• fixed a bug that disabled moving map via Ctrl+cursor keys after opening the download dialog
• fixed the incorrect display of older error messages in the please wait dialog

Location:

src/org/openstreetmap/josm

Files:

• data/osm/visitor/NameVisitor.java (modified) (5 diffs)
• gui/MapMover.java (modified) (2 diffs)
• gui/MapView.java (modified) (1 diff)
• gui/PleaseWaitRunnable.java (modified) (2 diffs)
• gui/WorldChooser.java (modified) (1 diff)

src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java

@@ -11 +11 @@
 import javax.swing.JLabel;
 
+import org.openstreetmap.josm.Main;
 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;
@@ -50 +52 @@
                                 name = (ls.id==0?"":ls.id+" ")+"("+ls.from.coor.lat()+","+ls.from.coor.lon()+") -> ("+ls.to.coor.lat()+","+ls.to.coor.lon()+")";
                 }
+                addId(ls);
                 icon = ImageProvider.get("data", "segment");
                 trn("segment", "segments", 0); // no marktrn available
@@ -63 +66 @@
                 if (name == null)
                         name = (n.id==0?"":""+n.id)+" ("+n.coor.lat()+","+n.coor.lon()+")";
+                addId(n);
                 icon = ImageProvider.get("data", "node");
                 trn("node", "nodes", 0); // no marktrn available
@@ -89 +93 @@
                                 name += " ("+tr("incomplete")+")";
                 }
+                addId(w);
                 icon = ImageProvider.get("data", "way");
                 trn("way", "ways", 0); // no marktrn available
@@ -97 +102 @@
                 return new JLabel(name, icon, JLabel.HORIZONTAL);
         }
+
+
+        private void addId(OsmPrimitive osm) {
+            if (Main.pref.getBoolean("osm-primitives.showid"))
+                        name += " (id: "+osm.id+")";
+    }
 }

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

@@ -72 +72 @@
          * Create a new MapMover
          */
-        MapMover(NavigatableComponent navComp) {
+        MapMover(NavigatableComponent navComp, boolean registerKeys) {
                 this.nc = navComp;
                 nc.addMouseListener(this);
@@ -81 +81 @@
                 int[] k = {KeyEvent.VK_COMMA, KeyEvent.VK_PERIOD, KeyEvent.VK_UP, KeyEvent.VK_RIGHT, KeyEvent.VK_DOWN, KeyEvent.VK_LEFT};
 
-                for (int i = 0; i < n.length; ++i) {
-                        Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(k[i], KeyEvent.CTRL_DOWN_MASK), "MapMover.Zoomer."+n[i]);
-                        Main.contentPane.getActionMap().put("MapMover.Zoomer."+n[i], new ZoomerAction(n[i]));
+                if (registerKeys) {
+                        for (int i = 0; i < n.length; ++i) {
+                                Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(k[i], KeyEvent.CTRL_DOWN_MASK), "MapMover.Zoomer."+n[i]);
+                                Main.contentPane.getActionMap().put("MapMover.Zoomer."+n[i], new ZoomerAction(n[i]));
+                        }
                 }
         }

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

@@ -86 +86 @@
                         }
                 });
-                new MapMover(this);
+                new MapMover(this, true);
 
                 // listend to selection changes to redraw the map

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

@@ -62 +62 @@
                         if (cancelled)
                                 return; // since realRun isn't executed, do not call to finish
+
+                        // reset dialog state
                         Main.pleaseWaitDlg.setTitle(title);
+                        errorMessage = null;
+                        closeDialogCalled = false;
 
                         // show the dialog
-                        closeDialogCalled = false;
                         synchronized (this) {
                     EventQueue.invokeLater(new Runnable() {
@@ -77 +80 @@
                     try {wait();} catch (InterruptedException e) {}
                         }
-
 
                         realRun();

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

@@ -60 +60 @@
                 center = new EastNorth(world.getIconWidth()/2, world.getIconHeight()/2);
                 setPreferredSize(new Dimension(200, 100));
-                new MapMover(this);
+                new MapMover(this, false);
                 projection = new Projection() {
                         public EastNorth latlon2eastNorth(LatLon p) {