From 1c1638649045fc2e44106cce895371bd5ae4a0ac Mon Sep 17 00:00:00 2001 From: jendave Date: Fri, 9 Sep 2011 16:16:01 +0000 Subject: [PATCH] checkstyle --- src/main/java/treeProperties/TreeProperties.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/treeProperties/TreeProperties.java b/src/main/java/treeProperties/TreeProperties.java index 2ed1ca2b57a..8a27398407b 100644 --- a/src/main/java/treeProperties/TreeProperties.java +++ b/src/main/java/treeProperties/TreeProperties.java @@ -328,8 +328,8 @@ public class TreeProperties implements Iterable { checkQueryKey(key); //first, try the key in the current file, as if there were no slash //No subpath - either directly in the properties... - Object result; - if ((result = properties.get(key + suffix)) != null) { + Object result = properties.get(key + suffix); + if (result != null) { return result; } @@ -339,7 +339,8 @@ public class TreeProperties implements Iterable { for (Entry entry : properties.entrySet()) { if (entry.getKey().endsWith("--" + TRANSPARENT)) { TreeProperties p = (TreeProperties) entry.getValue(); - if ((result = p.getProperty(key, suffix, false)) != null) { + result = p.getProperty(key, suffix, false); + if (result != null) { return result; } } @@ -357,7 +358,8 @@ public class TreeProperties implements Iterable { if (p == null) { continue; } - if ((result = p.getProperty(second, suffix, false)) != null) { + result = p.getProperty(second, suffix, false); + if (result != null) { return result; } }