Changeset 1465 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2009-03-07T13:40:54+01:00 (15 years ago)

Author:

stoecker

Message:

fix #1967. patch by xeen. This will break plugins using ProgressDialog until recompiled

File:

• trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (modified) (12 diffs)

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

@@ -16 +16 @@
 import java.awt.geom.Area;
 import java.awt.geom.Rectangle2D;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
 import java.io.InputStreamReader;
 import java.net.URL;
@@ -30 +29 @@
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.Date;
 import java.util.LinkedList;
-import java.util.Date;
 import java.util.List;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
 
 import javax.swing.AbstractAction;
@@ -40 +37 @@
 import javax.swing.ButtonGroup;
 import javax.swing.Icon;
-import javax.swing.JCheckBox;
 import javax.swing.JColorChooser;
 import javax.swing.JFileChooser;
@@ -50 +46 @@
 import javax.swing.JRadioButton;
 import javax.swing.JSeparator;
-import javax.swing.JTextField;
 import javax.swing.filechooser.FileFilter;
 
@@ -57 +52 @@
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.SaveAsAction;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
+import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTaskList;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -71 +66 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.gui.download.DownloadDialog.DownloadTask;
 import org.openstreetmap.josm.gui.layer.markerlayer.AudioMarker;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.io.GpxWriter;
-import org.openstreetmap.josm.io.MultiPartFormOutputStream;
 import org.openstreetmap.josm.tools.DontShowAgainInfo;
 import org.openstreetmap.josm.tools.GBC;
@@ -380 +372 @@
         {-ll0,-sl9,-ll0,+sl9}
     };
-    
+
     // the different color modes
     enum colorModes { none, velocity, dilution }
-    
+
     @Override public void paint(Graphics g, MapView mv) {
 
@@ -392 +384 @@
         Color neutralColor = getColor(name);
         // also draw lines between points belonging to different segments
-        boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force");   
+        boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force");
         // draw direction arrows on the lines
-        boolean direction = Main.pref.getBoolean("draw.rawgps.direction");   
+        boolean direction = Main.pref.getBoolean("draw.rawgps.direction");
         // don't draw lines if longer than x meters
-        int maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", -1);        
+        int maxLineLength = Main.pref.getInteger("draw.rawgps.max-line-length", -1);
         // draw line between points, global setting
-        boolean lines = Main.pref.getBoolean("draw.rawgps.lines");                                
+        boolean lines = Main.pref.getBoolean("draw.rawgps.lines");
         String linesKey = "draw.rawgps.lines.layer "+name;
         // draw lines, per-layer setting
         if (Main.pref.hasKey(linesKey))
-            lines = Main.pref.getBoolean(linesKey);    
+            lines = Main.pref.getBoolean(linesKey);
         // paint large dots for points
         boolean large = Main.pref.getBoolean("draw.rawgps.large");
@@ -408 +400 @@
         colorModes colored = colorModes.none;
         try {
-            colored = colorModes.values()[Main.pref.getInteger("draw.rawgps.colors", 0)]; 
+            colored = colorModes.values()[Main.pref.getInteger("draw.rawgps.colors", 0)];
         } catch(Exception e) { }
         // paint direction arrow with alternate math. may be faster
-        boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection");    
+        boolean alternatedirection = Main.pref.getBoolean("draw.rawgps.alternatedirection");
         // don't draw arrows nearer to each other than this
-        int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", 0);        
+        int delta = Main.pref.getInteger("draw.rawgps.min-arrow-distance", 0);
         // allows to tweak line coloring for different speed levels.
-        int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", 45); 
+        int colorTracksTune = Main.pref.getInteger("draw.rawgps.colorTracksTune", 45);
         /****************************************************************
          ********** STEP 2a - CHECK CACHE VALIDITY **********************
@@ -460 +452 @@
                                         trkPnt.customColoring = colors[(int) (velColor)];
                                     break;
-                                
+
                                 case dilution:
                                     if(trkPnt.attr.get("hdop") != null) {
@@ -470 +462 @@
                                         trkPnt.customColoring = colors[hdopcolor];
                                     }
-                                    break;                                
+                                    break;
                             }
 
@@ -806 +798 @@
             }
 
-            // FIXME: DownloadTask's "please wait" dialog should display the number of
-            // downloads left, and "cancel" needs to be honoured. An error along the way
-            // should abort the whole process.
-            DownloadTask osmTask = new DownloadOsmTask();
-            for (Rectangle2D td : toDownload) {
-               osmTask.download(null, td.getMinY(), td.getMinX(), td.getMaxY(), td.getMaxX());
-            }
+            new DownloadOsmTaskList().download(false, toDownload);
         }
     }