Changeset 30859 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.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/CadastreInterface.java (modified) (11 diffs)

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

@@ -115 +115 @@
                 urlConn.connect();
                 if (urlConn.getResponseCode() == HttpURLConnection.HTTP_OK) {
-                    System.out.println("GET "+searchFormURL);
+                    Main.info("GET "+searchFormURL);
                     BufferedReader in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
                     while(in.readLine() != null) {}  // read the buffer otherwise we sent POST too early
@@ -124 +124 @@
                             cookie = cookie.substring(0, cookie.indexOf(";"));
                             cookieTimestamp = new Date().getTime();
-                            System.out.println("received cookie=" + cookie + " at " + new Date(cookieTimestamp));
+                            Main.info("received cookie=" + cookie + " at " + new Date(cookieTimestamp));
                             cookied = true;
                         }
                     }
                 } else {
-                    System.out.println("Request to home page failed. Http error:"+urlConn.getResponseCode()+". Try again "+retries+" times");
+                    Main.warn("Request to home page failed. Http error:"+urlConn.getResponseCode()+". Try again "+retries+" times");
                     CadastrePlugin.safeSleep(3000);
                     retries --;
@@ -135 +135 @@
             }
         } catch (MalformedURLException e) {
-            throw (IOException) new IOException(
-                "Illegal url.").initCause(e);
+            throw new IOException("Illegal url.", e);
         }
     }
@@ -148 +147 @@
         long now = new Date().getTime();
         if ((now - cookieTimestamp) > cCookieExpiration) {
-            System.out.println("cookie received at "+new Date(cookieTimestamp)+" expired (now is "+new Date(now)+")");
+            Main.info("cookie received at "+new Date(cookieTimestamp)+" expired (now is "+new Date(now)+")");
             return true;
         }
@@ -222 +221 @@
                 throw new IOException("Cannot open Cadastre interface. GET response:"+urlConn.getResponseCode());
             }
-            System.out.println("GET "+interfaceURL);
+            Main.info("GET "+interfaceURL);
             BufferedReader in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
             // read the buffer otherwise we sent POST too early
@@ -305 +304 @@
                     lines = lines.substring(lines.indexOf(cInterfaceVector),lines.length());
                     lines = lines.substring(0, lines.indexOf("'"));
-                    System.out.println("interface ref.:"+lines);
+                    Main.info("interface ref.:"+lines);
                     return lines;
                 } else if (wmsLayer.isRaster() && lines.indexOf(cInterfaceRasterTA) != -1) { // "afficherCarteTa.do"
@@ -320 +319 @@
                                 wmsLayer.setCodeCommune(listOfFeuilles.elementAt(res).ref);
                                 lines = buildRasterFeuilleInterfaceRef(listOfFeuilles.elementAt(res).ref);
-                                System.out.println("interface ref.:"+lines);
+                                Main.info("interface ref.:"+lines);
                                 return lines;
                             }
@@ -351 +350 @@
                     String lov = new String(input.substring(i+c0ptionListStart.length()-1, j));
                     if (lov.indexOf(">") != -1) {
-                        System.out.println("parse "+lov);
+                        Main.info("parse "+lov);
                         listOfCommunes.add(lov);
                     } else
-                        System.err.println("unable to parse commune string:"+lov);
+                        Main.error("unable to parse commune string:"+lov);
                 }
                 input = input.substring(j+cOptionListEnd.length());
@@ -481 +480 @@
             throw new IOException("Cannot get Cadastre response.");
         }
-        System.out.println("GET "+searchFormURL);
+        Main.info("GET "+searchFormURL);
         try (BufferedReader in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()))) {
             while ((ln = in.readLine()) != null) {
@@ -541 +540 @@
 //                wmsLayer.Y0 = Y0;
 //            }
-//            System.out.println("parse georef:"+unknown_yet+","+angle+","+scale_origin+","+dpi+","+fX+","+
+//            Main.info("parse georef:"+unknown_yet+","+angle+","+scale_origin+","+dpi+","+fX+","+
 //                    fY+","+X0+","+Y0);
 //        }
@@ -550 +549 @@
             for (Layer l : Main.map.mapView.getAllLayers()) {
                 if (l instanceof WMSLayer && l.getName().equals(wmsLayer.getName()) && (l != wmsLayer)) {
-                    System.out.println("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
+                        Main.info("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
                     // remove the duplicated layer
                     Main.main.removeLayer(wmsLayer);