[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/component ...
Peter Muir
peter at bleepbleep.org.uk
Tue Jun 19 17:57:45 EDT 2007
User: pmuir
Date: 07/06/19 17:57:45
Modified: ui/src/main/java/org/jboss/seam/ui/component
UISelectItems.java UIValidateAll.java UILink.java
UILoadStyle.java UISpan.java UIButton.java
UIAction.java UIConversationId.java
UIFileUpload.java UIDecorate.java
UISeamCommandBase.java UIDiv.java
Added: ui/src/main/java/org/jboss/seam/ui/component
UIStyle.java
Log:
JBSEAM-1013 - port seam ui to a4j cdk
Revision Changes Path
1.2 +5 -5 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UISelectItems.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISelectItems.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UISelectItems.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UISelectItems.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -46,7 +46,7 @@
private static final String COMPONENT_TYPE = "org.jboss.seam.ui.SelectItems";
- private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.SelectItems";
+ private static final String COMPONENT_FAMILY = "javax.faces.SelectItems";
private Object value;
@@ -83,9 +83,9 @@
public abstract void setVar(String var);
- public abstract String getLabel();
+ public abstract Object getLabel();
- public abstract void setLabel(String label);
+ public abstract void setLabel(Object label);
public abstract Boolean getDisabled();
@@ -155,7 +155,7 @@
for (Object o : iterable)
{
initVar(o);
- selectItems.add(new javax.faces.model.SelectItem(o, getLabel(), "", getDisabled() == null ? false : getDisabled()));
+ selectItems.add(new javax.faces.model.SelectItem(o, getLabel() == null ? null : getLabel().toString(), "", getDisabled() == null ? false : getDisabled()));
destroyVar();
}
return selectItems;
@@ -173,7 +173,7 @@
* that if the result of the EL expression is an empty String, then the label will be hidden.
*/
ValueExpression vb = getValueExpression("noSelectionLabel");
- if (vb == null && !(getHideNoSelectionLabel() && getParentValue() != null))
+ if (getNoSelectionLabel() != null && vb == null && !(getHideNoSelectionLabel() && getParentValue() != null))
{
/*
* Here, the user has specfied a noSelectionLabel (may be an empty string), and, if hideNoSelectionLabel
1.2 +0 -6 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIValidateAll.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIValidateAll.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIValidateAll.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UIValidateAll.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -15,12 +15,6 @@
private boolean validatorsAdded = false;
- @Override
- public boolean getRendersChildren()
- {
- return true;
- }
-
public boolean isValidatorsAdded()
{
return validatorsAdded;
1.2 +12 -0 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UILink.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UILink.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UILink.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UILink.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UILink.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -32,4 +32,16 @@
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Link";
+ public abstract String getStyleClass();
+
+ public abstract void setStyleClass(String styleClass);
+
+ public abstract String getStyle();
+
+ public abstract void setStyle(String style);
+
+ public abstract boolean isDisabled();
+
+ public abstract void setDisabled(boolean disabled);
+
}
1.2 +2 -2 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UILoadStyle.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UILoadStyle.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UILoadStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UILoadStyle.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UILoadStyle.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -7,7 +7,7 @@
import javax.faces.component.UIParameter;
import org.ajax4jsf.ajax.html.HtmlLoadStyle;
-import org.jboss.seam.core.Pages;
+import org.jboss.seam.navigation.Pages;
import org.jboss.seam.ui.resource.StyleResource;
import org.jboss.seam.ui.util.UrlBuilder;
@@ -22,7 +22,7 @@
uiConversationId.setViewId(Pages.getViewId(getFacesContext()));
try
{
- UrlBuilder urlBuilder = new UrlBuilder(StyleResource.WEB_RESOURCE_PATH + super.getSrc());
+ UrlBuilder urlBuilder = new UrlBuilder(StyleResource.WEB_RESOURCE_PATH + super.getSrc(), null);
urlBuilder.addParameter(uiConversationId);
if (isIsolated())
{
1.2 +1 -8 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISpan.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UISpan.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISpan.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UISpan.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UISpan.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -21,22 +21,15 @@
package org.jboss.seam.ui.component;
-import javax.faces.component.UIComponentBase;
/**
* JSF component class
*
*/
-public abstract class UISpan extends UIComponentBase {
+public abstract class UISpan extends UIStyle {
private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Span";
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Span";
- @Override
- public boolean getRendersChildren()
- {
- return true;
- }
-
}
1.2 +16 -9 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIButton.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIButton.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIButton.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIButton.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UIButton.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -32,18 +32,25 @@
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Button";
+ public abstract String getStyleClass();
+
+ public abstract void setStyleClass(String styleClass);
+
+ public abstract String getStyle();
+
+ public abstract void setStyle(String style);
+
+ public abstract boolean isDisabled();
+
+ public abstract void setDisabled(boolean disabled);
+
+ public abstract String getOnclick();
+
+ public abstract void setOnclick(String onclick);
+
public abstract String getImage();
public abstract void setImage(String image);
- public String getType()
- {
- if (getImage() == null) {
- return "button";
- } else {
- return "image";
- }
- }
-
}
1.2 +2 -2 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIAction.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIAction.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIAction.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UIAction.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -24,8 +24,8 @@
import javax.faces.component.UIParameter;
import javax.faces.context.FacesContext;
-import org.jboss.seam.core.Pages;
-import org.jboss.seam.core.SafeActions;
+import org.jboss.seam.navigation.Pages;
+import org.jboss.seam.navigation.SafeActions;
/*
* This is a support component and is not processed by the CDK (doesn't appear in faces-config)
1.2 +3 -2 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/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 15 Jun 2007 17:06:57 -0000 1.1
+++ UIConversationId.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -26,8 +26,9 @@
import org.jboss.seam.core.Conversation;
import org.jboss.seam.core.Manager;
-import org.jboss.seam.core.Pages;
-import org.jboss.seam.pages.Page;
+import org.jboss.seam.navigation.Page;
+import org.jboss.seam.navigation.Pages;
+
/**
* JSF component class
1.2 +58 -27 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIFileUpload.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIFileUpload.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UIFileUpload.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -20,7 +20,7 @@
private String localFileName;
- private int localFileSize;
+ private Integer localFileSize;
private InputStream localInputStream;
@@ -32,15 +32,17 @@
public void processUpdates(FacesContext context)
{
+ if (getLocalInputStream() != null)
+ {
ValueExpression dataBinding = getValueExpression("data");
if (dataBinding != null)
{
- Class cls = dataBinding.getType(context.getELContext());
- if (cls.isAssignableFrom(InputStream.class))
+ Class clazz = dataBinding.getType(context.getELContext());
+ if (clazz.isAssignableFrom(InputStream.class))
{
dataBinding.setValue(context.getELContext(), localInputStream);
}
- else if (cls.isAssignableFrom(byte[].class))
+ else if (clazz.isAssignableFrom(byte[].class))
{
ByteArrayOutputStream bos = new ByteArrayOutputStream();
try
@@ -57,14 +59,33 @@
}
}
- ValueExpression vb = getValueExpression("contentType");
- if (vb != null) vb.setValue(context.getELContext(), localContentType);
+ if (getLocalContentType() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("contentType");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalContentType());
+ }
+ }
- vb = getValueExpression("fileName");
- if (vb != null) vb.setValue(context.getELContext(), localFileName);
+ if (getLocalFileName() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("fileName");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalFileName());
+ }
+ }
- vb = getValueExpression("fileSize");
- if (vb != null) vb.setValue(context.getELContext(), localFileSize);
+ if (getLocalFileSize() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("fileSize");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalFileSize());
+ }
+ }
+ }
}
}
@@ -88,12 +109,12 @@
this.localFileName = localFileName;
}
- public int getLocalFileSize()
+ public Integer getLocalFileSize()
{
return localFileSize;
}
- public void setLocalFileSize(int localFileSize)
+ public void setLocalFileSize(Integer localFileSize)
{
this.localFileSize = localFileSize;
}
@@ -108,6 +129,16 @@
this.localInputStream = localInputStream;
}
+ public abstract void setAccept(String accept);
+
+ public abstract String getAccept();
+
+ public abstract String getStyleClass();
+
+ public abstract String getStyle();
+
+ public abstract void setStyleClass(String styleClass);
+ public abstract void setStyle(String style);
}
1.2 +0 -6 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIDecorate.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIDecorate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIDecorate.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UIDecorate.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -55,12 +55,6 @@
}
}
- @Override
- public boolean getRendersChildren()
- {
- return true;
- }
-
public abstract String getFor();
1.2 +5 -14 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/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UISeamCommandBase.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UISeamCommandBase.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -6,7 +6,7 @@
import java.util.Set;
import javax.el.ValueExpression;
-import javax.faces.component.ActionSource2;
+import javax.faces.component.ActionSource;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
import javax.faces.component.UIOutput;
@@ -15,18 +15,14 @@
import javax.faces.event.ActionListener;
import javax.faces.model.DataModel;
-import org.jboss.seam.core.Pages;
+import org.jboss.seam.navigation.Pages;
import org.jboss.seam.ui.util.ViewUrlBuilder;
-public abstract class UISeamCommandBase extends UIOutput implements ActionSource2
+public abstract class UISeamCommandBase extends UIOutput implements ActionSource
{
private String encodedUrl;
- public abstract boolean isDisabled();
-
- public abstract void setDisabled(boolean disabled);
-
public abstract String getView();
public String getUrl() throws UnsupportedEncodingException
@@ -65,12 +61,11 @@
}
}
- if (getActionExpression() != null || getOutcome() != null)
+ if (getAction() != null || getOutcome() != null)
{
UIAction uiAction = new UIAction();
- uiAction.setAction(getActionExpression() == null ? getOutcome() : getActionExpression()
- .getExpressionString());
+ uiAction.setAction(getAction().getExpressionString() == null ? getOutcome() : getAction().getExpressionString());
url.addParameter(uiAction);
}
@@ -127,10 +122,6 @@
public abstract void setFragment(String fragment);
- public abstract String getOnclick();
-
- public abstract void setOnclick(String onclick);
-
public UISelection getSelection()
{
UIData parentUIData = getParentUIData();
1.2 +1 -9 jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIDiv.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UIDiv.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIDiv.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UIDiv.java 15 Jun 2007 17:06:57 -0000 1.1
+++ UIDiv.java 19 Jun 2007 21:57:45 -0000 1.2
@@ -21,22 +21,14 @@
package org.jboss.seam.ui.component;
-import javax.faces.component.UIComponentBase;
-
/**
* JSF component class
*
*/
-public abstract class UIDiv extends UIComponentBase {
+public abstract class UIDiv extends UIStyle {
private static final String COMPONENT_TYPE = "org.jboss.seam.ui.Div";
private static final String COMPONENT_FAMILY = "org.jboss.seam.ui.Div";
- @Override
- public boolean getRendersChildren()
- {
- return true;
- }
-
}
1.1 date: 2007/06/19 21:57:45; author: pmuir; state: Exp;jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UIStyle.java
Index: UIStyle.java
===================================================================
package org.jboss.seam.ui.component;
import javax.faces.component.UIComponentBase;
public abstract class UIStyle extends UIComponentBase
{
public abstract String getStyleClass();
public abstract String getStyle();
public abstract void setStyleClass(String styleClass);
public abstract void setStyle(String style);
}
More information about the jboss-cvs-commits
mailing list