svn commit: r170486 - in /myfaces/trunk: conf/faces-config.xml src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java src/components/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java webapps/examples/sample2.jsp

[mm...@apache.org]

Author: mmarinschek
Date: Mon May 16 15:59:41 2005
New Revision: 170486

URL: http://svn.apache.org/viewcvs?rev=170486&view=rev
Log:
final changes to use utility methods and create the correct renderers.

Modified:
    myfaces/trunk/conf/faces-config.xml
    myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
    myfaces/trunk/src/components/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
    myfaces/trunk/webapps/examples/sample2.jsp

Modified: myfaces/trunk/conf/faces-config.xml
URL: http://svn.apache.org/viewcvs/myfaces/trunk/conf/faces-config.xml?rev=170486&r1=170485&r2=170486&view=diff
==============================================================================
--- myfaces/trunk/conf/faces-config.xml (original)
+++ myfaces/trunk/conf/faces-config.xml Mon May 16 15:59:41 2005
@@ -375,13 +375,13 @@
         </renderer>
 
         <renderer>
-            <component-family>javax.faces.Grid</component-family>
+            <component-family>javax.faces.Panel</component-family>
             <renderer-type>org.apache.myfaces.Grid</renderer-type>
             <renderer-class>org.apache.myfaces.renderkit.html.ext.HtmlGridRenderer</renderer-class>
         </renderer>
 
         <renderer>
-            <component-family>javax.faces.Group</component-family>
+            <component-family>javax.faces.Panel</component-family>
             <renderer-type>org.apache.myfaces.Group</renderer-type>
             <renderer-class>org.apache.myfaces.renderkit.html.ext.HtmlGroupRenderer</renderer-class>
         </renderer>

Modified: myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java?rev=170486&r1=170485&r2=170486&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/custom/inputHtml/InputHtmlRenderer.java Mon May 16 15:59:41 2005
@@ -58,7 +58,7 @@
     public void encodeEnd(FacesContext context, UIComponent uiComponent) throws IOException {
         RendererUtils.checkParamValidity(context, uiComponent, InputHtml.class);
 		InputHtml editor = (InputHtml) uiComponent;
-		if( editor.isDisplayValueOnly() )
+		if( HtmlRendererUtils.isDisplayValueOnly(editor) )
 			encodeDisplayValueOnly(context, editor);
 		else if( useFallback(editor) )
 			encodeEndFallBackMode(context, editor);
@@ -71,14 +71,9 @@
 		// Use only a textarea
 		ResponseWriter writer = context.getResponseWriter();
         writer.startElement(HTML.SPAN_ELEM, editor);
-
-        writer.writeAttribute(HTML.NAME_ATTR, clientId, null);
         HtmlRendererUtils.writeIdIfNecessary(writer, editor, context);
 
-		if( editor.getDisplayValueOnlyStyle()!=null )
-            writer.writeAttribute(HTML.STYLE_ATTR, editor.getDisplayValueOnlyStyle(), null);
-		if( editor.getDisplayValueOnlyStyleClass()!=null )
-            writer.writeAttribute(HTML.STYLE_CLASS_ATTR, editor.getDisplayValueOnlyStyleClass(), null);
+        HtmlRendererUtils.renderDisplayValueOnlyAttributes(editor, writer);
 
         String text = RendererUtils.getStringValue(context, editor);
         writer.write( getHtmlBody( text ) );

Modified: myfaces/trunk/src/components/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/trunk/src/components/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java?rev=170486&r1=170485&r2=170486&view=diff
==============================================================================
--- myfaces/trunk/src/components/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java (original)
+++ myfaces/trunk/src/components/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java Mon May 16 15:59:41 2005
@@ -54,7 +54,7 @@
         {
             renderSingleCheckbox(context, (HtmlCheckbox)component);
         }
-        else if (component instanceof DisplayValueOnlyCapable && ((DisplayValueOnlyCapable) component).isDisplayValueOnly())
+        else if (component instanceof DisplayValueOnlyCapable && HtmlRendererUtils.isDisplayValueOnly(component))
         {
             HtmlRendererUtils.renderDisplayValueOnlyForSelects(context, component);
         }

Modified: myfaces/trunk/webapps/examples/sample2.jsp
URL: http://svn.apache.org/viewcvs/myfaces/trunk/webapps/examples/sample2.jsp?rev=170486&r1=170485&r2=170486&view=diff
==============================================================================
Binary files - no diff available.