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 2006/11/23 23:34:12 UTC
svn commit: r478692 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
TobagoConstants.java component/ComponentUtil.java
renderkit/html/HtmlRendererUtil.java
Author: bommel
Date: Thu Nov 23 14:34:11 2006
New Revision: 478692
URL: http://svn.apache.org/viewvc?view=rev&rev=478692
Log:
(TOBAGO-198) Support for a standard required css class for UIInput Renderer like readonly required disabled..
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java?view=diff&rev=478692&r1=478691&r2=478692
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/TobagoConstants.java Thu Nov 23 14:34:11 2006
@@ -100,6 +100,7 @@
public static final String ATTR_PAGE_MENU = "pageMenu";
public static final String ATTR_PASSWORD = "password";
public static final String ATTR_POPUP_LIST = "popupList";
+ //public static final String ATTR_PARTIALLY_RENDERED_COMPONENTS = "partiallyRenderedComponents";
public static final String ATTR_POPUP_RESET = "popupReset";
public static final String ATTR_POPUP_CALENDAR_FORCE_TIME = "popupCalendarForceTime";
public static final String ATTR_POPUP_CALENDAR_ID = "popupCalendarId";
@@ -220,6 +221,7 @@
public static final String TOBAGO_CSS_CLASS_SUFFIX_READONLY = "-readonly ";
public static final String TOBAGO_CSS_CLASS_SUFFIX_INLINE = "-inline ";
public static final String TOBAGO_CSS_CLASS_SUFFIX_ERROR = "-error ";
+ public static final String TOBAGO_CSS_CLASS_SUFFIX_REQUIRED = "-required";
private TobagoConstants() {
// to prevent instantiation
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java?view=diff&rev=478692&r1=478691&r2=478692
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java Thu Nov 23 14:34:11 2006
@@ -44,6 +44,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.COMMAND_TYPE_SCRIPT;
import static org.apache.myfaces.tobago.TobagoConstants.FACET_ITEMS;
import static org.apache.myfaces.tobago.TobagoConstants.FACET_LABEL;
+//import static org.apache.myfaces.tobago.TobagoConstants.ATTR_PARTIALLY_RENDERED_COMPONENTS;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_LABEL;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_OUT;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_SELECT_BOOLEAN_CHECKBOX;
@@ -235,13 +236,15 @@
return false;
}
+ public static boolean isError(javax.faces.component.UIInput uiInput) {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ return !uiInput.isValid()
+ || facesContext.getMessages(uiInput.getClientId(facesContext)).hasNext();
+ }
+
public static boolean isError(UIComponent component) {
- if (component instanceof EditableValueHolder) {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- Iterator messages
- = facesContext.getMessages(component.getClientId(facesContext));
- return !((EditableValueHolder) component).isValid()
- || messages.hasNext();
+ if (component instanceof UIInput) {
+ return isError((UIInput) component);
}
return false;
}
@@ -284,6 +287,19 @@
}
}
+ /* public static void setPartiallyRenderedComponents(UIComponent component, String renderers) {
+
+ if (renderers != null) {
+ if (UIComponentTag.isValueReference(renderers)) {
+ component.setValueBinding(ATTR_PARTIALLY_RENDERED_COMPONENTS, createValueBinding(renderers));
+ } else {
+ String [] components = renderers.split(",");
+ component.getAttributes().put(ATTR_PARTIALLY_RENDERED_COMPONENTS, components);
+ }
+ }
+
+ }*/
+
public static Object getAttribute(UIComponent component, String name) {
Object value = component.getAttributes().get(name);
if (value instanceof ValueBinding) {
@@ -496,7 +512,7 @@
}
private static String toString(UIComponent component, int offset, boolean asFacet) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
if (component == null) {
result.append("null");
} else {
@@ -526,7 +542,7 @@
}
private static String toString(UIComponent component) {
- StringBuffer buf = new StringBuffer(component.getClass().getName());
+ StringBuilder buf = new StringBuilder(component.getClass().getName());
buf.append('@');
buf.append(Integer.toHexString(component.hashCode()));
buf.append(" ");
@@ -543,7 +559,7 @@
}
private static String spaces(int n) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int i = 0; i < n; i++) {
buffer.append(" ");
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java?view=diff&rev=478692&r1=478691&r2=478692
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java Thu Nov 23 14:34:11 2006
@@ -42,6 +42,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.TOBAGO_CSS_CLASS_SUFFIX_ERROR;
import static org.apache.myfaces.tobago.TobagoConstants.TOBAGO_CSS_CLASS_SUFFIX_INLINE;
import static org.apache.myfaces.tobago.TobagoConstants.TOBAGO_CSS_CLASS_SUFFIX_READONLY;
+import static org.apache.myfaces.tobago.TobagoConstants.TOBAGO_CSS_CLASS_SUFFIX_REQUIRED;
import static org.apache.myfaces.tobago.TobagoConstants.FACET_LAYOUT;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.SupportsMarkup;
@@ -438,9 +439,16 @@
if (ComponentUtil.getBooleanAttribute(component, ATTR_INLINE)) {
tobagoClass.append(prefix).append(TOBAGO_CSS_CLASS_SUFFIX_INLINE);
}
- if (ComponentUtil.isError(component)) {
- tobagoClass.append(prefix).append(TOBAGO_CSS_CLASS_SUFFIX_ERROR);
+ if (component instanceof UIInput) {
+ UIInput input = (UIInput) component;
+ if (ComponentUtil.isError(input)) {
+ tobagoClass.append(prefix).append(TOBAGO_CSS_CLASS_SUFFIX_ERROR);
+ }
+ if (input.isRequired()) {
+ tobagoClass.append(prefix).append(TOBAGO_CSS_CLASS_SUFFIX_REQUIRED);
+ }
}
+
addMarkupClass(component, rendererName, tobagoClass);
return tobagoClass.append(cssClass).toString();
}