Changeset 4065 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2011-05-01T21:56:49+02:00 (13 years ago)

Author:

jttt

Message:

Improved wms cache

• files saved in original format (no need to recode to png)
• possibility to tile with different pos/ppd that overlaps current tile

File:

• trunk/src/org/openstreetmap/josm/tools/Utils.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -3 +3 @@
 
 import java.awt.Color;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Collection;
 
@@ -15 +19 @@
     }
 
-    public static <T> boolean exists(Iterable collection, Class<? extends T> klass) {
+    public static <T> boolean exists(Iterable<T> collection, Class<? extends T> klass) {
         for (Object item : collection) {
             if (klass.isInstance(item))
@@ -31 +35 @@
     }
 
-    public static <T> T find(Iterable collection, Class<? extends T> klass) {
+    @SuppressWarnings("unchecked")
+    public static <T> T find(Iterable<? super T> collection, Class<? extends T> klass) {
         for (Object item : collection) {
-            if (klass.isInstance(item)) {
-                @SuppressWarnings("unchecked") T res = (T) item;
-                return res;
-            }
+            if (klass.isInstance(item))
+                return (T) item;
         }
         return null;
@@ -60 +63 @@
             return b;
         } else {
-            if (a < c) {
+            if (a < c)
                 return a;
-            }
             return c;
         }
@@ -160 +162 @@
     }
 
+
+    public static int copyStream(InputStream source, OutputStream destination) throws IOException {
+        int count = 0;
+        byte[] b = new byte[512];
+        int read;
+        while ((read = source.read(b)) != -1) {
+            count += read;
+            destination.write(b, 0, read);
+        }
+        return count;
+    }
+
+
+
     public static Color complement(Color clr) {
         return new Color(255 - clr.getRed(), 255 - clr.getGreen(), 255 - clr.getBlue(), clr.getAlpha());
     }
+
+    public static boolean deleteDirectory(File path) {
+        if( path.exists() ) {
+            File[] files = path.listFiles();
+            for(int i=0; i<files.length; i++) {
+                if(files[i].isDirectory()) {
+                    deleteDirectory(files[i]);
+                }
+                else {
+                    files[i].delete();
+                }
+            }
+        }
+        return( path.delete() );
+    }
 }