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

Timestamp:

2014-12-19T17:12:01+01:00 (11 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/WMSLayer.java (modified) (12 diffs)

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

@@ -93 +93 @@
 
     private Action cancelGrab;
-    
-    private Action refineGeoRef; 
+
+    private Action refineGeoRef;
 
     @SuppressWarnings("serial")
@@ -107 +107 @@
             Main.map.mapView.repaint();
         }
-        
-    }
-    
+
+    }
+
     public boolean adjustModeEnabled;
 
     public GrabThread grabThread;
-    
+
     public WMSLayer() {
         this(tr("Blank Layer"), "", -1);
@@ -138 +138 @@
         images = null;
         dividedBbox = null;
-        System.out.println("Layer "+location+" destroyed");
+        Main.info("Layer "+location+" destroyed");
     }
 
@@ -173 +173 @@
     /**
      * Divides the bounding box in smaller squares. Their size (and quantity) is configurable in Preferences.
-     * 
+     *
      * @param b      the original bbox, usually the current bbox on screen
      * @param factor 1 = source bbox 1:1
@@ -326 +326 @@
                 cancelGrab,
                 refineGeoRef,
-                resetOffset, 
+                resetOffset,
                 new LayerListPopup.InfoAction(this),
 
@@ -527 +527 @@
             }
         }
-        System.out.println("Cache loaded for location "+location+" with "+images.size()+" images");
+        Main.info("Cache loaded for location "+location+" with "+images.size()+" images");
         return true;
     }
@@ -593 +593 @@
         return communeBBox;
     }
-    
+
     public EastNorthBound getFirstViewFromCacheBBox() {
         if (isRaster) {
@@ -604 +604 @@
         for (GeorefImage image:images){
             min_x = image.min.east() < min_x ? image.min.east() : min_x;
-            max_x = image.max.east() > max_x ? image.max.east() : max_x; 
+            max_x = image.max.east() > max_x ? image.max.east() : max_x;
             min_y = image.min.north() < min_y ? image.min.north() : min_y;
-            max_y = image.max.north() > max_y ? image.max.north() : max_y; 
+            max_y = image.max.north() > max_y ? image.max.north() : max_y;
         }
         EastNorthBound maxGrabbedBBox = new EastNorthBound(new EastNorth(min_x, min_y), new EastNorth(max_x, max_y));
@@ -619 +619 @@
      * Method required by ImageObserver when drawing an image
      */
-    public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
+    @Override
+        public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
         return false;
     }
@@ -690 +691 @@
             img = this.images.get(index);
         } catch (ArrayIndexOutOfBoundsException e) {
-            e.printStackTrace(System.out);
+            Main.error(e);
         }
         imagesLock.unlock();
         return img;
     }
-    
+
     public Vector<GeorefImage> getImages() {
         return this.images;
     }
-    
+
     public void addImage(GeorefImage img) {
         imagesLock.lock();
@@ -705 +706 @@
         imagesLock.unlock();
     }
-    
+
     public void setImages(Vector<GeorefImage> images) {
         imagesLock.lock();
@@ -711 +712 @@
         imagesLock.unlock();
     }
-    
+
     public void clearImages() {
         imagesLock.lock();