Ticket #1967: supressErrorMessage.patch

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

@@ -19 +19 @@
 import org.xml.sax.SAXException;
 
 public class DownloadGpsTask implements DownloadTask {
-
+    private boolean silent=false;
+  
     private static class Task extends PleaseWaitRunnable {
         private BoundingBoxDownloader reader;
         private GpxData rawData;
         private final boolean newLayer;
 
-        public Task(boolean newLayer, BoundingBoxDownloader reader) {
-            super(tr("Downloading GPS data"));
+        public Task(boolean newLayer, BoundingBoxDownloader reader, boolean silent) {
+            super(tr("Downloading GPS data"), silent);
             this.reader = reader;
             this.newLayer = newLayer;
         }
@@ -69 +70 @@
     private JCheckBox checkBox = new JCheckBox(tr("Raw GPS data"));
 
     public void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon) {
-        Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
+        Task task = new Task(action.dialog.newLayer.isSelected(), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), silent);
         Main.worker.execute(task);
     }
 
     public JCheckBox getCheckBox() {
         return checkBox;
     }
+    
+    public void setSilent(boolean silent) {
+        this.silent=silent;
+    }
 
     public String getPreferencesSuffix() {
         return "gps";

src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -29 +29 @@
 public class DownloadOsmTask implements DownloadTask {
 
     private static Bounds currentBounds;
+    private boolean silent=false;
 
     private static class Task extends PleaseWaitRunnable {
         private OsmServerReader reader;
         private DataSet dataSet;
         private boolean newLayer;
 
-        public Task(boolean newLayer, OsmServerReader reader) {
-            super(tr("Downloading data"));
+        public Task(boolean newLayer, OsmServerReader reader, boolean silent) {
+            super(tr("Downloading data"), silent);
             this.reader = reader;
             this.newLayer = newLayer;
         }
@@ -80 +81 @@
             double t = minlon; minlon = maxlon; maxlon = t;
         }
 
-        Task task = new Task(action != null && (action.dialog == null || action.dialog.newLayer.isSelected()), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon));
+        Task task = new Task(action != null && (action.dialog == null || action.dialog.newLayer.isSelected()), new BoundingBoxDownloader(minlat, minlon, maxlat, maxlon), silent);
         currentBounds = new Bounds(new LatLon(minlat, minlon), new LatLon(maxlat, maxlon));
         Main.worker.execute(task);
     }
 
     public void loadUrl(boolean new_layer, String url) {
-        Task task = new Task(new_layer, new OsmServerLocationReader(url));
+        Task task = new Task(new_layer, new OsmServerLocationReader(url), silent);
         Main.worker.execute(task);
     }
-
-
-
+    
+    public void setSilent(boolean silent) {
+      this.silent=silent;
+    }
 
     public JCheckBox getCheckBox() {
         return checkBox;

src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -44 +44 @@
          */
         void download(DownloadAction action, double minlat, double minlon, double maxlat, double maxlon);
         void loadUrl(boolean newLayer, String url);
+        void setSilent(boolean silent);
         /**
          * @return The checkbox presented to the user
          */

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

@@ -877 +877 @@
             // downloads left, and "cancel" needs to be honoured. An error along the way
             // should abort the whole process.
             DownloadTask osmTask = new DownloadOsmTask();
+            osmTask.setSilent(true);
             for (Rectangle2D td : toDownload) {
                osmTask.download(null, td.getMinY(), td.getMinX(), td.getMaxY(), td.getMaxX());
             }

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

@@ -29 +29 @@
 
     private boolean closeDialogCalled = false;
     private boolean cancelled = false;
+    private boolean silent = false;
 
     private final String title;
 
     /**
      * Create the runnable object with a given message for the user.
      */
-    public PleaseWaitRunnable(String title) {
+    public PleaseWaitRunnable(String title, boolean silent) {
         this.title = title;
+        this.silent = silent;
         Main.pleaseWaitDlg.cancel.addActionListener(new ActionListener(){
             public void actionPerformed(ActionEvent e) {
                 if (!cancelled) {
@@ -130 +132 @@
                         Main.pleaseWaitDlg.setVisible(false);
                         Main.pleaseWaitDlg.dispose();
                     }
-                    if (errorMessage != null)
-                        JOptionPane.showMessageDialog(Main.parent, errorMessage);
+                    if (errorMessage != null) {
+                        if(silent)
+                            System.out.println(errorMessage);
+                        else
+                            JOptionPane.showMessageDialog(Main.parent, errorMessage);
+                    }
                 }
             };