Author: dgolovin Date: 2011-08-05 20:20:20 -0400 (Fri, 05 Aug 2011) New Revision: 33647 Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java Log: Code cleanup, not needed null checks were removed Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2011-08-06 00:17:32 UTC (rev 33646) +++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/FileUtil.java 2011-08-06 00:20:20 UTC (rev 33647) @@ -348,19 +348,26 @@ os.flush(); } - public static void clear(File f) { - if(!f.isDirectory()) return; - File[] fs = f.listFiles(); - if(fs != null) for (int i = 0; i < fs.length; i++) remove(fs[i]); - } + public static void clear(File f) { + if (f.isDirectory()) { + File[] fs = f.listFiles(); + for (int i = 0; i < fs.length; i++) { + remove(fs[i]); + } + } + } - public static void remove(File f) { - if(f.isFile()) f.delete(); - if(!f.isDirectory()) return; - File[] fs = f.listFiles(); - if(fs != null) for (int i = 0; i < fs.length; i++) remove(fs[i]); - f.delete(); - } + public static void remove(File f) { + if (f.isFile()) { + f.delete(); + } else if (f.isDirectory()) { + File[] fs = f.listFiles(); + for (int i = 0; i < fs.length; i++) { + remove(fs[i]); + } + f.delete(); + } + } public static boolean isSameFile(File f) { if(!f.exists()) return false;