Changeset 16683 in osm

Timestamp:

2009-07-25T10:49:12+02:00 (16 years ago)

Author:

jttt

Message:

Fix NPE in paint method when data layer was recently removed

Location:

applications/editors/josm/plugins/routes

Files:

• josm-routes.launch (added)
• src/org/openstreetmap/josm/plugins/routes/RouteLayer.java (modified) (7 diffs)

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RouteLayer.java

@@ -11 +11 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -30 +31 @@
         private final PathBuilder pathBuilder = new PathBuilder();
         private final List<RouteDefinition> routes = new ArrayList<RouteDefinition>();
-        
+
         public RouteLayer(RoutesXMLLayer xmlLayer) {
                 super(xmlLayer.getName());
-                
+
                 int index = 0;
-                for (RoutesXMLRoute route:xmlLayer.getRoute()) {                        
+                for (RoutesXMLRoute route:xmlLayer.getRoute()) {
                         if (route.isEnabled()) {
                                 Color color = ColorHelper.html2color(route.getColor());
@@ -45 +46 @@
                         }
                 }
-                
+
                 if ("wide".equals(Main.pref.get("routes.painter"))) {
                         pathPainter = new WideLinePainter(this);
@@ -80 +81 @@
         @Override
         public void mergeFrom(Layer from) {
-
+                // Merging is not supported
         }
 
@@ -89 +90 @@
                                 pathBuilder.addWay(way, route);
                         }
-                }               
+                }
         }
 
@@ -95 +96 @@
         public void paint(Graphics g, MapView mv) {
 
+                DataSet dataset = Main.main.getCurrentDataSet();
+
+                if (dataset == null) {
+                        return;
+                }
+
                 pathBuilder.clear();
 
-                for (Relation relation:Main.main.getCurrentDataSet().relations) {
+                for (Relation relation:dataset.relations) {
                         for (RouteDefinition route:routes) {
                                 if (route.matches(relation)) {
                                         addRelation(relation, route);
                                 }
-                        }                       
+                        }
                 }
 
-                for (Way way:Main.main.getCurrentDataSet().ways) {
+                for (Way way:dataset.ways) {
                         for (RouteDefinition route:routes) {
                                 if (route.matches(way)) {
@@ -122 +129 @@
 
         }
-        
+
         public List<RouteDefinition> getRoutes() {
                 return routes;