Author: lukaszlenart
Date: Thu Mar 3 17:48:32 2011
New Revision: 1076704
URL: http://svn.apache.org/viewvc?rev=1076704&view=rev
Log:
Solves WW-3547 - TextProvider.getText(String, List<Object>) changed to
getText(String, List<?>)
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java?rev=1076704&r1=1076703&r2=1076704&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
(original)
+++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/TestAction.java
Thu Mar 3 17:48:32 2011
@@ -73,7 +73,7 @@ public class TestAction extends ActionSu
/** This is the method invoked by the {@link
org.apache.struts2.util.TextProviderHelper}.
* Returns the test value if defined otherwise delegates to the default
TextProvider */
- public String getText(String key, String defaultValue, List args,
ValueStack stack) {
+ public String getText(String key, String defaultValue, List<?> args,
ValueStack stack) {
if (this.texts.containsKey(key)) {
return this.texts.get(key);
} else {
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java?rev=1076704&r1=1076703&r2=1076704&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
Thu Mar 3 17:48:32 2011
@@ -108,7 +108,7 @@ public class ActionSupport implements Ac
return getTextProvider().getText(aTextName, defaultValue, obj);
}
- public String getText(String aTextName, List<Object> args) {
+ public String getText(String aTextName, List<?> args) {
return getTextProvider().getText(aTextName, args);
}
@@ -116,7 +116,7 @@ public class ActionSupport implements Ac
return getTextProvider().getText(key, args);
}
- public String getText(String aTextName, String defaultValue, List<Object>
args) {
+ public String getText(String aTextName, String defaultValue, List<?> args)
{
return getTextProvider().getText(aTextName, defaultValue, args);
}
@@ -124,7 +124,7 @@ public class ActionSupport implements Ac
return getTextProvider().getText(key, defaultValue, args);
}
- public String getText(String key, String defaultValue, List<Object> args,
ValueStack stack) {
+ public String getText(String key, String defaultValue, List<?> args,
ValueStack stack) {
return getTextProvider().getText(key, defaultValue, args, stack);
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java?rev=1076704&r1=1076703&r2=1076704&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/CompositeTextProvider.java
Thu Mar 3 17:48:32 2011
@@ -111,7 +111,7 @@ public class CompositeTextProvider imple
* @return
* @see {@link com.opensymphony.xwork2.TextProvider#getText(String,
java.util.List)}
*/
- public String getText(String key, List<Object> args) {
+ public String getText(String key, List<?> args) {
return getText(key, key, args);
}
@@ -139,7 +139,7 @@ public class CompositeTextProvider imple
* @return
* @see {@link
com.opensymphony.xwork2.TextProvider#getText#getText(String, String,
java.util.List)}
*/
- public String getText(String key, String defaultValue, List<Object> args) {
+ public String getText(String key, String defaultValue, List<?> args) {
// if there's one text provider that gives us a msg not the same as
defaultValue
// for this key, we are ok, else try the next
// text provider
@@ -186,9 +186,9 @@ public class CompositeTextProvider imple
* @param args
* @param stack
* @return
- * @see {@link com.opensymphony.xwork2.TextProvider#getText(String,
String, java.util.List, com.opensymphony.xwork2.util.OgnlValueStack)}
+ * @see {@link com.opensymphony.xwork2.TextProvider#getText(String,
String, java.util.List, com.opensymphony.xwork2.util.ValueStack)}
*/
- public String getText(String key, String defaultValue, List<Object> args,
ValueStack stack) {
+ public String getText(String key, String defaultValue, List<?> args,
ValueStack stack) {
// if there's one text provider that gives us a msg not the same as
defaultValue
// for this key, we are ok, else try the next
// text provider
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java?rev=1076704&r1=1076703&r2=1076704&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/DefaultTextProvider.java
Thu Mar 3 17:48:32 2011
@@ -56,7 +56,7 @@ public class DefaultTextProvider impleme
return text;
}
- public String getText(String key, List<Object> args) {
+ public String getText(String key, List<?> args) {
Object[] params;
if (args != null) {
params = args.toArray();
@@ -78,7 +78,7 @@ public class DefaultTextProvider impleme
return LocalizedTextUtil.findDefaultText(key,
ActionContext.getContext().getLocale(), params);
}
- public String getText(String key, String defaultValue, List<Object> args) {
+ public String getText(String key, String defaultValue, List<?> args) {
String text = getText(key, args);
if(text == null && defaultValue == null) {
defaultValue = key;
@@ -124,7 +124,7 @@ public class DefaultTextProvider impleme
return getText(key, defaultValue, args);
}
- public String getText(String key, String defaultValue, List<Object> args,
ValueStack stack) {
+ public String getText(String key, String defaultValue, List<?> args,
ValueStack stack) {
//we're not using the value stack here
return getText(key, defaultValue, args);
}
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java?rev=1076704&r1=1076703&r2=1076704&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProvider.java
Thu Mar 3 17:48:32 2011
@@ -98,7 +98,7 @@ public interface TextProvider {
* @param args a list args to be used in a {@link java.text.MessageFormat}
message
* @return the message as found in the resource bundle, or null if none is
found.
*/
- String getText(String key, List<Object> args);
+ String getText(String key, List<?> args);
/**
* Gets a message based on a key using the supplied args, as defined in
@@ -120,7 +120,7 @@ public interface TextProvider {
* @param args a list args to be used in a {@link
java.text.MessageFormat} message
* @return the message as found in the resource bundle, or defaultValue if
none is found
*/
- String getText(String key, String defaultValue, List<Object> args);
+ String getText(String key, String defaultValue, List<?> args);
/**
* Gets a message based on a key using the supplied args, as defined in
@@ -146,7 +146,7 @@ public interface TextProvider {
* @param stack the value stack to use for finding the text
* @return the message as found in the resource bundle, or defaultValue if
none is found
*/
- String getText(String key, String defaultValue, List<Object> args,
ValueStack stack);
+ String getText(String key, String defaultValue, List<?> args, ValueStack
stack);
/**
* Gets a message based on a key using the supplied args, as defined in
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java?rev=1076704&r1=1076703&r2=1076704&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/TextProviderSupport.java
Thu Mar 3 17:48:32 2011
@@ -163,7 +163,7 @@ public class TextProviderSupport impleme
* @param args a List of args to be used in a MessageFormat message
* @return value of named text
*/
- public String getText(String key, List<Object> args) {
+ public String getText(String key, List<?> args) {
return getText(key, key, args);
}
@@ -196,7 +196,7 @@ public class TextProviderSupport impleme
* @param args a List of args to be used in a MessageFormat message
* @return value of named text
*/
- public String getText(String key, String defaultValue, List<Object> args) {
+ public String getText(String key, String defaultValue, List<?> args) {
Object[] argsArray = ((args != null &&
!args.equals(Collections.emptyList())) ? args.toArray() : null);
if (clazz != null) {
return LocalizedTextUtil.findText(clazz, key, getLocale(),
defaultValue, argsArray);
@@ -238,7 +238,7 @@ public class TextProviderSupport impleme
* @param stack the value stack to use for finding the text
* @return the message as found in the resource bundle, or defaultValue if
none is found
*/
- public String getText(String key, String defaultValue, List<Object> args,
ValueStack stack) {
+ public String getText(String key, String defaultValue, List<?> args,
ValueStack stack) {
Object[] argsArray = ((args != null) ? args.toArray() : null);
Locale locale;
if (stack == null){
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java?rev=1076704&r1=1076703&r2=1076704&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java
Thu Mar 3 17:48:32 2011
@@ -118,7 +118,7 @@ public class DelegatingValidatorContext
return textProvider.getText(aTextName, defaultValue, obj);
}
- public String getText(String aTextName, List<Object> args) {
+ public String getText(String aTextName, List<?> args) {
return textProvider.getText(aTextName, args);
}
@@ -126,7 +126,7 @@ public class DelegatingValidatorContext
return textProvider.getText(key, args);
}
- public String getText(String aTextName, String defaultValue, List<Object>
args) {
+ public String getText(String aTextName, String defaultValue, List<?> args)
{
return textProvider.getText(aTextName, defaultValue, args);
}
@@ -138,7 +138,7 @@ public class DelegatingValidatorContext
return textProvider.getTexts(aBundleName);
}
- public String getText(String key, String defaultValue, List<Object> args,
ValueStack stack) {
+ public String getText(String key, String defaultValue, List<?> args,
ValueStack stack) {
return textProvider.getText(key, defaultValue, args, stack);
}
