Changeset 202 in josm for src/org/openstreetmap/josm/gui

Timestamp:

2007-02-15T17:32:41+01:00 (18 years ago)

Author:

imi

Message:

• fixed Bug with AnnotationPresets not loading values-tag properly

Location:

src/org/openstreetmap/josm/gui

Files:

• annotation/AnnotationPreset.java (modified) (2 diffs)
• dialogs/LayerListDialog.java (modified) (1 diff)

src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java

@@ -95 +95 @@
                 public String text;
                 public String values;
-                public String display_values = "";
+                public String display_values;
                 public String default_;
                 public boolean delete_if_empty = false;
@@ -103 +103 @@
 
                 public void addToPanel(JPanel p) {
-                        combo = new JComboBox(display_values.split(","));
+                        combo = new JComboBox((display_values != null ? display_values : values).split(","));
                         combo.setEditable(editable);
                         combo.setSelectedItem(default_);

src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -181 +181 @@
                 instance.addMouseListener(new MouseAdapter(){
                         private void openPopup(MouseEvent e) {
+                                Point p = listScrollPane.getMousePosition();
+                                if (p == null)
+                                        return; // user is faster than swing with mouse movement
                                 int index = instance.locationToIndex(e.getPoint());
                                 Layer layer = (Layer)instance.getModel().getElementAt(index);
                                 LayerListPopup menu = new LayerListPopup(instance, layer);
-                                Point p = listScrollPane.getMousePosition();
                                 menu.show(listScrollPane, p.x, p.y-3);
                         }