Changeset 3689 in josm for trunk/src/org/openstreetmap

Timestamp:

2010-12-01T13:58:30+01:00 (13 years ago)

Author:

bastiK

Message:

fixed #5682 - npe in cellrenderer when shutting down JOSM

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/projection/Projection.java (modified) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/Projection.java

@@ -28 +28 @@
         new TransverseMercatorLV(),
         new Puwg(),
+        new Epsg3008(), // SWEREF99 13 30
         new SwissGrid(),
     };

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

@@ -707 +707 @@
         public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) {
             JTextField tf = (JTextField) super.getTableCellEditorComponent(table, value, isSelected, row, column);
-            Layer l = (Layer) value;
-            tf.setText(l.getName());
+            tf.setText(value == null ? "" : ((Layer) value).getName());
             return tf;
         }