Index: src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- src/org/openstreetmap/josm/gui/MapStatus.java (revision 55) +++ src/org/openstreetmap/josm/gui/MapStatus.java (revision 56) @@ -46,5 +46,5 @@ */ public class MapStatus extends JPanel { - + /** * The MapView this status belongs. @@ -59,5 +59,5 @@ */ JTextField nameText = new JTextField(30); - + /** * The collector class that waits for notification and then update @@ -83,5 +83,5 @@ */ boolean exitCollector = false; - + /** * Execution function for the Collector. @@ -99,13 +99,4 @@ if ((ms.modifiers & MouseEvent.CTRL_DOWN_MASK) != 0 || ms.mousePos == null) continue; // freeze display when holding down ctrl - Collection osms = mv.getAllNearest(ms.mousePos); - - if (osms == null && osmStatus == null && ms.modifiers == oldModifiers) - continue; - if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers) - continue; - - osmStatus = osms; - oldModifiers = ms.modifiers; // This try/catch is a hack to stop the flooding bug reports about this. @@ -113,69 +104,79 @@ // access to the data need to be restarted, if the main thread modifies // the data. - OsmPrimitive osmNearest = null; try { + Collection osms = mv.getAllNearest(ms.mousePos); + + if (osms == null && osmStatus == null && ms.modifiers == oldModifiers) + continue; + if (osms != null && osms.equals(osmStatus) && ms.modifiers == oldModifiers) + continue; + + osmStatus = osms; + oldModifiers = ms.modifiers; + + OsmPrimitive osmNearest = null; // Set the text label in the bottom status bar osmNearest = mv.getNearest(ms.mousePos, (ms.modifiers & MouseEvent.ALT_DOWN_MASK) != 0); + if (osmNearest != null) { + SelectionComponentVisitor visitor = new SelectionComponentVisitor(); + osmNearest.visit(visitor); + nameText.setText(visitor.name); + } else + nameText.setText(""); + + // Popup Information + if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 && osms != null) { + if (popup != null) + popup.hide(); + + JPanel c = new JPanel(new GridBagLayout()); + for (final OsmPrimitive osm : osms) { + SelectionComponentVisitor visitor = new SelectionComponentVisitor(); + osm.visit(visitor); + final StringBuilder text = new StringBuilder(); + if (osm.id == 0 || osm.modified || osm.modifiedProperties) + visitor.name = ""+visitor.name+"*"; + text.append(visitor.name); + if (osm.id != 0) + text.append("
id="+osm.id); + if (osm.keys != null) + for (Entry e : osm.keys.entrySet()) + text.append("
"+e.getKey().name+"="+e.getValue()); + final JLabel l = new JLabel(""+text.toString()+"", visitor.icon, JLabel.HORIZONTAL); + l.setFont(l.getFont().deriveFont(Font.PLAIN)); + l.setVerticalTextPosition(JLabel.TOP); + l.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + l.addMouseListener(new MouseAdapter(){ + @Override + public void mouseEntered(MouseEvent e) { + l.setText(""+text.toString()+""); + } + @Override + public void mouseExited(MouseEvent e) { + l.setText(""+text.toString()+""); + } + @Override + public void mouseClicked(MouseEvent e) { + Main.main.ds.clearSelection(); + osm.setSelected(true); + mv.repaint(); + } + }); + c.add(l, GBC.eol()); + } + + Point p = mv.getLocationOnScreen(); + popup = PopupFactory.getSharedInstance().getPopup(mv, c, p.x+ms.mousePos.x+16, p.y+ms.mousePos.y+16); + popup.show(); + } else if (popup != null) { + popup.hide(); + popup = null; + } } catch (ConcurrentModificationException x) { - } - if (osmNearest != null) { - SelectionComponentVisitor visitor = new SelectionComponentVisitor(); - osmNearest.visit(visitor); - nameText.setText(visitor.name); - } else - nameText.setText(""); - - // Popup Information - if ((ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0 && osms != null) { - if (popup != null) - popup.hide(); - - JPanel c = new JPanel(new GridBagLayout()); - for (final OsmPrimitive osm : osms) { - SelectionComponentVisitor visitor = new SelectionComponentVisitor(); - osm.visit(visitor); - final StringBuilder text = new StringBuilder(); - if (osm.id == 0 || osm.modified || osm.modifiedProperties) - visitor.name = ""+visitor.name+"*"; - text.append(visitor.name); - if (osm.id != 0) - text.append("
id="+osm.id); - if (osm.keys != null) - for (Entry e : osm.keys.entrySet()) - text.append("
"+e.getKey().name+"="+e.getValue()); - final JLabel l = new JLabel(""+text.toString()+"", visitor.icon, JLabel.HORIZONTAL); - l.setFont(l.getFont().deriveFont(Font.PLAIN)); - l.setVerticalTextPosition(JLabel.TOP); - l.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - l.addMouseListener(new MouseAdapter(){ - @Override - public void mouseEntered(MouseEvent e) { - l.setText(""+text.toString()+""); - } - @Override - public void mouseExited(MouseEvent e) { - l.setText(""+text.toString()+""); - } - @Override - public void mouseClicked(MouseEvent e) { - Main.main.ds.clearSelection(); - osm.setSelected(true); - mv.repaint(); - } - }); - c.add(l, GBC.eol()); - } - - Point p = mv.getLocationOnScreen(); - popup = PopupFactory.getSharedInstance().getPopup(mv, c, p.x+ms.mousePos.x+16, p.y+ms.mousePos.y+16); - popup.show(); - } else if (popup != null) { - popup.hide(); - popup = null; } } } } - + /** * Everything, the collector is interested of. Access must be synchronized. @@ -220,9 +221,9 @@ add(new JLabel(" Object ")); add(nameText); - + // The background thread final Collector collector = new Collector(); new Thread(collector).start(); - + // Listen to keyboard/mouse events for pressing/releasing alt key and // inform the collector.