[jboss-cvs] jboss-seam/src/main/org/jboss/seam/pages ...
Gavin King
gavin.king at jboss.com
Tue May 1 12:43:52 EDT 2007
User: gavin
Date: 07/05/01 12:43:52
Modified: src/main/org/jboss/seam/pages Action.java
ConversationControl.java
ELConversationIdParameter.java Navigation.java
Page.java Param.java ProcessControl.java Put.java
Rule.java TaskControl.java
Log:
migrate to unified EL everywhere
Revision Changes Path
1.2 +14 -14 jboss-seam/src/main/org/jboss/seam/pages/Action.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Action.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Action.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Action.java 18 Dec 2006 16:50:31 -0000 1.1
+++ Action.java 1 May 2007 16:43:52 -0000 1.2
@@ -1,36 +1,36 @@
package org.jboss.seam.pages;
-import org.jboss.seam.core.Expressions.MethodBinding;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.MethodExpression;
+import org.jboss.seam.core.Expressions.ValueExpression;
public class Action
{
- private MethodBinding methodBinding;
- private ValueBinding valueBinding;
+ private MethodExpression methodExpression;
+ private ValueExpression valueExpression;
private String outcome;
public boolean isExecutable()
{
- return valueBinding==null ||
- Boolean.TRUE.equals( valueBinding.getValue() );
+ return valueExpression==null ||
+ Boolean.TRUE.equals( valueExpression.getValue() );
}
- public MethodBinding getMethodBinding()
+ public MethodExpression getMethodExpression()
{
- return methodBinding;
+ return methodExpression;
}
- public void setMethodBinding(MethodBinding methodBinding)
+ public void setMethodExpression(MethodExpression methodExpression)
{
- this.methodBinding = methodBinding;
+ this.methodExpression = methodExpression;
}
- public ValueBinding getValueBinding()
+ public ValueExpression getValueExpression()
{
- return valueBinding;
+ return valueExpression;
}
- public void setValueBinding(ValueBinding valueBinding)
+ public void setValueExpression(ValueExpression valueExpression)
{
- this.valueBinding = valueBinding;
+ this.valueExpression = valueExpression;
}
public String getOutcome()
1.4 +7 -7 jboss-seam/src/main/org/jboss/seam/pages/ConversationControl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationControl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/ConversationControl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ConversationControl.java 10 Feb 2007 02:03:50 -0000 1.3
+++ ConversationControl.java 1 May 2007 16:43:52 -0000 1.4
@@ -6,7 +6,7 @@
import org.jboss.seam.annotations.FlushModeType;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.Pageflow;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
public class ConversationControl
{
@@ -18,8 +18,8 @@
private boolean nested;
private FlushModeType flushMode;
private String pageflow;
- private ValueBinding<Boolean> beginConversationCondition;
- private ValueBinding<Boolean> endConversationCondition;
+ private ValueExpression<Boolean> beginConversationCondition;
+ private ValueExpression<Boolean> endConversationCondition;
public boolean isBeginConversation()
{
@@ -133,22 +133,22 @@
this.isEndConversationBeforeRedirect = isEndConversationBeforeRedirect;
}
- public ValueBinding<Boolean> getBeginConversationCondition()
+ public ValueExpression<Boolean> getBeginConversationCondition()
{
return beginConversationCondition;
}
- public void setBeginConversationCondition(ValueBinding<Boolean> beginConversationCondition)
+ public void setBeginConversationCondition(ValueExpression<Boolean> beginConversationCondition)
{
this.beginConversationCondition = beginConversationCondition;
}
- public ValueBinding<Boolean> getEndConversationCondition()
+ public ValueExpression<Boolean> getEndConversationCondition()
{
return endConversationCondition;
}
- public void setEndConversationCondition(ValueBinding<Boolean> endConversationCondition)
+ public void setEndConversationCondition(ValueExpression<Boolean> endConversationCondition)
{
this.endConversationCondition = endConversationCondition;
}
1.5 +3 -3 jboss-seam/src/main/org/jboss/seam/pages/ELConversationIdParameter.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ELConversationIdParameter.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/ELConversationIdParameter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ELConversationIdParameter.java 9 Mar 2007 02:14:15 -0000 1.4
+++ ELConversationIdParameter.java 1 May 2007 16:43:52 -0000 1.5
@@ -4,7 +4,7 @@
import org.jboss.seam.core.Expressions;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
import org.jboss.seam.util.Id;
/**
@@ -17,7 +17,7 @@
{
private String name;
private String parameterName;
- private ValueBinding vb;
+ private ValueExpression vb;
public ELConversationIdParameter(String name, String paramName, String expression)
{
@@ -25,7 +25,7 @@
this.parameterName = paramName;
this.vb = expression != null ?
- Expressions.instance().createValueBinding(expression) : null;
+ Expressions.instance().createValueExpression(expression) : null;
}
public String getName()
1.2 +5 -5 jboss-seam/src/main/org/jboss/seam/pages/Navigation.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Navigation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Navigation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Navigation.java 19 Dec 2006 21:16:54 -0000 1.1
+++ Navigation.java 1 May 2007 16:43:52 -0000 1.2
@@ -8,11 +8,11 @@
import javax.faces.context.FacesContext;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
public final class Navigation
{
- private ValueBinding<Object> outcome;
+ private ValueExpression<Object> outcome;
private List<Rule> rules = new ArrayList<Rule>();
private Rule rule;
@@ -21,12 +21,12 @@
return rules;
}
- public void setOutcome(ValueBinding<Object> outcomeValueBinding)
+ public void setOutcome(ValueExpression<Object> outcomeValueExpression)
{
- this.outcome = outcomeValueBinding;
+ this.outcome = outcomeValueExpression;
}
- public ValueBinding<Object> getOutcome()
+ public ValueExpression<Object> getOutcome()
{
return outcome;
}
1.17 +2 -2 jboss-seam/src/main/org/jboss/seam/pages/Page.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Page.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Page.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Page.java 9 Mar 2007 02:14:15 -0000 1.16
+++ Page.java 1 May 2007 16:43:52 -0000 1.17
@@ -224,9 +224,9 @@
if (outcome==null)
{
- fromAction = action.getMethodBinding().getExpressionString();
+ fromAction = action.getMethodExpression().getExpressionString();
result = true;
- outcome = Pages.toString( action.getMethodBinding().invoke() );
+ outcome = Pages.toString( action.getMethodExpression().invoke() );
Pages.handleOutcome(facesContext, outcome, fromAction);
}
else
1.2 +16 -16 jboss-seam/src/main/org/jboss/seam/pages/Param.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Param.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Param.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Param.java 17 Dec 2006 19:46:41 -0000 1.1
+++ Param.java 1 May 2007 16:43:52 -0000 1.2
@@ -8,13 +8,13 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
public final class Param
{
private final String name;
- private ValueBinding valueBinding;
- private ValueBinding converterValueBinding;
+ private ValueExpression valueExpression;
+ private ValueExpression converterValueExpression;
private String converterId;
public Param(String name)
@@ -28,17 +28,17 @@
{
return FacesContext.getCurrentInstance().getApplication().createConverter(converterId);
}
- else if (converterValueBinding!=null)
+ else if (converterValueExpression!=null)
{
- return (Converter) converterValueBinding.getValue();
+ return (Converter) converterValueExpression.getValue();
}
- else if (valueBinding==null)
+ else if (valueExpression==null)
{
return null;
}
else
{
- Class<?> type = valueBinding.getType();
+ Class<?> type = valueExpression.getType();
return FacesContext.getCurrentInstance().getApplication().createConverter(type);
}
}
@@ -48,24 +48,24 @@
return name;
}
- public void setValueBinding(ValueBinding valueBinding)
+ public void setValueExpression(ValueExpression valueExpression)
{
- this.valueBinding = valueBinding;
+ this.valueExpression = valueExpression;
}
- public ValueBinding getValueBinding()
+ public ValueExpression getValueExpression()
{
- return valueBinding;
+ return valueExpression;
}
- public void setConverterValueBinding(ValueBinding converterValueBinding)
+ public void setConverterValueExpression(ValueExpression converterValueExpression)
{
- this.converterValueBinding = converterValueBinding;
+ this.converterValueExpression = converterValueExpression;
}
- public ValueBinding getConverterValueBinding()
+ public ValueExpression getConverterValueExpression()
{
- return converterValueBinding;
+ return converterValueExpression;
}
public void setConverterId(String converterId)
@@ -90,7 +90,7 @@
*/
public Object getValueFromModel(FacesContext facesContext)
{
- Object value = getValueBinding().getValue();
+ Object value = getValueExpression().getValue();
if (value==null)
{
return null;
1.2 +4 -4 jboss-seam/src/main/org/jboss/seam/pages/ProcessControl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProcessControl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/ProcessControl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ProcessControl.java 21 Feb 2007 18:33:08 -0000 1.1
+++ ProcessControl.java 1 May 2007 16:43:52 -0000 1.2
@@ -4,14 +4,14 @@
package org.jboss.seam.pages;
import org.jboss.seam.core.BusinessProcess;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
public class ProcessControl
{
private boolean isCreateProcess;
private boolean isResumeProcess;
private String definition;
- private ValueBinding<Long> processId;
+ private ValueExpression<Long> processId;
public void createOrResumeProcess()
{
@@ -65,12 +65,12 @@
this.definition = definition;
}
- public ValueBinding<Long> getProcessId()
+ public ValueExpression<Long> getProcessId()
{
return processId;
}
- public void setProcessId(ValueBinding<Long> processId)
+ public void setProcessId(ValueExpression<Long> processId)
{
this.processId = processId;
}
1.2 +4 -4 jboss-seam/src/main/org/jboss/seam/pages/Put.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Put.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Put.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Put.java 19 Dec 2006 00:40:41 -0000 1.1
+++ Put.java 1 May 2007 16:43:52 -0000 1.2
@@ -1,13 +1,13 @@
package org.jboss.seam.pages;
import org.jboss.seam.ScopeType;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
public class Put
{
private String name;
private ScopeType scope;
- private ValueBinding value;
+ private ValueExpression value;
public String getName()
{
@@ -25,11 +25,11 @@
{
this.scope = scope;
}
- public ValueBinding getValue()
+ public ValueExpression getValue()
{
return value;
}
- public void setValue(ValueBinding value)
+ public void setValue(ValueExpression value)
{
this.value = value;
}
1.4 +4 -4 jboss-seam/src/main/org/jboss/seam/pages/Rule.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Rule.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/Rule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Rule.java 25 Feb 2007 22:38:21 -0000 1.3
+++ Rule.java 1 May 2007 16:43:52 -0000 1.4
@@ -8,12 +8,12 @@
import javax.faces.context.FacesContext;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
public final class Rule
{
private String outcomeValue;
- private ValueBinding condition;
+ private ValueExpression condition;
private List<Output> outputs = new ArrayList<Output>();
private ConversationControl conversationControl = new ConversationControl();
private TaskControl taskControl = new TaskControl();
@@ -52,12 +52,12 @@
return processControl;
}
- public ValueBinding getCondition()
+ public ValueExpression getCondition()
{
return condition;
}
- public void setCondition(ValueBinding expression)
+ public void setCondition(ValueExpression expression)
{
this.condition = expression;
}
1.4 +4 -4 jboss-seam/src/main/org/jboss/seam/pages/TaskControl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TaskControl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/TaskControl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TaskControl.java 29 Mar 2007 16:00:50 -0000 1.3
+++ TaskControl.java 1 May 2007 16:43:52 -0000 1.4
@@ -4,7 +4,7 @@
package org.jboss.seam.pages;
import org.jboss.seam.core.BusinessProcess;
-import org.jboss.seam.core.Expressions.ValueBinding;
+import org.jboss.seam.core.Expressions.ValueExpression;
public class TaskControl
{
@@ -15,7 +15,7 @@
private boolean isEndTask;
- private ValueBinding taskId;
+ private ValueExpression taskId;
private String transition;
@@ -99,12 +99,12 @@
this.isStartTask = isStartTask;
}
- public void setTaskId(ValueBinding<String> taskId)
+ public void setTaskId(ValueExpression<String> taskId)
{
this.taskId = taskId;
}
- public ValueBinding<String> getTaskId()
+ public ValueExpression<String> getTaskId()
{
return taskId;
}
More information about the jboss-cvs-commits
mailing list