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/08/03 14:37:54 UTC
svn commit: r562435 -
/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
Author: bommel
Date: Fri Aug 3 05:37:52 2007
New Revision: 562435
URL: http://svn.apache.org/viewvc?view=rev&rev=562435
Log:
(TOBAGO-460) Markup attribute for label
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?view=diff&rev=562435&r1=562434&r2=562435
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java Fri Aug 3 05:37:52 2007
@@ -24,7 +24,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INLINE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import static org.apache.myfaces.tobago.TobagoConstants.FACET_LABEL;
import org.apache.myfaces.tobago.component.ComponentUtil;
@@ -35,7 +34,6 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlRendererUtil;
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.util.AccessKeyMap;
-import org.apache.myfaces.tobago.util.LayoutUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -79,13 +77,6 @@
UIOutput output = (UIOutput) component;
- Integer width = LayoutUtil.getLayoutWidth(output);
- if (width == null
- && !(ComponentUtil.getBooleanAttribute(findParent(component), ATTR_INLINE)
- || ComponentUtil.getBooleanAttribute(component, ATTR_INLINE))) {
- width = Integer.valueOf(getConfiguredValue(facesContext, component, "labelWidth"));
- }
-
LabelWithAccessKey label = new LabelWithAccessKey(component);
String forValue = ComponentUtil.findClientIdFor(output, facesContext);
@@ -105,9 +96,7 @@
writer.writeAttribute(HtmlAttributes.FOR, forValue, false);
}
writer.writeClassAttribute();
- //if (width != null) {
- // writer.writeAttribute(HtmlAttributes.STYLE, "width: " + width + "px;", false);
- //}
+
writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
if (label.getText() != null) {
@@ -121,8 +110,7 @@
&& !AccessKeyMap.addAccessKey(facesContext, label.getAccessKey())) {
LOG.info("dublicated accessKey : " + label.getAccessKey());
}
- HtmlRendererUtil.addClickAcceleratorKey(
- facesContext, clientId, label.getAccessKey());
+ HtmlRendererUtil.addClickAcceleratorKey(facesContext, clientId, label.getAccessKey());
}
writer.endElement(HtmlConstants.DIV);
}