You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/01/23 01:00:11 UTC
svn commit: r498860 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
component/ taglib/component/
Author: bommel
Date: Mon Jan 22 16:00:09 2007
New Revision: 498860
URL: http://svn.apache.org/viewvc?view=rev&rev=498860
Log:
(TOBAGO-215) markup attribute for all input components
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectOne.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectOne.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectOne.java?view=diff&rev=498860&r1=498859&r2=498860
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectOne.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectOne.java Mon Jan 22 16:00:09 2007
@@ -28,11 +28,27 @@
* Date: May 31, 2005
* Time: 7:47:11 PM
*/
-public class UISelectOne extends javax.faces.component.UISelectOne {
+public class UISelectOne extends javax.faces.component.UISelectOne implements SupportsMarkup {
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.SelectOne";
public static final String MESSAGE_VALUE_REQUIRED = "tobago.SelectOne.MESSAGE_VALUE_REQUIRED";
+ private String[] markup;
+
+ public void restoreState(FacesContext context, Object state) {
+ Object[] values = (Object[]) state;
+ super.restoreState(context, values[0]);
+ markup = (String[]) values[1];
+ }
+
+ public Object saveState(FacesContext context) {
+ Object[] values = new Object[2];
+ values[0] = super.saveState(context);
+ values[1] = markup;
+ return values;
+ }
+
+
public void encodeBegin(FacesContext facesContext) throws IOException {
// TODO change this should be renamed to DimensionUtils.prepare!!!
UILayout.getLayout(this).layoutBegin(facesContext, this);
@@ -51,6 +67,17 @@
}
}
super.validate(facesContext);
+ }
+
+ public String[] getMarkup() {
+ if (markup != null) {
+ return markup;
+ }
+ return ComponentUtil.getMarkupBinding(getFacesContext(), this);
+ }
+
+ public void setMarkup(String[] markup) {
+ this.markup = markup;
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTag.java?view=diff&rev=498860&r1=498859&r2=498860
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTag.java Mon Jan 22 16:00:09 2007
@@ -26,6 +26,7 @@
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_DATE;
import org.apache.myfaces.tobago.component.UIDateInput;
+import org.apache.myfaces.tobago.component.ComponentUtil;
import javax.faces.component.UIComponent;
@@ -33,6 +34,8 @@
private static final Log LOG = LogFactory.getLog(DateTag.class);
+ private String markup;
+
public String getComponentType() {
return UIDateInput.COMPONENT_TYPE;
}
@@ -41,14 +44,21 @@
return RENDERER_TYPE_DATE;
}
-
protected void setProperties(UIComponent component) {
if (getLabel() != null) {
LOG.warn("the label attribute is deprecated in tc:date, please use tx:date instead.");
}
+ ComponentUtil.setMarkup(component, markup);
super.setProperties(component);
}
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
+ public void release() {
+ super.release();
+ markup = null;
+ }
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java?view=diff&rev=498860&r1=498859&r2=498860
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/DateTagDeclaration.java Mon Jan 22 16:00:09 2007
@@ -29,6 +29,7 @@
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
/*
* Created: Aug 5, 2005 5:03:15 PM
@@ -45,6 +46,6 @@
public interface DateTagDeclaration
extends InputTagDeclaration, HasIdBindingAndRendered, IsReadonly,
IsDisabled, HasConverter, IsInline, IsFocus, HasLabelAndAccessKey,
- HasTip, IsRequired {
+ HasTip, IsRequired, HasMarkup {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTag.java?view=diff&rev=498860&r1=498859&r2=498860
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTag.java Mon Jan 22 16:00:09 2007
@@ -23,10 +23,29 @@
*/
import org.apache.myfaces.tobago.component.UISelectOne;
+import org.apache.myfaces.tobago.component.ComponentUtil;
+
+import javax.faces.component.UIComponent;
public class SelectOneTag extends InputTag implements SelectOneTagDeclaration {
+ private String markup;
+
public String getComponentType() {
return UISelectOne.COMPONENT_TYPE;
+ }
+
+ protected void setProperties(UIComponent component) {
+ ComponentUtil.setMarkup(component, markup);
+ super.setProperties(component);
+ }
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
+
+ public void release() {
+ super.release();
+ markup = null;
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java?view=diff&rev=498860&r1=498859&r2=498860
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneTagDeclaration.java Mon Jan 22 16:00:09 2007
@@ -17,12 +17,14 @@
* limitations under the License.
*/
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
+
/*
* Created: Aug 5, 2005 5:27:47 PM
* User: bommel
* $Id: $
*/
-public interface SelectOneTagDeclaration extends InputTagDeclaration {
+public interface SelectOneTagDeclaration extends InputTagDeclaration, HasMarkup {
}