Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved the search for a TextProvider from the Text tag into a Helper class and changed UIBean and Label to

Browse Source 
use the helper instead of an OGNL expression to invoke getText(String)
Additional methods added to TestAction to override its default TextProvider impl

WW-1681, related issues WW-2539, W2511



git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@647366 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeromy Evans
2008-04-12 03:09:28 +00:00
parent 1633765ee1
commit e027762fdf
5 changed files with 97 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/components/Label.java
+4 -2
View File
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.util.TextProviderHelper;
import com.opensymphony.xwork2.util.ValueStack;
@@ -82,8 +83,9 @@ public class Label extends UIBean {
if (value != null) {
addParameter("nameValue", findString(value));
} else if (key != null) {
String expr = "%{getText('"+ key +"')}";
addParameter("nameValue", findString(expr));
// get the label from a TextProvider
String providedLabel = TextProviderHelper.getText(key, "", stack);
addParameter("nameValue", providedLabel);
} else if (name != null) {
String expr = name;
if (altSyntax()) {
core/src/main/java/org/apache/struts2/components/Text.java
+2 -15
View File
@@ -24,13 +24,12 @@ import java.io.IOException;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
import org.apache.struts2.util.TextProviderHelper;
import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.util.TextUtils;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.logging.Logger;
@@ -149,20 +148,8 @@ public class Text extends ContextBean implements Param.UnnamedParametric {
} else {
defaultMessage = actualName;
}
String msg = null;
ValueStack stack = getStack();
for (Iterator iterator = getStack().getRoot().iterator();
iterator.hasNext();) {
Object o = iterator.next();
if (o instanceof TextProvider) {
TextProvider tp = (TextProvider) o;
msg = tp.getText(actualName, defaultMessage, values, stack);
break;
}
}
String msg = TextProviderHelper.getText(actualName, defaultMessage, values, getStack());
if (msg != null) {
try {
core/src/main/java/org/apache/struts2/components/UIBean.java
+10 -4
View File
@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.StrutsConstants;
import org.apache.struts2.util.TextProviderHelper;
import org.apache.struts2.components.template.Template;
import org.apache.struts2.components.template.TemplateEngine;
import org.apache.struts2.components.template.TemplateEngineManager;
@@ -616,17 +617,17 @@ public abstract class UIBean extends Component {
addParameter("dynamicAttributes", dynamicAttributes);
String name = null;
String providedLabel = null;
if (this.key != null) {
if(this.name == null) {
if(this.name == null) {
this.name = key;
}
if(this.label == null) {
// Escape the key prior to sending it down
String escaped = key.replace("'", "\\'");
this.label = "%{getText('" + escaped + "')}";
// lookup the label from a TextProvider
providedLabel = TextProviderHelper.getText(key, "", stack);
}
}
@@ -638,6 +639,11 @@ public abstract class UIBean extends Component {
if (label != null) {
addParameter("label", findString(label));
} else {
if (providedLabel != null) {
// label found via a TextProvider
addParameter("label", providedLabel);
}
}
if (labelSeparator != null) {
core/src/main/java/org/apache/struts2/util/TextProviderHelper.java
+59
View File
@@ -0,0 +1,59 @@
package org.apache.struts2.util;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.TextProvider;
import java.util.Iterator;
import java.util.List;
import java.util.LinkedList;
/**
* Helper methods to access text from TextProviders
*/
public class TextProviderHelper {
/**
* <p>Get a message from the first TextProvider encountered in the stack.
* If the first TextProvider doesn't provide the message the default message is returned.</p>
* <p>The search for a TextProvider is iterative from the root of the stack.</p>
* <p>This method was refactored from {@link org.apache.struts2.components.Text} to use a
* consistent implementation across UIBean components.</p>
* @param key the message key in the resource bundle
* @param defaultMessage the message to return if not found
* @param args an array args to be used in a {@link java.text.MessageFormat} message
* @param stack the value stack to use for finding the text
*
* @return the message if found, otherwise the defaultMessage
*/
public static String getText(String key, String defaultMessage, List<String> args, ValueStack stack) {
String msg = defaultMessage;
for (Iterator iterator = stack.getRoot().iterator(); iterator.hasNext();) {
Object o = iterator.next();
if (o instanceof TextProvider) {
TextProvider tp = (TextProvider) o;
msg = tp.getText(key, defaultMessage, args, stack);
break;
}
}
return msg;
}
/**
* <p>Get a message from the first TextProvider encountered in the stack.
* If the first TextProvider doesn't provide the message the default message is returned.</p>
* <p>The search for a TextProvider is iterative from the root of the stack.</p>
* <p>This method was refactored from {@link org.apache.struts2.components.Text} to use a
* consistent implementation across UIBean components.</p>
* @param key the message key in the resource bundle
* @param defaultMessage the message to return if not found
* @param stack the value stack to use for finding the text
*
* @return the message if found, otherwise the defaultMessage
*/
public static String getText(String key, String defaultMessage,ValueStack stack) {
return getText(key, defaultMessage, new LinkedList<String>(), stack);
}
}
core/src/test/java/org/apache/struts2/TestAction.java
+22 -2
View File
@@ -26,6 +26,7 @@ import org.apache.struts2.views.jsp.ui.User;
import com.opensymphony.xwork2.Action;
import com.opensymphony.xwork2.ActionSupport;
import com.opensymphony.xwork2.util.ValueStack;
/**
@@ -47,19 +48,38 @@ public class TestAction extends ActionSupport {
private List list3;
private SomeEnum status = SomeEnum.COMPLETED;
private final Map texts = new HashMap();
private final Map<String, String> texts = new HashMap<String, String>();
/**
* Define a text resource within this action that will be returned by the getText methods
* here before delegating to the default TextProvider
*
* call
* @param key
* @param value
*/
public void setText(String key, String value) {
this.texts.put(key, value);
}
/** Returns the test value if defined otherwise delegates to the default TextProvider */
public String getText(String key) {
if (this.texts.containsKey(key)) {
return (String) this.texts.get(key);
return this.texts.get(key);
}
return super.getText(key);
}
/** 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) {
if (this.texts.containsKey(key)) {
return this.texts.get(key);
} else {
return super.getText(key, defaultValue, args, stack);
}
}
public Collection getCollection() {
return collection;
}