antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Make sub-properties updateable, plus minor code cleanup.

Browse source
This commit is contained in:
hns 2008-10-17 09:10:34 +00:00
parent 2c2f95253f
commit e827d0beb4
1 changed files with 41 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/helma/util/ResourceProperties.java
View file

@ -59,6 +59,12 @@ public class ResourceProperties extends Properties {
// lower case key to original key mapping for case insensitive lookups // lower case key to original key mapping for case insensitive lookups
private Properties keyMap = new Properties(); private Properties keyMap = new Properties();
// prefix for sub-properties
private String prefix;
// parent properties for sub-properties
private ResourceProperties parentProperties;
/** /**
* Constructs an empty ResourceProperties * Constructs an empty ResourceProperties
* Resources must be added manually afterwards * Resources must be added manually afterwards
@ -123,6 +129,22 @@ public class ResourceProperties extends Properties {
forceUpdate(); forceUpdate();
} }
/**
* Constructs a properties object containing all entries where the key matches
* the given string prefix from the source map to the target map, cutting off
* the prefix from the original key.
* @see #getSubProperties(String)
* @param parentProperties the parent properties
* @param prefix the property name prefix
*/
private ResourceProperties(ResourceProperties parentProperties, String prefix) {
this.parentProperties = parentProperties;
this.prefix = prefix;
resources = new HashSet();
setIgnoreCase(parentProperties.ignoreCase);
forceUpdate();
}
/** /**
* Updates the properties regardless of an actual need * Updates the properties regardless of an actual need
*/ */
@ -208,6 +230,21 @@ public class ResourceProperties extends Properties {
} }
} }
// if these are subproperties, reload them from the parent properties
if (parentProperties != null && prefix != null) {
parentProperties.update();
Iterator it = parentProperties.entrySet().iterator();
int prefixLength = prefix.length();
while (it.hasNext()) {
Map.Entry entry = (Map.Entry) it.next();
String key = entry.getKey().toString();
if (key.regionMatches(ignoreCase, 0, prefix, 0, prefixLength)) {
temp.put(key.substring(prefixLength), entry.getValue());
}
}
}
// at last we try to load properties from the resource list // at last we try to load properties from the resource list
if (resources != null) { if (resources != null) {
Iterator iterator = resources.iterator(); Iterator iterator = resources.iterator();
@ -247,25 +284,13 @@ public class ResourceProperties extends Properties {
* against the prefix. * against the prefix.
* *
* @param prefix the string prefix to match against * @param prefix the string prefix to match against
* @return a new subproperties instance
*/ */
public ResourceProperties getSubProperties(String prefix) { public ResourceProperties getSubProperties(String prefix) {
if (prefix == null) if (prefix == null) {
throw new NullPointerException("prefix"); throw new NullPointerException("prefix");
if ((System.currentTimeMillis() - lastCheck) > CACHE_TIME) {
update();
} }
ResourceProperties subprops = new ResourceProperties(); return new ResourceProperties(this, prefix);
subprops.setIgnoreCase(ignoreCase);
Iterator it = entrySet().iterator();
int prefixLength = prefix.length();
while (it.hasNext()) {
Map.Entry entry = (Map.Entry) it.next();
String key = entry.getKey().toString();
if (key.regionMatches(ignoreCase, 0, prefix, 0, prefixLength)) {
subprops.put(key.substring(prefixLength), entry.getValue());
}
}
return subprops;
} }
/** /**
@ -322,7 +347,7 @@ public class ResourceProperties extends Properties {
if (strkey == null) if (strkey == null)
return null; return null;
} }
return (String) super.get(strkey); return super.get(strkey);
} }
/** /**