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

resolved the excessive "TreeProperties returns null for...", it was a recursive call where null is okay and frequent

Browse Source
This commit is contained in:
jendave
2011-08-06 04:01:33 +00:00
parent b5970064fe
commit 8f2dfd1ddc
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/treeProperties/TreeProperties.java
View File

@@ -246,14 +246,14 @@ public class TreeProperties implements Iterable<PropertyElement> {
* Retrieves the child properties for the given key. Transparent properties can't be retrieved this way. * Retrieves the child properties for the given key. Transparent properties can't be retrieved this way.
*/ */
public TreeProperties getChildProperties(String key) { public TreeProperties getChildProperties(String key) {
return (TreeProperties) getProperty(key, "--" + child); return (TreeProperties) getProperty(key, "--" + child, true);
} }
/** /**
* Retrieves the child properties for the given key. * Retrieves the child properties for the given key.
*/ */
public TreeProperties getTransparentProperties(String key) { public TreeProperties getTransparentProperties(String key) {
return (TreeProperties) getProperty(key, "--" + transparent); return (TreeProperties) getProperty(key, "--" + transparent, true);
} }
/** /**
@@ -267,10 +267,10 @@ public class TreeProperties implements Iterable<PropertyElement> {
PropertyType<?> t = instanceTypes.get(cls); PropertyType<?> t = instanceTypes.get(cls);
suffix = "--" + t.getSuffix(); suffix = "--" + t.getSuffix();
} }
return (T) getProperty(key, suffix); return (T) getProperty(key, suffix, true);
} }
private Object getProperty(String key, String suffix) { private Object getProperty(String key, String suffix, boolean top) {
checkQueryKey(key); checkQueryKey(key);
//first, try the key in the current file, as if there were no slash //first, try the key in the current file, as if there were no slash
//No subpath - either directly in the properties... //No subpath - either directly in the properties...
@@ -283,7 +283,7 @@ public class TreeProperties implements Iterable<PropertyElement> {
for(Entry<String, Object> entry:properties.entrySet()) { for(Entry<String, Object> entry:properties.entrySet()) {
if(entry.getKey().endsWith("--" + transparent)) { if(entry.getKey().endsWith("--" + transparent)) {
TreeProperties p = (TreeProperties) entry.getValue(); TreeProperties p = (TreeProperties) entry.getValue();
if((result = p.getProperty(key, suffix)) != null) { if((result = p.getProperty(key, suffix, false)) != null) {
return result; return result;
} }
} }
@@ -297,16 +297,17 @@ public class TreeProperties implements Iterable<PropertyElement> {
while((index = key.indexOf('/', index + 1)) != -1) { while((index = key.indexOf('/', index + 1)) != -1) {
String first = key.substring(0, index), second = key.substring(index + 1); String first = key.substring(0, index), second = key.substring(index + 1);
TreeProperties p = (TreeProperties) getProperty(first, "--" + child); TreeProperties p = (TreeProperties) getProperty(first, "--" + child, false);
if(p == null) continue; if(p == null) continue;
if((result = p.getProperty(second, suffix)) != null) { if((result = p.getProperty(second, suffix, false)) != null) {
return result; return result;
} }
} }
Exception ex= if(top) {
new Exception("TreeProperties returns null for " + key + suffix); Exception ex = new Exception("TreeProperties returns null for " + key + suffix);
// ex.printStackTrace(); // ex.printStackTrace();
System.err.println(ex); System.err.println(ex);
}
return null; return null;
} }