X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FIOUtils.java;h=4a185c6386ba31b84a474540f82d78aa25d691dc;hb=7ee9568bee3caddfb837007dda09460acc145177;hp=1b70b0e783cee077af91067a07e792b6eb5af993;hpb=16d593780fa5a4c39cc36b29382da610eae951da;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/IOUtils.java b/src/be/nikiroo/utils/IOUtils.java index 1b70b0e..4a185c6 100644 --- a/src/be/nikiroo/utils/IOUtils.java +++ b/src/be/nikiroo/utils/IOUtils.java @@ -5,7 +5,6 @@ import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -203,20 +202,15 @@ public class IOUtils { * the target to delete */ public static void deltree(File target) { - for (File file : target.listFiles()) { - if (file.isDirectory()) { + File[] files = target.listFiles(); + if (files != null) { + for (File file : files) { deltree(file); - } else { - if (!file.delete()) { - System.err.println("Cannot delete file: " - + file.getAbsolutePath()); - } } } if (!target.delete()) { - System.err.println("Cannot delete file: " - + target.getAbsolutePath()); + System.err.println("Cannot delete: " + target.getAbsolutePath()); } } @@ -330,31 +324,6 @@ public class IOUtils { return image; } - /** - * Return the version of the program if it follows the VERSION convention - * (i.e., if it has a file called VERSION containing the version as a - * {@link String} on its binary root). - * - * @return the version, or NULL - */ - public static String getVersion() { - String version = null; - - InputStream in = openResource("VERSION"); - if (in != null) { - try { - ByteArrayOutputStream ba = new ByteArrayOutputStream(); - write(in, ba); - in.close(); - - version = ba.toString("UTF-8"); - } catch (IOException e) { - } - } - - return version; - } - /** * Open the given /-separated resource (from the binary root). *