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

Timestamp:

2010-03-09T22:02:00+01:00 (15 years ago)

Author:

pieren

Message:

Many small fixes and improvements

File:

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

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

@@ -94 +94 @@
     public boolean loadCacheIfExist() {
         try {
-            String extension = String.valueOf((wmsLayer.getLambertZone() + 1));
-            if (Main.proj instanceof LambertCC9Zones)
-                extension = cLambertCC9Z + extension;
-            else if (Main.proj instanceof UTM_20N_France_DOM)
-                extension = cUTM20N + extension;
-            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
+            File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension());
             if (file.exists()) {
                 JOptionPane pane = new JOptionPane(
@@ -127 +122 @@
     public void deleteCacheFile() {
         try {
-            String extension = String.valueOf((wmsLayer.getLambertZone() + 1));
-            if (Main.proj instanceof LambertCC9Zones)
-                extension = cLambertCC9Z + extension;
-            delete(new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension));
+            delete(new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension()));
         } catch (Exception e) {
             e.printStackTrace(System.out);
@@ -182 +174 @@
             imagesLock.unlock();
             if (size > 0) {
-                String extension = String.valueOf((wmsLayer.getLambertZone() + 1));
-                if (Main.proj instanceof LambertCC9Zones)
-                    extension = cLambertCC9Z + extension;
-                else if (Main.proj instanceof UTM_20N_France_DOM)
-                    extension = cUTM20N + extension;
-                File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + extension);
+                File file = new File(CadastrePlugin.cacheDir + wmsLayer.getName() + "." + WMSFileExtension());
                 try {
                     if (file.exists()) {
@@ -219 +206 @@
         }
     }
+    
+    private String WMSFileExtension() {
+        String ext = String.valueOf((wmsLayer.getLambertZone() + 1));
+        if (Main.proj instanceof LambertCC9Zones)
+            ext = cLambertCC9Z + ext;
+        else if (Main.proj instanceof UTM_20N_France_DOM)
+            ext = cUTM20N + ext;
+        return ext;
+    }
+
 }