external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkstyle

Browse Source
This commit is contained in:
jendave
2011-09-09 16:16:01 +00:00
parent fc7b732dea
commit 1c16386490
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/treeProperties/TreeProperties.java
View File

@@ -328,8 +328,8 @@ public class TreeProperties implements Iterable<PropertyElement> {
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<PropertyElement> {
for (Entry<String, Object> 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<PropertyElement> {
if (p == null) {
continue;
}
if ((result = p.getProperty(second, suffix, false)) != null) {
result = p.getProperty(second, suffix, false);
if (result != null) {
return result;
}
}