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

Timestamp:

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

Author:

donvip

Message:

sonar - fix many issues

File:

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

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

@@ -13 +13 @@
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.concurrent.Callable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -33 +34 @@
 public class CacheControl implements Runnable {
 
-    public static final String cLambertCC9Z = "CC";
-
-    public static final String cUTM20N = "UTM";
-
-    public class ObjectOutputStreamAppend extends ObjectOutputStream {
+    public static final String C_LAMBERT_CC_9Z = "CC";
+
+    public static final String C_UTM20N = "UTM";
+
+    public static class ObjectOutputStreamAppend extends ObjectOutputStream {
         public ObjectOutputStreamAppend(OutputStream out) throws IOException {
             super(out);
@@ -51 +52 @@
     public static int cacheSize = 500;
 
-    public WMSLayer wmsLayer = null;
+    public WMSLayer wmsLayer;
 
     private ArrayList<GeorefImage> imagesToSave = new ArrayList<>();
@@ -79 +80 @@
     }
 
-    private void checkDirSize(File path) {
+    private static void checkDirSize(File path) {
         if (cacheSize != 0) {
             long size = 0;
@@ -105 +106 @@
             CadastrePlugin.askToChangeProjection();
         }
-        try {
-            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension());
-            if (file.exists()) {
-                JOptionPane pane = new JOptionPane(
-                        tr("Location \"{0}\" found in cache.\n"+
-                        "Load cache first ?\n"+
-                        "(No = new cache)", wmsLayer.getName()),
-                        JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION, null);
-                // this below is a temporary workaround to fix the "always on top" issue
-                JDialog dialog = pane.createDialog(Main.parent, tr("Select Feuille"));
-                CadastrePlugin.prepareDialog(dialog);
-                dialog.setVisible(true);
-                int reply = (Integer)pane.getValue();
-                // till here
-
-                if (reply == JOptionPane.OK_OPTION && loadCache(file, wmsLayer.getLambertZone())) {
-                    return true;
-                } else {
-                    delete(file);
-                }
-            }
-        } catch (Exception e) {
-            Main.error(e);
+        File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension());
+        if (file.exists()) {
+            int reply = GuiHelper.runInEDTAndWaitAndReturn(new Callable<Integer>() {
+                @Override
+                public Integer call() throws Exception {
+                    JOptionPane pane = new JOptionPane(
+                            tr("Location \"{0}\" found in cache.\n"+
+                            "Load cache first ?\n"+
+                            "(No = new cache)", wmsLayer.getName()),
+                            JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION, null);
+                    // this below is a temporary workaround to fix the "always on top" issue
+                    JDialog dialog = pane.createDialog(Main.parent, tr("Select Feuille"));
+                    CadastrePlugin.prepareDialog(dialog);
+                    dialog.setVisible(true);
+                    return (Integer)pane.getValue();
+                    // till here
+                }
+            });
+
+            if (reply == JOptionPane.OK_OPTION && loadCache(file, wmsLayer.getLambertZone())) {
+                return true;
+            } else {
+                delete(file);
+            }
         }
         return false;
@@ -133 +135 @@
 
     public void deleteCacheFile() {
-        try {
-            delete(new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension()));
-        } catch (Exception e) {
-            Main.error(e);
-        }
-    }
-
-    private void delete(File file) {
+        delete(new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension()));
+    }
+
+    private static void delete(File file) {
         Main.info("Delete file "+file);
         if (file.exists())
@@ -155 +153 @@
         ) {
             successfulRead = wmsLayer.read(file, ois, currentLambertZone);
-        } catch (Exception ex) {
+        } catch (IOException | ClassNotFoundException ex) {
             Main.error(ex);
             GuiHelper.runInEDTAndWait(new Runnable() {
@@ -176 +174 @@
         imagesLock.lock();
         this.imagesToSave.add(image);
-        this.notify();
+        this.notifyAll();
         imagesLock.unlock();
     }
@@ -224 +222 @@
 
     private String WMSFileExtension() {
-        String ext = String.valueOf((wmsLayer.getLambertZone() + 1));
+        String ext = String.valueOf(wmsLayer.getLambertZone() + 1);
         if (CadastrePlugin.isLambert_cc9())
-            ext = cLambertCC9Z + ext;
+            ext = C_LAMBERT_CC_9Z + ext;
         else if (CadastrePlugin.isUtm_france_dom())
-            ext = cUTM20N + ext;
+            ext = C_UTM20N + ext;
         return ext;
     }