You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/07/10 04:01:54 UTC
svn commit: r792780 -
/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutcomeTarget.java
Author: lu4242
Date: Fri Jul 10 02:01:53 2009
New Revision: 792780
URL: http://svn.apache.org/viewvc?rev=792780&view=rev
Log:
MYFACES-2262 implement outcometarget renderers
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutcomeTarget.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutcomeTarget.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutcomeTarget.java?rev=792780&r1=792779&r2=792780&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutcomeTarget.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIOutcomeTarget.java Fri Jul 10 02:01:53 2009
@@ -18,8 +18,14 @@
*/
package javax.faces.component;
-import javax.el.ValueExpression;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+/**
+ *
+ * @since 2.0
+ */
+@JSFComponent
public class UIOutcomeTarget extends UIOutput
{
public static final String COMPONENT_TYPE = "javax.faces.OutcomeTarget";
@@ -27,9 +33,6 @@
private static final boolean DEFAULT_INCLUDEVIEWPARAMS = false;
- private String _outcome;
- private boolean _includeViewParams;
-
public UIOutcomeTarget()
{
super();
@@ -41,41 +44,37 @@
return COMPONENT_FAMILY;
}
+ @JSFProperty
public String getOutcome()
{
- if (_outcome != null)
- {
- return _outcome;
- }
+ String outcome = (String) getStateHelper().eval(PropertyKeys.outcome);
- ValueExpression expression = getValueExpression("Outcome");
- if (expression != null)
- {
- return (String) expression.getValue(getFacesContext().getELContext());
- }
-
- if(isInView()) //default to the view id
+ if(outcome == null && isInView()) //default to the view id
{
return getFacesContext().getViewRoot().getViewId();
}
- return _outcome;
+ return outcome;
}
public void setOutcome(String outcome)
{
- _outcome = outcome;
+ getStateHelper().put(PropertyKeys.outcome, outcome);
}
+ @JSFProperty(defaultValue="false")
public boolean isIncludeViewParams()
{
- return getExpressionValue("includePageParams", _includeViewParams, DEFAULT_INCLUDEVIEWPARAMS);
+ return (Boolean) getStateHelper().eval(PropertyKeys.includeViewParams, DEFAULT_INCLUDEVIEWPARAMS);
}
public void setIncludeViewParams(boolean includeViewParams)
{
- _includeViewParams = includeViewParams;
+ getStateHelper().put(PropertyKeys.includeViewParams, includeViewParams);
}
-
-}
+ enum PropertyKeys {
+ includeViewParams,
+ outcome
+ }
+}
\ No newline at end of file