Changeset 215 in josm for src

Timestamp:

2007-04-06T15:44:54+02:00 (17 years ago)

Author:

imi

Message:

• fixed NPE in marker layer when marker type was not found
• added one zoom to->data when first opening some data (since auto scale feature has been removed)
• fixed NPE in preferences when there is a .jar without a manifest in plugin directory

Location:

src/org/openstreetmap/josm

Files:

• gui/MapView.java (modified) (2 diffs)
• gui/layer/markerlayer/Marker.java (modified) (1 diff)
• gui/preferences/PluginPreference.java (modified) (2 diffs)
• io/RawGpsReader.java (modified) (1 diff)
• plugins/PluginInformation.java (modified) (1 diff)
• tools/XmlObjectParser.java (modified) (1 diff)

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

@@ -16 +16 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
@@ -73 +74 @@
                 addComponentListener(new ComponentAdapter(){
                         @Override public void componentResized(ComponentEvent e) {
-                                recalculateCenterScale(null);
+                                new AutoScaleAction("data").actionPerformed(null);
                                 removeComponentListener(this);
                         }

src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -75 +75 @@
 
                                 // Try a relative file:// url, if the link is not in an URL-compatible form
-                                if (relativePath != null && !URI.isWellFormedAddress(link))
+                                if (relativePath != null && link != null && !URI.isWellFormedAddress(link))
                                         link = new File(relativePath, link).toURI().toString();
 

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

@@ -21 +21 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.PluginException;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.tools.GBC;
@@ -36 +37 @@
                 if (pluginFiles != null) {
                         Arrays.sort(pluginFiles);
-                        for (File f : pluginFiles)
-                                if (f.isFile() && f.getName().endsWith(".jar"))
-                                        availablePlugins.add(new PluginInformation(f));
+                        for (File f : pluginFiles) {
+                                if (f.isFile() && f.getName().endsWith(".jar")) {
+                                        try {
+                            availablePlugins.add(new PluginInformation(f));
+                    } catch (PluginException x) {
+                    }
+                                }
+                        }
                 }
 

src/org/openstreetmap/josm/io/RawGpsReader.java

@@ -98 +98 @@
                                 currentTagValues.clear();
                         } else if (qName.equals("wpt")) {
-                                markerData.add(Marker.createMarker(currentLatLon, currentTagValues, relativeMarkerPath));
+                                Marker m = Marker.createMarker(currentLatLon, currentTagValues, relativeMarkerPath);
+                                if (m != null)
+                                        markerData.add(m);
                                 currentTagValues.clear();
                         } else if (qName.equals("trkseg") || qName.equals("trk") || qName.equals("gpx")) {

src/org/openstreetmap/josm/plugins/PluginInformation.java

@@ -54 +54 @@
                         JarInputStream jar = new JarInputStream(new FileInputStream(file));
                         Manifest manifest = jar.getManifest();
+                        if (manifest == null)
+                                throw new IOException(file+" contains no manifest.");
                         Attributes attr = manifest.getMainAttributes();
                         className = attr.getValue("Plugin-Class");

src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -115 +115 @@
                                 }
                         } catch (Exception e) {
-                                e.printStackTrace(); // !"§%$!"§ SAXException does not dump inner exceptions.
+                                e.printStackTrace(); // SAXException does not dump inner exceptions.
                                 throw new SAXException(e);
                         }