Changeset 4334 in josm

Timestamp:

2011-08-22T13:47:35+02:00 (13 years ago)

Author:

xeen

Message:

fix two NPEs in GpxLayer (fixes #6726) and also repaint the map when merging new GPX data

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadGpsTask.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java

@@ -81 +81 @@
             } else {
                 x.mergeFrom(layer);
+                Main.map.repaint();
             }
         }

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -112 +112 @@
     private boolean isLocalFile;
     // used by ChooseTrackVisibilityAction to determine which tracks to show/hide
-    private boolean[] trackVisibility;
+    private boolean[] trackVisibility = new boolean[0];
 
     private final List<GpxTrack> lastTracks = new ArrayList<GpxTrack>(); // List of tracks at last paint
@@ -126 +126 @@
         data = d;
         computeCacheInSync = false;
-        trackVisibility = new boolean[d.tracks.size()];
-        for(int i=0; i < d.tracks.size(); i++) {
-            trackVisibility[i] = true;
-        }
+        ensureTrackVisibilityLength();
     }
 
@@ -579 +576 @@
                                     int velColor =(int) Math.round(colorModeDynamic ? ((vel-minval)*255/(maxval-minval))
                                             : (vel <= 0 ? 0 : vel / colorTracksTune * 255));
-                                    trkPnt.customColoring = colors[velColor > 255 ? 255 : velColor];
+                                    trkPnt.customColoring = colors[Math.max(0, Math.min(velColor, 255))];
                                 } else {
                                     trkPnt.customColoring = colors[255];
@@ -622 +619 @@
         WayPoint last = null;
         int i = 0;
+        ensureTrackVisibilityLength();
         for (GpxTrack trk: data.tracks) {
             // hide tracks that were de-selected in ChooseTrackVisibilityAction
@@ -857 +855 @@
     public void setAssociatedFile(File file) {
         data.storageFile = file;
+    }
+
+    /** ensures the trackVisibility array has the correct length without losing data.
+     * additional entries are initialized to true;
+     */
+    final private void ensureTrackVisibilityLength() {
+        final int l = data.tracks.size();
+        if(l == trackVisibility.length)
+            return;
+        final boolean[] back = trackVisibility.clone();
+        final int m = Math.min(l, back.length);
+        trackVisibility = new boolean[l];
+        for(int i=0; i < m; i++) {
+            trackVisibility[i] = back[i];
+        }
+        for(int i=m; i < l; i++) {
+            trackVisibility[i] = true;
+        }
     }