From: Adrian Goerler Date: Wed, 6 Jul 2011 08:29:56 +0000 (+0200) Subject: Cleanup curly braces X-Git-Tag: v1.1.0.201109011030-rc2~45^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2062d623e3c9190b27ea5c03e098c6eba0b75fdd;p=jgit.git Cleanup curly braces Change-Id: I2de6439a3ad951a99d89e4aee02006c745d16510 Signed-off-by: Adrian Goerler --- diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index 8ed51fb908..6e74a04563 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -217,29 +217,23 @@ public abstract class LocalDiskRepositoryTestCase { private static boolean recursiveDelete(final String testName, final File dir, boolean silent, boolean failOnError) { assert !(silent && failOnError); - if (!dir.exists()) { + if (!dir.exists()) return silent; - } final File[] ls = dir.listFiles(); - if (ls != null) { + if (ls != null) for (int k = 0; k < ls.length; k++) { final File e = ls[k]; - if (e.isDirectory()) { + if (e.isDirectory()) silent = recursiveDelete(testName, e, silent, failOnError); - } else { - if (!e.delete()) { - if (!silent) { - reportDeleteFailure(testName, failOnError, e); - } - silent = !failOnError; - } + else if (!e.delete()) { + if (!silent) + reportDeleteFailure(testName, failOnError, e); + silent = !failOnError; } } - } if (!dir.delete()) { - if (!silent) { + if (!silent) reportDeleteFailure(testName, failOnError, dir); - } silent = !failOnError; } return silent; @@ -447,9 +441,8 @@ public abstract class LocalDiskRepositoryTestCase { private static String[] toEnvArray(final Map env) { final String[] envp = new String[env.size()]; int i = 0; - for (Map.Entry e : env.entrySet()) { + for (Map.Entry e : env.entrySet()) envp[i++] = e.getKey() + "=" + e.getValue(); - } return envp; }