Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up some raw types. 

May need to adjust some types if lookup() is made generic (see LANG-564)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@890360 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2009-12-14 15:06:14 +00:00
parent 8f80cedd8c
commit db9b110a7e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java/org/apache/commons/lang3/text/StrLookup.java
View File

@ -40,16 +40,19 @@ public abstract class StrLookup<V> {
/** /**
* Lookup that always returns null. * Lookup that always returns null.
*/ */
private static final StrLookup<?> NONE_LOOKUP; private static final StrLookup<String> NONE_LOOKUP;
/** /**
* Lookup that uses System properties. * Lookup that uses System properties.
*/ */
private static final StrLookup<Object> SYSTEM_PROPERTIES_LOOKUP; private static final StrLookup<String> SYSTEM_PROPERTIES_LOOKUP;
static { static {
NONE_LOOKUP = new MapStrLookup(null); NONE_LOOKUP = new MapStrLookup<String>(null);
StrLookup lookup = null; StrLookup<String> lookup = null;
try { try {
lookup = new MapStrLookup(System.getProperties()); final Map<?, ?> propMap = System.getProperties();
@SuppressWarnings("unchecked") // System property keys and values are always Strings
final Map<String, String> properties = (Map<String, String>) propMap;
lookup = new MapStrLookup<String>(properties);
} catch (SecurityException ex) { } catch (SecurityException ex) {
lookup = NONE_LOOKUP; lookup = NONE_LOOKUP;
} }
@ -77,7 +80,7 @@ public abstract class StrLookup<V> {
* *
* @return a lookup using system properties, not null * @return a lookup using system properties, not null
*/ */
public static StrLookup<Object> systemPropertiesLookup() { public static StrLookup<String> systemPropertiesLookup() {
return SYSTEM_PROPERTIES_LOOKUP; return SYSTEM_PROPERTIES_LOOKUP;
} }
@ -90,7 +93,7 @@ public abstract class StrLookup<V> {
* @param map the map of keys to values, may be null * @param map the map of keys to values, may be null
* @return a lookup using the map, not null * @return a lookup using the map, not null
*/ */
public static <V> StrLookup mapLookup(Map<String, V> map) { public static <V> StrLookup<V> mapLookup(Map<String, V> map) {
return new MapStrLookup<V>(map); return new MapStrLookup<V>(map);
} }
@ -124,7 +127,7 @@ public abstract class StrLookup<V> {
/** /**
* Lookup implementation that uses a Map. * Lookup implementation that uses a Map.
*/ */
static class MapStrLookup<V> extends StrLookup { static class MapStrLookup<V> extends StrLookup<V> {
/** Map keys are variable names and value. */ /** Map keys are variable names and value. */
private final Map<String, V> map; private final Map<String, V> map;