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

Timestamp:

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

Author:

donvip

Message:

sonar - fix many issues

File:

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

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

@@ -14 +14 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -43 +44 @@
     private WMSLayer wmsLayer;
     private CadastreInterface wmsInterface;
-    private String svg = null;
-    private EastNorthBound viewBox = null;
+    private String svg;
+    private EastNorthBound viewBox;
     private static String errorMessage;
 
@@ -88 +89 @@
     @Override
     protected void finish() {
+        // Do nothing
     }
 
@@ -168 +170 @@
     private String grabBoundary(EastNorthBound bbox) throws IOException, OsmTransferException {
         try {
-            URL url = null;
-            url = getURLsvg(bbox);
-            return grabSVG(url);
+            return grabSVG(getURLsvg(bbox));
         } catch (MalformedURLException e) {
             throw (IOException) new IOException(tr("CadastreGrabber: Illegal url.")).initCause(e);
@@ -176 +176 @@
     }
 
-    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:COMMUNE";
@@ -198 +198 @@
         wmsInterface.setCookie();
         File file = new File(CadastrePlugin.cacheDir + "boundary.svg");
-        String svg = new String();
+        String svg = "";
         try (InputStream is = new ProgressInputStream(wmsInterface.urlConn, NullProgressMonitor.INSTANCE)) {
             if (file.exists())
@@ -205 +205 @@
                  InputStreamReader isr =new InputStreamReader(is);
                  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;
                 }
@@ -219 +219 @@
 
     public static void download(WMSLayer wmsLayer) {
-        if (CadastrePlugin.autoSourcing == false) {
+        if (!CadastrePlugin.autoSourcing) {
             JOptionPane.showMessageDialog(Main.parent,
                     tr("Please, enable auto-sourcing and check cadastre millesime."));
@@ -228 +228 @@
             JOptionPane.showMessageDialog(Main.parent, errorMessage);
     }
-
 }