[jboss-cvs] jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component ...
Peter Muir
peter at bleepbleep.org.uk
Fri Mar 23 18:24:25 EDT 2007
User: pmuir
Date: 07/03/23 18:24:25
Modified: seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component
UIConversationId.java
UIConversationPropagation.java UISelection.java
UITaskId.java UISeamCommandBase.java
UIConversationIsLongRunning.java
Log:
clean up, better parameter components
Revision Changes Path
1.2 +11 -21 jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIConversationId.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationId.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIConversationId.java 20 Mar 2007 17:58:58 -0000 1.1
+++ UIConversationId.java 23 Mar 2007 22:24:25 -0000 1.2
@@ -22,6 +22,7 @@
package org.jboss.seam.ui.component;
import javax.faces.component.UIParameter;
+import javax.faces.context.FacesContext;
import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.Manager;
@@ -32,28 +33,20 @@
* JSF component class
*
*/
-public class UIConversationId extends UIParameter {
+public abstract class UIConversationId extends UIParameter {
private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationId";
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.ConversationId";
- private String viewId;
-
- @Override
- public String getFamily()
- {
- return COMPONENT_FAMILY;
- }
-
@Override
public String getName()
{
Conversation conversation = Conversation.instance();
- if (viewId!=null && ( !conversation.isNested() || conversation.isLongRunning() ) )
+ if (getViewId()!=null && ( !conversation.isNested() || conversation.isLongRunning() ) )
{
- return Pages.instance().getPage(viewId)
+ return Pages.instance().getPage(getViewId())
.getConversationIdParameter()
.getParameterName();
}
@@ -69,9 +62,9 @@
Conversation conversation = Conversation.instance();
if ( !conversation.isNested() || conversation.isLongRunning() )
{
- if (viewId!=null)
+ if (getViewId()!=null)
{
- Page page = Pages.instance().getPage(viewId);
+ Page page = Pages.instance().getPage(getViewId());
return page.getConversationIdParameter().getParameterValue();
}
else
@@ -85,14 +78,11 @@
}
}
- public String getViewId()
- {
- return viewId;
- }
+ public abstract String getViewId();;
- public void setViewId(String viewId)
- {
- this.viewId = viewId;
- }
+ public abstract void setViewId(String viewId);
+ public static UIConversationId newInstance() {
+ return (UIConversationId) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE);
+ }
}
1.2 +9 -43 jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIConversationPropagation.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationPropagation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIConversationPropagation.java 20 Mar 2007 17:58:58 -0000 1.1
+++ UIConversationPropagation.java 23 Mar 2007 22:24:25 -0000 1.2
@@ -28,22 +28,13 @@
* JSF component class
*
*/
-public class UIConversationPropagation extends UIParameter {
+public abstract class UIConversationPropagation extends UIParameter {
private static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationPropagation";
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.ConversationPropagation";
@Override
- public String getFamily()
- {
- return COMPONENT_FAMILY;
- }
-
- private String pageflow;
- private String type = "none";
-
- @Override
public String getName()
{
return "conversationPropagation";
@@ -52,44 +43,19 @@
@Override
public Object getValue()
{
- return pageflow==null ? type : type + "." + pageflow;
+ return getPageflow()==null ? getType() : getType() + "." + getPageflow();
}
- public String getPageflow()
- {
- return pageflow;
- }
+ public abstract String getPageflow();
- public void setPageflow(String pageflow)
- {
- this.pageflow = pageflow;
- }
+ public abstract void setPageflow(String pageflow);
- public String getType()
- {
- return type;
- }
-
- public void setType(String type)
- {
- this.type = type;
- }
+ public abstract String getType();
- @Override
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
- super.restoreState(context, values[0]);
- type = (String) values[1];
- pageflow = (String) values[2];
- }
+ public abstract void setType(String type);
- @Override
- public Object saveState(FacesContext context) {
- Object[] values = new Object[3];
- values[0] = super.saveState(context);
- values[1] = type;
- values[2] = pageflow;
- return values;
+ public static UIConversationPropagation newInstance() {
+ return (UIConversationPropagation) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE);
}
}
1.2 +11 -45 jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UISelection.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISelection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UISelection.java 20 Mar 2007 17:58:58 -0000 1.1
+++ UISelection.java 23 Mar 2007 22:24:25 -0000 1.2
@@ -31,19 +31,13 @@
* JSF component class
*
*/
-public class UISelection extends UIParameter {
+public abstract class UISelection extends UIParameter {
private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Selection";
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Selection";
@Override
- public String getFamily()
- {
- return COMPONENT_FAMILY;
- }
-
- @Override
public String getName()
{
return "dataModelSelection";
@@ -52,7 +46,7 @@
@Override
public Object getValue()
{
- Object value = Contexts.lookupInStatefulContexts(dataModel);
+ Object value = Contexts.lookupInStatefulContexts(getDataModel());
if (value==null)
{
return null;
@@ -60,48 +54,20 @@
else
{
int rowIndex = ( (DataModel) value ).getRowIndex();
- return rowIndex<0 ? null : var + ':' + dataModel + '[' + rowIndex + ']';
- }
+ return rowIndex<0 ? null : getVar() + ':' + getDataModel() + '[' + rowIndex + ']';
}
-
- /* Variables */
-
- private String dataModel;
- private String var;
-
- @Override
- public void restoreState(FacesContext context, Object state) {
- Object[] values = (Object[]) state;
- super.restoreState(context, values[0]);
- dataModel = (String) values[1];
}
- @Override
- public Object saveState(FacesContext context) {
- Object[] values = new Object[2];
- values[0] = super.saveState(context);
- values[1] = dataModel;
- return values;
- }
+ public abstract String getDataModel();
- public String getDataModel()
- {
- return dataModel;
- }
+ public abstract void setDataModel(String dataModel);
- public void setDataModel(String dataModel)
- {
- this.dataModel = dataModel;
- }
+ public abstract String getVar();
- public String getVar()
- {
- return var;
- }
+ public abstract void setVar(String var);
- public void setVar(String var)
- {
- this.var = var;
+ public static UISelection newInstance() {
+ return (UISelection) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE);
}
}
1.2 +7 -7 jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UITaskId.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UITaskId.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UITaskId.java 20 Mar 2007 17:58:58 -0000 1.1
+++ UITaskId.java 23 Mar 2007 22:24:25 -0000 1.2
@@ -22,27 +22,23 @@
package org.jboss.seam.ui.component;
import javax.faces.component.UIParameter;
+import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
+import org.ajax4jsf.framework.renderer.ComponentUtils;
import org.jbpm.taskmgmt.exe.TaskInstance;
/**
* JSF component class
*
*/
-public class UITaskId extends UIParameter {
+public abstract class UITaskId extends UIParameter {
private static final String COMPONENT_TYPE = "org.jboss.seam.ui.TaskId";
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.TaskId";
@Override
- public String getFamily()
- {
- return COMPONENT_FAMILY;
- }
-
- @Override
public String getName()
{
return "taskId";
@@ -56,4 +52,8 @@
TaskInstance taskInstance = (TaskInstance) valueBinding.getValue( getFacesContext() );
return taskInstance==null ? null : taskInstance.getId();
}
+
+ public static UITaskId newInstance() {
+ return (UITaskId) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE);
+ }
}
1.3 +5 -5 jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UISeamCommandBase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- UISeamCommandBase.java 23 Mar 2007 20:25:33 -0000 1.2
+++ UISeamCommandBase.java 23 Mar 2007 22:24:25 -0000 1.3
@@ -161,19 +161,19 @@
if ("default".equals(getPropagation()) || "join".equals(getPropagation())
|| "nest".equals(getPropagation()) || "end".equals(getPropagation()))
{
- UIConversationId uiConversationId = new UIConversationId();
+ UIConversationId uiConversationId = UIConversationId.newInstance();
uiConversationId.setViewId(viewId);
url.addParameter(uiConversationId);
if (Conversation.instance().isLongRunning() || Conversation.instance().isNested())
{
- url.addParameter(new UIConversationIsLongRunning());
+ url.addParameter(UIConversationIsLongRunning.newInstance());
}
}
if ("join".equals(getPropagation()) || "nest".equals(getPropagation())
|| "begin".equals(getPropagation()) || "end".equals(getPropagation()))
{
- UIConversationPropagation uiPropagation = new UIConversationPropagation();
+ UIConversationPropagation uiPropagation = UIConversationPropagation.newInstance();
uiPropagation.setType(getPropagation());
uiPropagation.setPageflow(getPageflow());
url.addParameter(uiPropagation);
@@ -182,7 +182,7 @@
ValueBinding taskInstanceValueBinding = getValueBinding("taskInstance");
if (taskInstanceValueBinding != null)
{
- UITaskId uiTaskId = new UITaskId();
+ UITaskId uiTaskId = UITaskId.newInstance();
uiTaskId.setValueBinding("taskInstance", taskInstanceValueBinding);
url.addParameter(uiTaskId);
}
@@ -252,7 +252,7 @@
.getExpressionString();
String dataModelName = dataModelExpression.substring(2,
dataModelExpression.length() - 1).replace('$', '.');
- UISelection uiSelection = new UISelection();
+ UISelection uiSelection = UISelection.newInstance();
uiSelection.setDataModel(dataModelName);
uiSelection.setVar(parentUIData.getVar());
return uiSelection;
1.2 +7 -8 jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationIsLongRunning.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIConversationIsLongRunning.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/seam-ui-cdk/jboss-seam-ui/src/main/java/org/jboss/seam/ui/component/UIConversationIsLongRunning.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIConversationIsLongRunning.java 20 Mar 2007 17:58:58 -0000 1.1
+++ UIConversationIsLongRunning.java 23 Mar 2007 22:24:25 -0000 1.2
@@ -1,22 +1,18 @@
package org.jboss.seam.ui.component;
import javax.faces.component.UIParameter;
+import javax.faces.context.FacesContext;
import org.jboss.seam.core.Manager;
/*
* This component not available as a tag
*/
-public class UIConversationIsLongRunning extends UIParameter
+public abstract class UIConversationIsLongRunning extends UIParameter
{
public static final String COMPONENT_FAMILY = "org.jboss.seam.ui.ConversationIsLongRunning";
-
- @Override
- public String getFamily()
- {
- return COMPONENT_FAMILY;
- }
+ public static final String COMPONENT_TYPE = "org.jboss.seam.ui.ConversationIsLongRunning";
@Override
public String getName()
@@ -30,4 +26,7 @@
return Manager.instance().isReallyLongRunningConversation();
}
+ public static UIConversationIsLongRunning newInstance() {
+ return (UIConversationIsLongRunning) FacesContext.getCurrentInstance().getApplication().createComponent(COMPONENT_TYPE);
+ }
}
More information about the jboss-cvs-commits
mailing list