svn commit: r902944 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java

[sebb]

Author: sebb
Date: Mon Jan 25 19:32:08 2010
New Revision: 902944

URL: http://svn.apache.org/viewvc?rev=902944&view=rev
Log:
Fix raw types

Modified:
    
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java

Modified: 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
URL: 
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java?rev=902944&r1=902943&r2=902944&view=diff
==============================================================================
--- 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
 (original)
+++ 
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
 Mon Jan 25 19:32:08 2010
@@ -119,7 +119,7 @@
     /**
      * Variable resolution is delegated to an implementor of VariableResolver.
      */
-    private StrLookup variableResolver;
+    private StrLookup<?> variableResolver;
 
     //-----------------------------------------------------------------------
     /**
@@ -167,7 +167,7 @@
      * and the escaping character.
      */
     public StrSubstitutor() {
-        this((StrLookup) null, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
+        this((StrLookup<?>) null, DEFAULT_PREFIX, DEFAULT_SUFFIX, 
DEFAULT_ESCAPE);
     }
 
     /**
@@ -210,7 +210,7 @@
      *
      * @param variableResolver  the variable resolver, may be null
      */
-    public StrSubstitutor(StrLookup variableResolver) {
+    public StrSubstitutor(StrLookup<?> variableResolver) {
         this(variableResolver, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
     }
 
@@ -223,7 +223,7 @@
      * @param escape  the escape character
      * @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.setVariablePrefix(prefix);
         this.setVariableSuffix(suffix);
@@ -240,7 +240,7 @@
      * @throws IllegalArgumentException if the prefix or suffix is null
      */
     public StrSubstitutor(
-            StrLookup variableResolver, StrMatcher prefixMatcher, StrMatcher 
suffixMatcher, char escape) {
+            StrLookup<?> variableResolver, StrMatcher prefixMatcher, 
StrMatcher suffixMatcher, char escape) {
         this.setVariableResolver(variableResolver);
         this.setVariablePrefixMatcher(prefixMatcher);
         this.setVariableSuffixMatcher(suffixMatcher);
@@ -648,7 +648,7 @@
      * @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) {
-        StrLookup resolver = getVariableResolver();
+        StrLookup<?> resolver = getVariableResolver();
         if (resolver == null) {
             return null;
         }
@@ -814,7 +814,7 @@
      *
      * @return the VariableResolver
      */
-    public StrLookup getVariableResolver() {
+    public StrLookup<?> getVariableResolver() {
         return this.variableResolver;
     }
 
@@ -823,7 +823,7 @@
      *
      * @param variableResolver  the VariableResolver
      */
-    public void setVariableResolver(StrLookup variableResolver) {
+    public void setVariableResolver(StrLookup<?> variableResolver) {
         this.variableResolver = variableResolver;
     }