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

Fix raw types 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@902944 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2010-01-25 19:32:08 +00:00
parent 99d54a9167
commit d0b2568ee1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
View File

@ -119,7 +119,7 @@ public class StrSubstitutor {
/** /**
* Variable resolution is delegated to an implementor of VariableResolver. * Variable resolution is delegated to an implementor of VariableResolver.
*/ */
private StrLookup variableResolver; private StrLookup<?> variableResolver;
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
/** /**
@ -167,7 +167,7 @@ public static String replaceSystemProperties(Object source) {
* and the escaping character. * and the escaping character.
*/ */
public StrSubstitutor() { public StrSubstitutor() {
this((StrLookup) null, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE); this((StrLookup<?>) null, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
} }
/** /**
@ -210,7 +210,7 @@ public <V> StrSubstitutor(Map<String, V> valueMap, String prefix, String suffix,
* *
* @param variableResolver the variable resolver, may be null * @param variableResolver the variable resolver, may be null
*/ */
public StrSubstitutor(StrLookup variableResolver) { public StrSubstitutor(StrLookup<?> variableResolver) {
this(variableResolver, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE); this(variableResolver, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
} }
@ -223,7 +223,7 @@ public StrSubstitutor(StrLookup variableResolver) {
* @param escape the escape character * @param escape the escape character
* @throws IllegalArgumentException if the prefix or suffix is null * @throws IllegalArgumentException if the prefix or suffix is null
*/ */
public StrSubstitutor(StrLookup variableResolver, String prefix, String suffix, char escape) { public StrSubstitutor(StrLookup<?> variableResolver, String prefix, String suffix, char escape) {
this.setVariableResolver(variableResolver); this.setVariableResolver(variableResolver);
this.setVariablePrefix(prefix); this.setVariablePrefix(prefix);
this.setVariableSuffix(suffix); this.setVariableSuffix(suffix);
@ -240,7 +240,7 @@ public StrSubstitutor(StrLookup variableResolver, String prefix, String suffix,
* @throws IllegalArgumentException if the prefix or suffix is null * @throws IllegalArgumentException if the prefix or suffix is null
*/ */
public StrSubstitutor( public StrSubstitutor(
StrLookup variableResolver, StrMatcher prefixMatcher, StrMatcher suffixMatcher, char escape) { StrLookup<?> variableResolver, StrMatcher prefixMatcher, StrMatcher suffixMatcher, char escape) {
this.setVariableResolver(variableResolver); this.setVariableResolver(variableResolver);
this.setVariablePrefixMatcher(prefixMatcher); this.setVariablePrefixMatcher(prefixMatcher);
this.setVariableSuffixMatcher(suffixMatcher); this.setVariableSuffixMatcher(suffixMatcher);
@ -648,7 +648,7 @@ private void checkCyclicSubstitution(String varName, List<String> priorVariables
* @return the variable's value or <b>null</b> if the variable is unknown * @return the variable's value or <b>null</b> if the variable is unknown
*/ */
protected String resolveVariable(String variableName, StrBuilder buf, int startPos, int endPos) { protected String resolveVariable(String variableName, StrBuilder buf, int startPos, int endPos) {
StrLookup resolver = getVariableResolver(); StrLookup<?> resolver = getVariableResolver();
if (resolver == null) { if (resolver == null) {
return null; return null;
} }
@ -814,7 +814,7 @@ public StrSubstitutor setVariableSuffix(String suffix) {
* *
* @return the VariableResolver * @return the VariableResolver
*/ */
public StrLookup getVariableResolver() { public StrLookup<?> getVariableResolver() {
return this.variableResolver; return this.variableResolver;
} }
@ -823,7 +823,7 @@ public StrLookup getVariableResolver() {
* *
* @param variableResolver the VariableResolver * @param variableResolver the VariableResolver
*/ */
public void setVariableResolver(StrLookup variableResolver) { public void setVariableResolver(StrLookup<?> variableResolver) {
this.variableResolver = variableResolver; this.variableResolver = variableResolver;
} }