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

Timestamp:

2010-01-10T15:46:08+01:00 (15 years ago)

Author:

pieren

Message:

Various minor improvements. More bboxes data in the cache. New cache format v3.

File:

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

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

@@ -49 +49 @@
     private Lock imagesLock = new ReentrantLock();
 
+    public boolean isCachePipeEmpty() {
+        imagesLock.lock();
+        boolean ret = imagesToSave.isEmpty();
+        imagesLock.unlock();
+        return ret;
+    }
+    
     public CacheControl(WMSLayer wmsLayer) {
         cacheEnabled = Main.pref.getBoolean("cadastrewms.enableCaching", true);
@@ -171 +178 @@
         for (;;) {
             imagesLock.lock();
-            // copy locally the images to save for better performance
-            ArrayList<GeorefImage> images = new ArrayList<GeorefImage>(imagesToSave);
-            imagesToSave.clear();
+            //ArrayList<GeorefImage> images = new ArrayList<GeorefImage>(imagesToSave);
+            int size = imagesToSave.size();
             imagesLock.unlock();
-            if (images != null && !images.isEmpty()) {
+            if (size > 0) {
                 String extension = String.valueOf((wmsLayer.getLambertZone() + 1));
                 if (Main.proj instanceof LambertCC9Zones)
@@ -186 +192 @@
                         ObjectOutputStreamAppend oos = new ObjectOutputStreamAppend(
                                 new BufferedOutputStream(new FileOutputStream(file, true)));
-                        for (GeorefImage img : images) {
-                            oos.writeObject(img);
+                        for (int i=0; i < size; i++) {
+                            oos.writeObject(imagesToSave.get(i));
                         }
                         oos.close();
@@ -194 +200 @@
                                 new BufferedOutputStream(new FileOutputStream(file)));
                         wmsLayer.write(oos);
-                        for (GeorefImage img : images) {
-                            oos.writeObject(img);
+                        for (int i=0; i < size; i++) {
+                            oos.writeObject(imagesToSave.get(i));
                         }
                         oos.close();
@@ -202 +208 @@
                     e.printStackTrace(System.out);
                 }
+                imagesLock.lock();
+                for (int i=0; i < size; i++) {
+                    imagesToSave.remove(0);
+                }
+                imagesLock.unlock();
             }
             try {wait();} catch (InterruptedException e) {