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

Timestamp:

2016-06-01T00:55:28+02:00 (8 years ago)

Author:

donvip

Message:

sonar - fix many issues

File:

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

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

@@ -14 +14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -38 +39 @@
     private WMSLayer wmsLayer;
     private CadastreInterface wmsInterface;
-    private String svg = null;
-    private static EastNorthBound currentView = null;
-    private EastNorthBound viewBox = null;
+    private String svg;
+    private static EastNorthBound currentView;
+    private EastNorthBound viewBox;
     private static String errorMessage;
 
@@ -82 +83 @@
     @Override
     protected void finish() {
+        // Do nothing
     }
 
@@ -119 +121 @@
                 // check if new node is not already created by another new path
                 Node nearestNewNode = checkNearestNode(nodeToAdd, svgDataSet.getNodes());
-                if (nearestNewNode == nodeToAdd)
+                if (nodeToAdd.equals(nearestNewNode))
                     svgDataSet.addPrimitive(nearestNewNode);
                 wayToAdd.addNode(nearestNewNode); // either a new node or an existing one
@@ -175 +177 @@
         double dy = Double.parseDouble(coor[2]);
         for (int i=3; i<coor.length; i+=2){
-            if (coor[i].equals("")) {
+            if (coor[i].isEmpty()) {
                 eastNorth.clear(); // some paths are just artifacts
                 return;
@@ -197 +199 @@
      * @return the already existing node (if any), otherwise the new node candidate.
      */
-    private Node checkNearestNode(Node nodeToAdd, Collection<Node> nodes) {
+    private static Node checkNearestNode(Node nodeToAdd, Collection<Node> nodes) {
         double epsilon = 0.05; // smallest distance considering duplicate node
         for (Node n : nodes) {
@@ -220 +222 @@
     }
 
-    private URL getURLsvg(EastNorthBound bbox) throws MalformedURLException {
-        String str = new String(wmsInterface.baseURL+"/scpc/wms?version=1.1&request=GetMap");
+    private static URL getURLsvg(EastNorthBound bbox) throws MalformedURLException {
+        String str = CadastreInterface.BASE_URL+"/scpc/wms?version=1.1&request=GetMap";
         str += "&layers=";
         str += "CDIF:LS2";
@@ -243 +245 @@
         wmsInterface.setCookie();
         File file = new File(CadastrePlugin.cacheDir + "building.svg");
-        String svg = new String();
+        String svg = "";
         try (InputStream is = new ProgressInputStream(wmsInterface.urlConn, NullProgressMonitor.INSTANCE)) {
             if (file.exists())
                 file.delete();
             try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file, true));
-                 InputStreamReader isr = new InputStreamReader(is);
+                 InputStreamReader isr = new InputStreamReader(is, StandardCharsets.UTF_8);
                  BufferedReader br = new BufferedReader(isr)) {
-                String line="";
+                String line;
                 while ( null!=(line=br.readLine())){
                     line += "\n";
-                    bos.write(line.getBytes());
+                    bos.write(line.getBytes(StandardCharsets.UTF_8));
                     svg += line;
                 }