Changeset 867 in josm for trunk/src

Timestamp:

2008-08-25T16:10:56+02:00 (16 years ago)

Author:

stoecker

Message:

fixed exception when no layer was active

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (1 diff)
• dialogs/LayerListDialog.java (modified) (3 diffs)

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

@@ -172 +172 @@
                 for (Layer.LayerChangeListener l : Layer.listeners)
                         l.layerAdded(layer);
-                if (layer instanceof OsmDataLayer) {
+                if (layer instanceof OsmDataLayer || activeLayer == null) {
                         // autoselect the new layer
                         Layer old = activeLayer;

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

@@ -70 +70 @@
                         int sel = instance.getSelectedIndex();
                         Layer l = layer != null ? layer : (Layer)instance.getSelectedValue();
+                        if(l == null)
+                                return;
                         if (l instanceof OsmDataLayer)
                         {
@@ -103 +105 @@
                 public void actionPerformed(ActionEvent e) {
                         Layer l = layer == null ? (Layer)instance.getSelectedValue() : layer;
+                        if(l == null)
+                                return;
                         l.visible = !l.visible;
                         Main.map.mapView.repaint();
@@ -280 +284 @@
                 mergeButton.setEnabled(enable);
                 upButton.setEnabled(sel > 0);
-                downButton.setEnabled(sel < model.getSize()-1);
+                downButton.setEnabled(sel >= 0 && sel < model.getSize()-1);
                 deleteAction.setEnabled(!model.isEmpty());
         }