Changeset 177 in josm for src/org/openstreetmap

Timestamp:

2006-12-22T19:51:11+01:00 (18 years ago)

Author:

imi

Message:

• fixed NPE when open the annotation preset plugin with an invalid annotation preset

Location:

src/org/openstreetmap/josm/gui

Files:

• annotation/AnnotationCellRenderer.java (modified) (1 diff)
• preferences/PreferenceDialog.java (modified) (2 diffs)

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

@@ -16 +16 @@
         @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
         AnnotationPreset a = (AnnotationPreset)value;
-        if (a.name == null)
+        if (a == null || a.name == null)
                 return super.getListCellRendererComponent(list, "", index, false, false);
         JComponent c = (JComponent)super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);

src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.PluginProxy;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -36 +37 @@
         // some common tabs
         public final JPanel display = createPreferenceTab("display", tr("Display Settings"), tr("Various settings that influence the visual representation of the whole program."));
-        public final JPanel connection = createPreferenceTab("connection", tr("Connection Settings"), tr("Connection Settings to the OSM server."));
-        public final JPanel map = createPreferenceTab("map", tr("Map Settings"), tr("Settings for the map projection and data interpretation."));
+        public final JPanel connection = createPreferenceTab("connection", I18n.tr("Connection Settings"), I18n.tr("Connection Settings to the OSM server."));
+        public final JPanel map = createPreferenceTab("map", I18n.tr("Map Settings"), I18n.tr("Settings for the map projection and data interpretation."));
 
         /**