Changeset 30859 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java

Timestamp:

2014-12-19T17:12:01+01:00 (10 years ago)

Author:

donvip

Message:

[josm_cadastre-fr] replace calls to System.out/err by calls to Main.info/warn/error

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java (modified) (10 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java

@@ -28 +28 @@
 
     private CacheControl cacheControl = null;
-    
+
     private EastNorthBound currentGrabImage;
 
@@ -34 +34 @@
 
     /**
-     * Call directly grabber for raster images or prepare thread for vector images 
+     * Call directly grabber for raster images or prepare thread for vector images
      * @param moreImages
      */
@@ -44 +44 @@
             this.notify();
         }
-        System.out.println("Added " + moreImages.size() + " to the grab thread");
+        Main.info("Added " + moreImages.size() + " to the grab thread");
         if (wmsLayer.isRaster()) {
             waitNotification();
@@ -56 +56 @@
         return size;
     }
-    
+
     public ArrayList<EastNorthBound> getImagesToGrabCopy() {
-        ArrayList<EastNorthBound> copyList = new ArrayList<>(); 
+        ArrayList<EastNorthBound> copyList = new ArrayList<>();
         lockImagesToGrag.lock();
         for (EastNorthBound img : imagesToGrab) {
@@ -67 +67 @@
         return copyList;
     }
-    
-    public void clearImagesToGrab() {        
+
+    public void clearImagesToGrab() {
         lockImagesToGrag.lock();
         imagesToGrab.clear();
         lockImagesToGrag.unlock();
     }
-    
+
     @Override
     public void run() {
@@ -92 +92 @@
                         newImage = grabber.grab(wmsLayer, currentGrabImage.min, currentGrabImage.max);
                     } catch (IOException e) {
-                        System.out
-                                .println("Download action canceled by user or server did not respond");
+                        Main.warn("Download action canceled by user or server did not respond");
                         setCanceled(true);
                         break;
                     } catch (OsmTransferException e) {
-                        System.out.println("OSM transfer failed");
+                        Main.error("OSM transfer failed");
                         setCanceled(true);
                         break;
                     }
                     if (grabber.getWmsInterface().downloadCanceled) {
-                        System.out.println("Download action canceled by user");
+                        Main.info("Download action canceled by user");
                         setCanceled(true);
                         break;
                     }
                     try {
-                    if (CadastrePlugin.backgroundTransparent) {
-                        wmsLayer.imagesLock.lock();
-                        for (GeorefImage img : wmsLayer.getImages()) {
-                            if (img.overlap(newImage))
-                                // mask overlapping zone in already grabbed image
-                                img.withdraw(newImage);
-                            else
-                                // mask overlapping zone in new image only when new image covers completely the 
-                                // existing image
-                                newImage.withdraw(img);
-                        }
-                        wmsLayer.imagesLock.unlock();
-                    }
-                    wmsLayer.addImage(newImage);
-                    Main.map.mapView.repaint();
-                    saveToCache(newImage);
+                            if (CadastrePlugin.backgroundTransparent) {
+                                wmsLayer.imagesLock.lock();
+                                for (GeorefImage img : wmsLayer.getImages()) {
+                                    if (img.overlap(newImage))
+                                        // mask overlapping zone in already grabbed image
+                                        img.withdraw(newImage);
+                                    else
+                                        // mask overlapping zone in new image only when new image covers completely the
+                                        // existing image
+                                        newImage.withdraw(img);
+                                }
+                                wmsLayer.imagesLock.unlock();
+                            }
+                            wmsLayer.addImage(newImage);
+                            Main.map.mapView.repaint();
+                            saveToCache(newImage);
                     } catch (NullPointerException e) {
-                        System.out.println("Layer destroyed. Cancel grab thread");
+                        Main.info("Layer destroyed. Cancel grab thread");
                         setCanceled(true);
                     }
                 }
             }
-            System.out.println("grab thread list empty");
+            Main.info("grab thread list empty");
             lockCurrentGrabImage.lock();
             currentGrabImage = null;
@@ -163 +162 @@
         if (cacheControl != null) {
             while (!cacheControl.isCachePipeEmpty()) {
-                System.out
-                        .println("Try to close a WMSLayer which is currently saving in cache : wait 1 sec.");
+                Main.info("Try to close a WMSLayer which is currently saving in cache : wait 1 sec.");
                 CadastrePlugin.safeSleep(1000);
             }
@@ -193 +191 @@
         lockCurrentGrabImage.unlock();
     }
-    
+
     private void paintBox(Graphics g, MapView mv, EastNorthBound img, Color color) {
         Point[] croppedPoint = new Point[5];
@@ -206 +204 @@
         }
     }
-    
+
     public boolean isCanceled() {
         return canceled;
@@ -231 +229 @@
             wait();
         } catch (InterruptedException e) {
-            e.printStackTrace(System.out);
-        }
-    }
-
+            Main.error(e);
+        }
+    }
 }