You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2009/11/10 11:44:03 UTC
svn commit: r834419 - in
/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag:
SelectOneChoiceRenderer.java SelectOneListboxRenderer.java
TextAreaRenderer.java
Author: lofwyr
Date: Tue Nov 10 10:44:03 2009
New Revision: 834419
URL: http://svn.apache.org/viewvc?rev=834419&view=rev
Log:
simplify: replace attribute list call with getter
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java?rev=834419&r1=834418&r2=834419&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneChoiceRenderer.java Tue Nov 10 10:44:03 2009
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.component.Attributes;
import org.apache.myfaces.tobago.component.UISelectOneChoice;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.renderkit.HtmlUtils;
@@ -29,7 +28,6 @@
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
import org.apache.myfaces.tobago.renderkit.util.RenderUtil;
-import org.apache.myfaces.tobago.util.ComponentUtils;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
import javax.faces.component.UIComponent;
@@ -59,10 +57,7 @@
String id = select.getClientId(facesContext);
List<SelectItem> items = RenderUtil.getSelectItems(select);
String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
-
- boolean disabled = items.size() == 0
- || ComponentUtils.getBooleanAttribute(select, Attributes.DISABLED)
- || ComponentUtils.getBooleanAttribute(select, Attributes.READONLY);
+ boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
writer.startElement(HtmlConstants.SELECT, select);
writer.writeNameAttribute(id);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java?rev=834419&r1=834418&r2=834419&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectOneListboxRenderer.java Tue Nov 10 10:44:03 2009
@@ -56,10 +56,7 @@
String id = select.getClientId(facesContext);
List<SelectItem> items = RenderUtil.getSelectItems(select);
-
- boolean disabled = items.size() == 0
- || ComponentUtils.getBooleanAttribute(select, Attributes.DISABLED)
- || ComponentUtils.getBooleanAttribute(select, Attributes.READONLY);
+ boolean disabled = items.size() == 0 || select.isDisabled() || select.isReadonly();
writer.startElement(HtmlConstants.SELECT, select);
writer.writeNameAttribute(id);
@@ -78,9 +75,7 @@
writer.writeAttribute(HtmlAttributes.ONCHANGE, "Tobago.selectOneListboxChange(this)", false);
writer.writeAttribute(HtmlAttributes.ONCLICK, "Tobago.selectOneListboxClick(this)", false);
}
-
Object[] values = {select.getValue()};
-
HtmlRendererUtils.renderSelectItems(select, items, values, writer, facesContext);
writer.endElement(HtmlConstants.SELECT);
@@ -89,6 +84,5 @@
HtmlRendererUtils.checkForCommandFacet(select, facesContext, writer);
}
-
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java?rev=834419&r1=834418&r2=834419&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TextAreaRenderer.java Tue Nov 10 10:44:03 2009
@@ -68,10 +68,8 @@
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
- writer.writeAttribute(HtmlAttributes.READONLY,
- ComponentUtils.getBooleanAttribute(input, Attributes.READONLY));
- writer.writeAttribute(HtmlAttributes.DISABLED,
- ComponentUtils.getBooleanAttribute(input, Attributes.DISABLED));
+ writer.writeAttribute(HtmlAttributes.READONLY, input.isReadonly());
+ writer.writeAttribute(HtmlAttributes.DISABLED, input.isDisabled());
Integer tabIndex = input.getTabIndex();
if (tabIndex != null) {
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);