Changeset 5303 in josm

Timestamp:

Jun 25, 2012 10:59:59 PM (11 months ago)

Author:

Don-vip

Message:

see #7700 - fix ArrayIndexOutOfBoundsException that can occur when merging layers

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (1 diff)

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

@@ -1480 +1480 @@
         @Override
         public Object getValueAt(int row, int col) {
-            switch (col) {
-            case 0: return getLayers().get(row) == getActiveLayer();
-            case 1: return getLayers().get(row);
-            case 2: return getLayers().get(row);
-            default: throw new RuntimeException();
-            }
+            if (row >= 0 && row < getLayers().size()) {
+                switch (col) {
+                case 0: return getLayers().get(row) == getActiveLayer();
+                case 1: return getLayers().get(row);
+                case 2: return getLayers().get(row);
+                default: throw new RuntimeException();
+                }
+            }
+            return null;
         }