myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r380686 [2/5] - in /myfaces/shared/trunk: ./ src/main/java/ src/main/java/org/apache/myfaces/component/ src/main/java/org/apache/myfaces/config/ src/main/java/org/apache/myfaces/context/ src/main/java/org/apache/myfaces/el/ src/main/java/or...
Date Fri, 24 Feb 2006 15:19:48 GMT
Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -55,9 +55,9 @@
 
     public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
             throws IOException {
-        RendererUtils.checkParamValidity(facesContext, uiComponent, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
         if (uiComponent instanceof UISelectBoolean) {
-            Boolean value = RendererUtils.getBooleanValue( uiComponent );
+            Boolean value = org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanValue( uiComponent );
             boolean isChecked = value != null ? value.booleanValue() : false;
             renderCheckbox(facesContext, uiComponent, EXTERNAL_TRUE_VALUE,
                     null, false,isChecked, true); //TODO: the selectBoolean is never disabled
@@ -97,7 +97,7 @@
         
         Converter converter;
         try {
-            converter = RendererUtils.findUISelectManyConverter(facesContext,
+            converter = org.apache.myfaces.shared.renderkit.RendererUtils.findUISelectManyConverter(facesContext,
                     selectMany);
         } catch (FacesException e) {
             log.error("Error finding Converter for component with id "
@@ -105,14 +105,14 @@
             converter = null;
         }
 
-        Set lookupSet = RendererUtils.getSubmittedValuesAsSet(facesContext, selectMany, converter, selectMany);
+        Set lookupSet = org.apache.myfaces.shared.renderkit.RendererUtils.getSubmittedValuesAsSet(facesContext, selectMany, converter, selectMany);
         boolean useSubmittedValues = lookupSet != null;
 
         if (!useSubmittedValues) {
-            lookupSet = RendererUtils.getSelectedValuesAsSet(facesContext, selectMany, converter, selectMany);
+            lookupSet = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectedValuesAsSet(facesContext, selectMany, converter, selectMany);
         }
 
-        for (Iterator it = RendererUtils.getSelectItemList(selectMany)
+        for (Iterator it = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(selectMany)
                 .iterator(); it.hasNext();) {
             SelectItem selectItem = (SelectItem) it.next();
             
@@ -206,7 +206,7 @@
         if (componentDisabled || disabled) {
             labelClass = (String) selectMany.getAttributes().get(JSFAttr.DISABLED_CLASS_ATTR);
         } else {
-            labelClass = (String) selectMany.getAttributes().get(JSFAttr.ENABLED_CLASS_ATTR);
+            labelClass = (String) selectMany.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.ENABLED_CLASS_ATTR);
         }
         if (labelClass != null) {
             writer.writeAttribute("class", labelClass, "labelClass");
@@ -238,7 +238,7 @@
         }
 
         if (checked) {
-            writer.writeAttribute(HTML.CHECKED_ATTR, HTML.CHECKED_ATTR, null);
+            writer.writeAttribute(HTML.CHECKED_ATTR, org.apache.myfaces.shared.renderkit.html.HTML.CHECKED_ATTR, null);
         }
         
         if (disabled) {
@@ -270,13 +270,13 @@
         } else if (component instanceof HtmlSelectManyCheckbox) {
             return ((HtmlSelectManyCheckbox) component).isDisabled();
         } else {
-            return RendererUtils.getBooleanAttribute(component,
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component,
                     HTML.DISABLED_ATTR, false);
         }
     }
 
     public void decode(FacesContext facesContext, UIComponent component) {
-        RendererUtils.checkParamValidity(facesContext, component, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, null);
         if (component instanceof UISelectBoolean) {
             HtmlRendererUtils.decodeUISelectBoolean(facesContext, component);
         } else if (component instanceof UISelectMany) {
@@ -290,11 +290,11 @@
     public Object getConvertedValue(FacesContext facesContext,
             UIComponent component, Object submittedValue)
             throws ConverterException {
-        RendererUtils.checkParamValidity(facesContext, component, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, null);
         if (component instanceof UISelectBoolean) {
             return submittedValue;
         } else if (component instanceof UISelectMany) {
-            return RendererUtils.getConvertedUISelectManyValue(facesContext,
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUISelectManyValue(facesContext,
                     (UISelectMany) component, submittedValue);
         } else {
             throw new IllegalArgumentException("Unsupported component class "

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.16

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlFormRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 import javax.faces.application.ViewHandler;
 import javax.faces.component.UIComponent;
@@ -51,7 +50,7 @@
     public void encodeBegin(FacesContext facesContext, UIComponent component)
             throws IOException
     {
-        RendererUtils.checkParamValidity(facesContext, component, UIForm.class);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, UIForm.class);
 
         UIForm htmlForm = (UIForm)component;
 
@@ -88,15 +87,15 @@
 
         if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll())
         {
-            JavascriptUtils.renderAutoScrollHiddenInput(facesContext,writer);
+            org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils.renderAutoScrollHiddenInput(facesContext,writer);
         }
         
         if(!facesContext.getApplication().getStateManager().isSavingStateInClient(facesContext))
         {
             writer.startElement(HTML.INPUT_ELEM, component);
             writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
-            writer.writeAttribute(HTML.NAME_ATTR, RendererUtils.SEQUENCE_PARAM, null);
-            writer.writeAttribute(HTML.VALUE_ATTR, RendererUtils.getViewSequence(facesContext), null);
+            writer.writeAttribute(HTML.NAME_ATTR, org.apache.myfaces.shared.renderkit.RendererUtils.SEQUENCE_PARAM, null);
+            writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.VALUE_ATTR, org.apache.myfaces.shared.renderkit.RendererUtils.getViewSequence(facesContext), null);
             writer.endElement(HTML.INPUT_ELEM);
         }
 
@@ -133,7 +132,7 @@
 
     public void decode(FacesContext facesContext, UIComponent component)
     {
-        RendererUtils.checkParamValidity(facesContext, component, UIForm.class);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, component, UIForm.class);
 
         /*
         if (HTMLUtil.isDisabled(component))

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.9

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlFormRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.util.ArrayUtils;
-import org.apache.myfaces.util.StringUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.util.ArrayUtils;
+import org.apache.myfaces.shared.util.StringUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
@@ -70,7 +71,7 @@
         }
         else
         {
-            Integer i = (Integer)component.getAttributes().get(JSFAttr.COLUMNS_ATTR);
+            Integer i = (Integer)component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.COLUMNS_ATTR);
             columns = i != null ? i.intValue() : 0;
         }
 
@@ -111,7 +112,7 @@
         if (facet == null) return;
 
         HtmlRendererUtils.writePrettyLineSeparator(context);
-        writer.startElement(header ? HTML.THEAD_ELEM : HTML.TFOOT_ELEM, component);
+        writer.startElement(header ? org.apache.myfaces.shared.renderkit.html.HTML.THEAD_ELEM : HTML.TFOOT_ELEM, component);
         writer.startElement(HTML.TR_ELEM, component);
         writer.startElement(header ? HTML.TH_ELEM : HTML.TD_ELEM, component);
 
@@ -121,11 +122,11 @@
                          ((HtmlPanelGrid)component).getFooterClass())
             : (header ?
                          (String)component.getAttributes().get(JSFAttr.HEADER_CLASS_ATTR) :
-                         (String)component.getAttributes().get(JSFAttr.FOOTER_CLASS_ATTR));
+                         (String)component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR));
         if (styleClass != null)
         {
             writer.writeAttribute(HTML.CLASS_ATTR, styleClass,
-                                  header ? JSFAttr.HEADER_CLASS_ATTR : JSFAttr.FOOTER_CLASS_ATTR);
+                                  header ? JSFAttr.HEADER_CLASS_ATTR : org.apache.myfaces.shared.renderkit.JSFAttr.FOOTER_CLASS_ATTR);
         }
 
         if (header)
@@ -162,7 +163,7 @@
         }
         else
         {
-            columnClasses = (String)component.getAttributes().get(JSFAttr.COLUMN_CLASSES_ATTR);
+            columnClasses = (String)component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.COLUMN_CLASSES_ATTR);
             rowClasses = (String)component.getAttributes().get(JSFAttr.ROW_CLASSES_ATTR);
         }
 
@@ -172,7 +173,7 @@
         int columnClassesCount = columnClassesArray.length;
 
         String[] rowClassesArray = (rowClasses == null)
-            ? ArrayUtils.EMPTY_STRING_ARRAY
+            ? org.apache.myfaces.shared.util.ArrayUtils.EMPTY_STRING_ARRAY
             : StringUtils.trim(StringUtils.splitShortString(rowClasses, ','));
         int rowClassesCount = rowClassesArray.length;
 

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlGroupRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGroupRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
@@ -57,7 +58,7 @@
         {
             span = true;
 
-            writer.startElement(HTML.SPAN_ELEM, component);
+            writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.SPAN_ELEM, component);
 
             HtmlRendererUtils.writeIdIfNecessary(writer, component, context);
 

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlImageRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import java.io.IOException;
 
@@ -25,8 +25,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 
 /**
@@ -38,45 +38,45 @@
 public class HtmlImageRendererBase
         extends HtmlRenderer
 {
-	 private static final Log log = LogFactory.getLog(HtmlImageRendererBase.class);
+     private static final Log log = LogFactory.getLog(HtmlImageRendererBase.class);
 
-	    public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
-	            throws IOException
-	    {
-	        RendererUtils.checkParamValidity(facesContext, uiComponent, UIGraphic.class);
-
-	        ResponseWriter writer = facesContext.getResponseWriter();
-
-	        String url;
-	        if (uiComponent instanceof HtmlGraphicImage)
-	        {
-	            url = ((HtmlGraphicImage)uiComponent).getUrl();
-	        }
-	        else
-	        {
-	            url = (String)uiComponent.getAttributes().get(JSFAttr.URL_ATTR);
-	        }
-
-	        if ((url != null) && (url.length() > 0))
-	        {
-	            writer.startElement(HTML.IMG_ELEM, uiComponent);
-	            
-	            HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
-
-	            String src = facesContext.getApplication()
-	                            .getViewHandler().getResourceURL(facesContext, url);
-	            writer.writeURIAttribute(HTML.SRC_ATTR,
-	                                     facesContext.getExternalContext().encodeResourceURL(src),
-	                                     null);
-
-	            HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
-
-	            writer.endElement(HTML.IMG_ELEM);
-	        }
-	        else
-	        {
-	            if (log.isWarnEnabled()) log.warn("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url).");
-	        }
-	    }
+        public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
+                throws IOException
+        {
+            org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, UIGraphic.class);
+
+            ResponseWriter writer = facesContext.getResponseWriter();
+
+            String url;
+            if (uiComponent instanceof HtmlGraphicImage)
+            {
+                url = ((HtmlGraphicImage)uiComponent).getUrl();
+            }
+            else
+            {
+                url = (String)uiComponent.getAttributes().get(JSFAttr.URL_ATTR);
+            }
+
+            if ((url != null) && (url.length() > 0))
+            {
+                writer.startElement(HTML.IMG_ELEM, uiComponent);
+
+                HtmlRendererUtils.writeIdIfNecessary(writer, uiComponent, facesContext);
+
+                String src = facesContext.getApplication()
+                                .getViewHandler().getResourceURL(facesContext, url);
+                writer.writeURIAttribute(HTML.SRC_ATTR,
+                                         facesContext.getExternalContext().encodeResourceURL(src),
+                                         null);
+
+                HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.IMG_PASSTHROUGH_ATTRIBUTES);
+
+                writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.IMG_ELEM);
+            }
+            else
+            {
+                if (log.isWarnEnabled()) log.warn("Graphic with id " + uiComponent.getClientId(facesContext) + " has no value (url).");
+            }
+        }
 
 }

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -32,12 +32,13 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.event.ActionEvent;
 
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
-import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
-import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.DummyFormUtils;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase;
 
 /**
  * @author Manfred Geiler
@@ -145,10 +146,10 @@
     public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException
     {
         super.encodeEnd(facesContext, component);  //check for NP
-        
+
         if (component instanceof UICommand)
         {
-        		renderCommandLinkEnd(facesContext, component);
+                renderCommandLinkEnd(facesContext, component);
         }
         else if (component instanceof UIOutput)
         {
@@ -224,7 +225,7 @@
             formName = DummyFormUtils.DUMMY_FORM_NAME;
             //dummyFormResponseWriter = DummyFormUtils.getDummyFormResponseWriter(facesContext);
             //dummyFormResponseWriter.setWriteDummyForm(true);
-            DummyFormUtils.setWriteDummyForm(facesContext, true);
+            org.apache.myfaces.shared.renderkit.html.util.DummyFormUtils.setWriteDummyForm(facesContext, true);
         }
 
         StringBuffer onClick = new StringBuffer();
@@ -251,7 +252,7 @@
 
         if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll())
         {
-            JavascriptUtils.appendAutoScrollAssignment(onClick, formName);
+            org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils.appendAutoScrollAssignment(onClick, formName);
         }
 
         //add id parameter for decode
@@ -358,7 +359,7 @@
         {
             hrefBuf.append(RendererUtils.SEQUENCE_PARAM);
             hrefBuf.append('=');
-            hrefBuf.append(RendererUtils.getViewSequence(facesContext));
+            hrefBuf.append(org.apache.myfaces.shared.renderkit.RendererUtils.getViewSequence(facesContext));
         }
         String href = facesContext.getExternalContext().encodeActionURL(hrefBuf.toString());
         writer.startElement(HTML.ANCHOR_ELEM, component);
@@ -393,7 +394,7 @@
         ResponseWriter writer = facesContext.getResponseWriter();
 
         //calculate href
-        String href = RendererUtils.getStringValue(facesContext, output);
+        String href = org.apache.myfaces.shared.renderkit.RendererUtils.getStringValue(facesContext, output);
         if (getChildCount(output) > 0)
         {
             StringBuffer hrefBuf = new StringBuffer(href);
@@ -408,7 +409,7 @@
         writer.startElement(HTML.ANCHOR_ELEM, output);
         writer.writeAttribute(HTML.ID_ATTR, output.getClientId(facesContext), null);
         writer.writeURIAttribute(HTML.HREF_ATTR, href, null);
-        HtmlRendererUtils.renderHTMLAttributes(writer, output, HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
+        HtmlRendererUtils.renderHTMLAttributes(writer, output, org.apache.myfaces.shared.renderkit.html.HTML.ANCHOR_PASSTHROUGH_ATTRIBUTES);
         writer.flush();
     }
 
@@ -425,7 +426,7 @@
         onClick.append(jsForm);
         onClick.append(".elements['").append(name).append("']");
         //UIParameter is no ValueHolder, so no conversion possible
-        String strParamValue = value != null ? HTMLEncoder.encode(value.toString(), false, false) : "";
+        String strParamValue = value != null ? org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(value.toString(), false, false) : "";
         onClick.append(".value='").append(strParamValue).append("';");
 
         if (nestingForm != null)
@@ -470,7 +471,7 @@
     protected void renderCommandLinkEnd(FacesContext facesContext, UIComponent component)
             throws IOException
     {
-    		renderOutputLinkEnd(facesContext, component);
+            renderOutputLinkEnd(facesContext, component);
     }
 
 }

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.19

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlListboxRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UISelectMany;
@@ -39,7 +39,7 @@
     public void encodeEnd(FacesContext facesContext, UIComponent uiComponent)
             throws IOException
     {
-        RendererUtils.checkParamValidity(facesContext, uiComponent, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
 
         if (uiComponent instanceof UISelectMany)
         {
@@ -95,7 +95,7 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, false);
         }
     }
 
@@ -120,11 +120,11 @@
 
     public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException
     {
-        RendererUtils.checkParamValidity(facesContext, uiComponent, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
 
         if (uiComponent instanceof UISelectMany)
         {
-            return RendererUtils.getConvertedUISelectManyValue(facesContext,
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUISelectManyValue(facesContext,
                                                                (UISelectMany)uiComponent,
                                                                submittedValue);
         }

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.5

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UISelectMany;
@@ -74,13 +74,13 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, false);
         }
     }
 
     public void decode(FacesContext facesContext, UIComponent uiComponent)
     {
-        RendererUtils.checkParamValidity(facesContext, uiComponent, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
 
         if (uiComponent instanceof UISelectMany)
         {
@@ -98,17 +98,17 @@
 
     public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException
     {
-        RendererUtils.checkParamValidity(facesContext, uiComponent, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
 
         if (uiComponent instanceof UISelectMany)
         {
-            return RendererUtils.getConvertedUISelectManyValue(facesContext,
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUISelectManyValue(facesContext,
                                                                (UISelectMany)uiComponent,
                                                                submittedValue);
         }
         else if (uiComponent instanceof UISelectOne)
         {
-            return RendererUtils.getConvertedUIOutputValue(facesContext,
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUIOutputValue(facesContext,
                                                            (UISelectOne)uiComponent,
                                                            submittedValue);
         }

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessageRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -29,8 +29,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -172,7 +173,7 @@
 
         if (span)
         {
-            writer.endElement(HTML.SPAN_ELEM);
+            writer.endElement(org.apache.myfaces.shared.renderkit.html.HTML.SPAN_ELEM);
         }
     }
 
@@ -220,33 +221,33 @@
             Map attr = message.getAttributes();
             if (severity == FacesMessage.SEVERITY_INFO)
             {
-                style = (String) attr.get(JSFAttr.INFO_STYLE_ATTR);
-                styleClass = (String) attr.get(JSFAttr.INFO_CLASS_ATTR);
+                style = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.INFO_STYLE_ATTR);
+                styleClass = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.INFO_CLASS_ATTR);
             }
             else if (severity == FacesMessage.SEVERITY_WARN)
             {
-                style = (String) attr.get(JSFAttr.WARN_STYLE_ATTR);
-                styleClass = (String) attr.get(JSFAttr.WARN_CLASS_ATTR);
+                style = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.WARN_STYLE_ATTR);
+                styleClass = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.WARN_CLASS_ATTR);
             }
             else if (severity == FacesMessage.SEVERITY_ERROR)
             {
-                style = (String) attr.get(JSFAttr.ERROR_STYLE_ATTR);
-                styleClass = (String) attr.get(JSFAttr.ERROR_CLASS_ATTR);
+                style = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.ERROR_STYLE_ATTR);
+                styleClass = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.ERROR_CLASS_ATTR);
             }
             else if (severity == FacesMessage.SEVERITY_FATAL)
             {
-                style = (String) attr.get(JSFAttr.FATAL_STYLE_ATTR);
-                styleClass = (String) attr.get(JSFAttr.FATAL_CLASS_ATTR);
+                style = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.FATAL_STYLE_ATTR);
+                styleClass = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.FATAL_CLASS_ATTR);
             }
 
             if (style == null)
             {
-                style = (String) attr.get(JSFAttr.STYLE_CLASS_ATTR);
+                style = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.STYLE_CLASS_ATTR);
             }
 
             if (styleClass == null)
             {
-                styleClass = (String) attr.get(JSFAttr.STYLE_CLASS_ATTR);
+                styleClass = (String) attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.STYLE_CLASS_ATTR);
             }
         }
 
@@ -285,7 +286,7 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(component, JSFAttr.TOOLTIP_ATTR, false);
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
         }
     }
 
@@ -297,7 +298,7 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(component, JSFAttr.SHOW_SUMMARY_ATTR, false);
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_SUMMARY_ATTR, false);
         }
     }
 
@@ -309,7 +310,7 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(component, JSFAttr.SHOW_DETAIL_ATTR, false);
+            return RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.SHOW_DETAIL_ATTR, false);
         }
     }
 

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.12

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlMessagesRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.util.NullIterator;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessageRendererBase;
+import org.apache.myfaces.shared.util.NullIterator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -90,7 +92,7 @@
 
         while(messagesIterator.hasNext())
         {
-            writer.startElement(HTML.LI_ELEM, messages);
+            writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.LI_ELEM, messages);
             renderSingleFacesMessage(facesContext,
                     messages,
                     (FacesMessage)messagesIterator.next(),
@@ -172,33 +174,33 @@
             Map attr = messages.getAttributes();
             if (severity == FacesMessage.SEVERITY_INFO)
             {
-                style = (String)attr.get(JSFAttr.INFO_STYLE_ATTR);
-                styleClass = (String)attr.get(JSFAttr.INFO_CLASS_ATTR);
+                style = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.INFO_STYLE_ATTR);
+                styleClass = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.INFO_CLASS_ATTR);
             }
             else if (severity == FacesMessage.SEVERITY_WARN)
             {
-                style = (String)attr.get(JSFAttr.WARN_STYLE_ATTR);
-                styleClass = (String)attr.get(JSFAttr.WARN_CLASS_ATTR);
+                style = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.WARN_STYLE_ATTR);
+                styleClass = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.WARN_CLASS_ATTR);
             }
             else if (severity == FacesMessage.SEVERITY_ERROR)
             {
-                style = (String)attr.get(JSFAttr.ERROR_STYLE_ATTR);
-                styleClass = (String)attr.get(JSFAttr.ERROR_CLASS_ATTR);
+                style = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.ERROR_STYLE_ATTR);
+                styleClass = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.ERROR_CLASS_ATTR);
             }
             else if (severity == FacesMessage.SEVERITY_FATAL)
             {
-                style = (String)attr.get(JSFAttr.FATAL_STYLE_ATTR);
+                style = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.FATAL_STYLE_ATTR);
                 styleClass = (String)attr.get(JSFAttr.FATAL_CLASS_ATTR);
             }
 
             if (style == null)
             {
-                style = (String)attr.get(JSFAttr.STYLE_CLASS_ATTR);
+                style = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.STYLE_CLASS_ATTR);
             }
 
             if (styleClass == null)
             {
-                styleClass = (String)attr.get(JSFAttr.STYLE_CLASS_ATTR);
+                styleClass = (String)attr.get(org.apache.myfaces.shared.renderkit.JSFAttr.STYLE_CLASS_ATTR);
             }
         }
 
@@ -214,7 +216,7 @@
         }
         else
         {
-            return (String)component.getAttributes().get(JSFAttr.TITLE_ATTR);
+            return (String)component.getAttributes().get(org.apache.myfaces.shared.renderkit.JSFAttr.TITLE_ATTR);
         }
     }
 
@@ -226,7 +228,7 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(component, JSFAttr.TOOLTIP_ATTR, false);
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, org.apache.myfaces.shared.renderkit.JSFAttr.TOOLTIP_ATTR, false);
         }
     }
 
@@ -250,7 +252,7 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(component, JSFAttr.SHOW_DETAIL_ATTR, false);
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, JSFAttr.SHOW_DETAIL_ATTR, false);
         }
     }
 
@@ -262,7 +264,7 @@
         }
         else
         {
-            return RendererUtils.getBooleanAttribute(component, JSFAttr.GLOBAL_ONLY_ATTR, false);
+            return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(component, JSFAttr.GLOBAL_ONLY_ATTR, false);
         }
     }
 
@@ -298,7 +300,7 @@
             }
             else
             {
-                _globalMessagesIterator = NullIterator.instance();
+                _globalMessagesIterator = org.apache.myfaces.shared.util.NullIterator.instance();
                 _clientIdsWithMessagesIterator = facesContext.getClientIdsWithMessages();
             }
             _componentMessagesIterator = null;

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.5

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererBase.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererBase.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -33,8 +33,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -51,7 +52,7 @@
 
     public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
     {
-        RendererUtils.checkParamValidity(facesContext, uiComponent, UISelectOne.class);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, UISelectOne.class);
 
         UISelectOne selectOne = (UISelectOne)uiComponent;
 
@@ -84,20 +85,20 @@
         if (!pageDirectionLayout) writer.startElement(HTML.TR_ELEM, selectOne);
 
         Converter converter;
-        List selectItemList = RendererUtils.getSelectItemList(selectOne);
+        List selectItemList = org.apache.myfaces.shared.renderkit.RendererUtils.getSelectItemList(selectOne);
         converter = HtmlRendererUtils.findUIOutputConverterFailSafe(facesContext, selectOne);
 
-        Object currentValue = RendererUtils.getObjectValue(selectOne);
-        
-        currentValue = RendererUtils.getConvertedStringValue(facesContext, selectOne, converter, currentValue);
+        Object currentValue = org.apache.myfaces.shared.renderkit.RendererUtils.getObjectValue(selectOne);
+
+        currentValue = org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedStringValue(facesContext, selectOne, converter, currentValue);
 
         for (Iterator it = selectItemList.iterator(); it.hasNext(); )
         {
             SelectItem selectItem = (SelectItem)it.next();
 
             renderGroupOrItemRadio(facesContext, selectOne,
-            		selectItem, currentValue,
-            		converter, pageDirectionLayout);
+                                   selectItem, currentValue,
+                                   converter, pageDirectionLayout);
         }
 
         if (!pageDirectionLayout) writer.endElement(HTML.TR_ELEM);
@@ -128,50 +129,50 @@
 
 
     protected void renderGroupOrItemRadio(FacesContext facesContext,
-    		UIComponent uiComponent, SelectItem selectItem,
-    		Object currentValue,
-    		Converter converter, boolean pageDirectionLayout) throws IOException{
+                                          UIComponent uiComponent, SelectItem selectItem,
+                                          Object currentValue,
+                                          Converter converter, boolean pageDirectionLayout) throws IOException{
 
-    	ResponseWriter writer = facesContext.getResponseWriter();
+        ResponseWriter writer = facesContext.getResponseWriter();
 
-    	boolean isSelectItemGroup = (selectItem instanceof SelectItemGroup);
+        boolean isSelectItemGroup = (selectItem instanceof SelectItemGroup);
 
-    	// TODO : Check here for getSubmittedValue. Look at RendererUtils.getValue
-    	// this is useless object creation
+        // TODO : Check here for getSubmittedValue. Look at RendererUtils.getValue
+        // this is useless object creation
 //    	Object itemValue = selectItem.getValue();
 
-    	UISelectOne selectOne = (UISelectOne)uiComponent;
+        UISelectOne selectOne = (UISelectOne)uiComponent;
 
         if (isSelectItemGroup) {
-        	if (pageDirectionLayout)
+            if (pageDirectionLayout)
                 writer.startElement(HTML.TR_ELEM, selectOne);
 
-        	writer.startElement(HTML.TD_ELEM, selectOne);
-        	writer.write(selectItem.getLabel());
-        	writer.endElement(HTML.TD_ELEM);
-
-        	if (pageDirectionLayout) {
-	        	writer.endElement(HTML.TR_ELEM);
-	        	writer.startElement(HTML.TR_ELEM, selectOne);
-        	}
-        	writer.startElement(HTML.TD_ELEM, selectOne);
-
-        	writer.startElement(HTML.TABLE_ELEM, selectOne);
-        	writer.writeAttribute(HTML.BORDER_ATTR, "0", null);
-
-        	SelectItemGroup group = (SelectItemGroup) selectItem;
-        	SelectItem[] selectItems = group.getSelectItems();
-
-        	for (int i=0; i<selectItems.length; i++) {
-        		renderGroupOrItemRadio(facesContext, selectOne, selectItems[i], currentValue, converter, pageDirectionLayout);
-        	}
-
-        	writer.endElement(HTML.TD_ELEM);
-        	writer.endElement(HTML.TR_ELEM);
-        	writer.endElement(HTML.TABLE_ELEM);
-        	writer.endElement(HTML.TD_ELEM);
+            writer.startElement(HTML.TD_ELEM, selectOne);
+            writer.write(selectItem.getLabel());
+            writer.endElement(HTML.TD_ELEM);
+
+            if (pageDirectionLayout) {
+                writer.endElement(HTML.TR_ELEM);
+                writer.startElement(HTML.TR_ELEM, selectOne);
+            }
+            writer.startElement(HTML.TD_ELEM, selectOne);
+
+            writer.startElement(HTML.TABLE_ELEM, selectOne);
+            writer.writeAttribute(HTML.BORDER_ATTR, "0", null);
+
+            SelectItemGroup group = (SelectItemGroup) selectItem;
+            SelectItem[] selectItems = group.getSelectItems();
+
+            for (int i=0; i<selectItems.length; i++) {
+                renderGroupOrItemRadio(facesContext, selectOne, selectItems[i], currentValue, converter, pageDirectionLayout);
+            }
+
+            writer.endElement(HTML.TD_ELEM);
+            writer.endElement(HTML.TR_ELEM);
+            writer.endElement(HTML.TABLE_ELEM);
+            writer.endElement(HTML.TD_ELEM);
 
-        	if (pageDirectionLayout)
+            if (pageDirectionLayout)
                 writer.endElement(HTML.TR_ELEM);
 
         } else {
@@ -182,7 +183,7 @@
         writer.startElement(HTML.TD_ELEM, selectOne);
         writer.startElement(HTML.LABEL_ELEM, selectOne);
 
-        String itemStrValue = RendererUtils.getConvertedStringValue(facesContext, selectOne, converter, selectItem.getValue());
+        String itemStrValue = org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedStringValue(facesContext, selectOne, converter, selectItem.getValue());
         boolean itemDisabled = selectItem.isDisabled();
 
         boolean itemChecked = itemStrValue.equals(currentValue);
@@ -245,7 +246,7 @@
         HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
         if (isDisabled(facesContext, uiComponent))
         {
-            writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
+            writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, Boolean.TRUE, null);
         }
 
         writer.endElement(HTML.INPUT_ELEM);
@@ -266,13 +267,13 @@
             return ((HtmlSelectOneRadio)uiComponent).isDisabled();
         }
 
-        return RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
+        return org.apache.myfaces.shared.renderkit.RendererUtils.getBooleanAttribute(uiComponent, HTML.DISABLED_ATTR, false);
     }
 
 
     public void decode(FacesContext facesContext, UIComponent uiComponent)
     {
-        RendererUtils.checkParamValidity(facesContext, uiComponent, null);
+        org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
         if (uiComponent instanceof UIInput)
         {
             HtmlRendererUtils.decodeUISelectOne(facesContext, uiComponent);
@@ -283,9 +284,9 @@
     public Object getConvertedValue(FacesContext facesContext, UIComponent uiComponent, Object submittedValue) throws ConverterException
     {
         RendererUtils.checkParamValidity(facesContext, uiComponent, UIOutput.class);
-        return RendererUtils.getConvertedUIOutputValue(facesContext,
-                                                       (UIOutput)uiComponent,
-                                                       submittedValue);
+        return org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedUIOutputValue(facesContext,
+                                                                                           (UIOutput)uiComponent,
+                                                                                           submittedValue);
     }
 
 }

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.15

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderer.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderer.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderer.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import java.util.List;
 

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.4

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRenderer.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Fri Feb 24 07:19:28 2006
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import java.io.IOException;
 import java.util.*;
@@ -28,14 +28,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
-import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
-import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
-import org.apache.myfaces.component.EscapeCapable;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.EscapeCapable;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -66,8 +65,8 @@
                                      UIComponent component) {
         if (!(component instanceof EditableValueHolder)) {
             throw new IllegalArgumentException("Component "
-                    + component.getClientId(facesContext)
-                    + " is not an EditableValueHolder");
+                                               + component.getClientId(facesContext)
+                                               + " is not an EditableValueHolder");
         }
         Map paramMap = facesContext.getExternalContext()
                 .getRequestParameterMap();
@@ -87,7 +86,7 @@
                 "There should always be a submitted value for an input if it"
                 + " is rendered, its form is submitted, and it is not disabled"
                 + " or read-only. Component : "+
-                    RendererUtils.getPathToComponent(component));
+                RendererUtils.getPathToComponent(component));
         }
     }
 
@@ -101,8 +100,8 @@
                                              UIComponent component) {
         if (!(component instanceof EditableValueHolder)) {
             throw new IllegalArgumentException("Component "
-                    + component.getClientId(facesContext)
-                    + " is not an EditableValueHolder");
+                                               + component.getClientId(facesContext)
+                                               + " is not an EditableValueHolder");
         }
 
         if(isDisabledOrReadOnly(component))
@@ -114,7 +113,7 @@
         if (paramMap.containsKey(clientId)) {
             String reqValue = (String) paramMap.get(clientId);
             if ((reqValue.equalsIgnoreCase("on")
-                    || reqValue.equalsIgnoreCase("yes") || reqValue
+                 || reqValue.equalsIgnoreCase("yes") || reqValue
                     .equalsIgnoreCase("true"))) {
                 ((EditableValueHolder) component)
                         .setSubmittedValue(Boolean.TRUE);
@@ -131,8 +130,8 @@
     public static boolean isDisabledOrReadOnly(UIComponent component)
     {
         return isDisplayValueOnly(component) ||
-                isTrue(component.getAttributes().get("disabled")) ||
-                isTrue(component.getAttributes().get("readonly"));
+               isTrue(component.getAttributes().get("disabled")) ||
+               isTrue(component.getAttributes().get("readonly"));
     }
 
     private static boolean isTrue(Object obj)
@@ -153,8 +152,8 @@
                                           UIComponent component) {
         if (!(component instanceof EditableValueHolder)) {
             throw new IllegalArgumentException("Component "
-                    + component.getClientId(facesContext)
-                    + " is not an EditableValueHolder");
+                                               + component.getClientId(facesContext)
+                                               + " is not an EditableValueHolder");
         }
         Map paramValuesMap = facesContext.getExternalContext()
                 .getRequestParameterValuesMap();
@@ -187,8 +186,8 @@
                                          UIComponent component) {
         if (!(component instanceof EditableValueHolder)) {
             throw new IllegalArgumentException("Component "
-                    + component.getClientId(facesContext)
-                    + " is not an EditableValueHolder");
+                                               + component.getClientId(facesContext)
+                                               + " is not an EditableValueHolder");
         }
 
         if(isDisabledOrReadOnly(component))
@@ -271,7 +270,7 @@
         Converter converter;
         if (selectMany) {
             writer.writeAttribute(HTML.MULTIPLE_ATTR, "true", null);
-            selectItemList = RendererUtils
+            selectItemList = org.apache.myfaces.shared.renderkit.RendererUtils
                     .getSelectItemList((UISelectMany) uiComponent);
             converter = findUISelectManyConverterFailsafe(facesContext, uiComponent);
         } else {
@@ -288,7 +287,7 @@
             writer.writeAttribute(HTML.SIZE_ATTR, Integer.toString(size), null);
         }
         renderHTMLAttributes(writer, uiComponent,
-                HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+                             HTML.SELECT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
         if (disabled) {
             writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
         }
@@ -296,7 +295,7 @@
         Set lookupSet = getSubmittedOrSelectedValuesAsSet(selectMany, uiComponent, facesContext, converter);
 
         renderSelectOptions(facesContext, uiComponent, converter, lookupSet,
-                selectItemList);
+                            selectItemList);
         // bug #970747: force separate end tag
         writer.writeText("", null);
         writer.endElement(HTML.SELECT_ELEM);
@@ -321,7 +320,7 @@
                 String lookupString = RendererUtils.getConvertedStringValue(facesContext, uiComponent, converter, lookup);
                 lookupSet = Collections.singleton(lookupString);
             }
-            else if(RendererUtils.NOTHING.equals(lookup))
+            else if(org.apache.myfaces.shared.renderkit.RendererUtils.NOTHING.equals(lookup))
             {
                 lookupSet = Collections.EMPTY_SET;
             }
@@ -340,7 +339,7 @@
                     facesContext, (UISelectMany) uiComponent);
         } catch (FacesException e) {
             log.error("Error finding Converter for component with id "
-                    + uiComponent.getClientId(facesContext));
+                      + uiComponent.getClientId(facesContext));
             converter = null;
         }
         return converter;
@@ -350,10 +349,10 @@
         Converter converter;
         try {
             converter = RendererUtils.findUIOutputConverter(facesContext,
-                    (UIOutput) uiComponent);
+                                                            (UIOutput) uiComponent);
         } catch (FacesException e) {
             log.error("Error finding Converter for component with id "
-                    + uiComponent.getClientId(facesContext));
+                      + uiComponent.getClientId(facesContext));
             converter = null;
         }
         return converter;
@@ -388,15 +387,15 @@
             if (selectItem instanceof SelectItemGroup) {
                 writer.startElement(HTML.OPTGROUP_ELEM, component);
                 writer.writeAttribute(HTML.LABEL_ATTR, selectItem.getLabel(),
-                        null);
+                                      null);
                 SelectItem[] selectItems = ((SelectItemGroup) selectItem)
                         .getSelectItems();
                 renderSelectOptions(context, component, converter, lookupSet,
-                        Arrays.asList(selectItems));
+                                    Arrays.asList(selectItems));
                 writer.endElement(HTML.OPTGROUP_ELEM);
             } else {
-                String itemStrValue = RendererUtils.getConvertedStringValue(context, component,
-                        converter, selectItem);
+                String itemStrValue = org.apache.myfaces.shared.renderkit.RendererUtils.getConvertedStringValue(context, component,
+                                                                            converter, selectItem);
 
                 writer.write("\t");
                 writer.startElement(HTML.OPTION_ELEM, component);
@@ -406,13 +405,13 @@
 
                 if (lookupSet.contains(itemStrValue)) {  //TODO/FIX: we always compare the String vales, better fill lookupSet with Strings only when useSubmittedValue==true, else use the real item value Objects
                     writer.writeAttribute(HTML.SELECTED_ATTR,
-                            HTML.SELECTED_ATTR, null);
+                                          HTML.SELECTED_ATTR, null);
                 }
 
                 boolean disabled = selectItem.isDisabled();
                 if (disabled) {
                     writer.writeAttribute(HTML.DISABLED_ATTR,
-                            HTML.DISABLED_ATTR, null);
+                                          HTML.DISABLED_ATTR, null);
                 }
 
                 String labelClass = null;
@@ -435,7 +434,7 @@
                 else
                 {
                     escape = RendererUtils.getBooleanAttribute(component, JSFAttr.ESCAPE_ATTR,
-                            true); //default is to escape
+                                                               true); //default is to escape
                 }
 
                 if (escape)
@@ -481,7 +480,7 @@
 
     public static void writePrettyLineSeparator(FacesContext facesContext)
             throws IOException {
-        if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext())
+        if (org.apache.myfaces.shared.config.MyfacesConfig.getCurrentInstance(facesContext.getExternalContext())
                 .isPrettyHtml()) {
             facesContext.getResponseWriter().write(LINE_SEPARATOR);
         }
@@ -489,7 +488,7 @@
 
     public static void writePrettyIndent(FacesContext facesContext)
             throws IOException {
-        if (MyfacesConfig.getCurrentInstance(facesContext.getExternalContext())
+        if (org.apache.myfaces.shared.config.MyfacesConfig.getCurrentInstance(facesContext.getExternalContext())
                 .isPrettyHtml()) {
             facesContext.getResponseWriter().write('\t');
         }
@@ -506,7 +505,7 @@
             // render JSF "styleClass" and "itemStyleClass" attributes as "class"
             String htmlAttrName =
                     attrName.equals(HTML.STYLE_CLASS_ATTR) ?
-                            HTML.CLASS_ATTR : attrName;
+                    HTML.CLASS_ATTR : attrName;
             writer.writeAttribute(htmlAttrName, value, componentProperty);
             return true;
         }
@@ -523,7 +522,7 @@
             throws IOException {
         Object value = component.getAttributes().get(componentProperty);
         return renderHTMLAttribute(writer, componentProperty, htmlAttrName,
-                value);
+                                   value);
     }
 
     /**
@@ -546,7 +545,7 @@
             ResponseWriter writer, UIComponent component, String elementName,
             String attrName, Object value, boolean startElementWritten)
             throws IOException {
-        if (!RendererUtils.isDefaultAttributeValue(value)) {
+        if (!org.apache.myfaces.shared.renderkit.RendererUtils.isDefaultAttributeValue(value)) {
             if (!startElementWritten) {
                 writer.startElement(elementName, component);
                 startElementWritten = true;
@@ -622,7 +621,7 @@
             writeIdIfNecessary(writer, uiComponent, facesContext);
             renderDisplayValueOnlyAttributes(uiComponent, writer);
             writer.writeText(RendererUtils.getConvertedStringValue(facesContext,uiComponent,
-                    converter,((UISelectBoolean) uiComponent).getValue()),JSFAttr.VALUE_ATTR);
+                                                                   converter,((UISelectBoolean) uiComponent).getValue()),JSFAttr.VALUE_ATTR);
             writer.endElement(HTML.SPAN_ELEM);
 
         }
@@ -650,7 +649,7 @@
                     uiComponent, facesContext, converter);
 
             renderSelectOptionsAsText(facesContext, uiComponent, converter, lookupSet,
-                    selectItemList, isSelectOne);
+                                      selectItemList, isSelectOne);
 
             // bug #970747: force separate end tag
             writer.writeText("", null);
@@ -660,11 +659,11 @@
     }
 
     public static void renderDisplayValueOnlyAttributes(UIComponent uiComponent, ResponseWriter writer) throws IOException {
-        if(!(uiComponent instanceof DisplayValueOnlyCapable))
+        if(!(uiComponent instanceof org.apache.myfaces.shared.component.DisplayValueOnlyCapable))
         {
             log.error("Wrong type of uiComponent. needs DisplayValueOnlyCapable.");
             renderHTMLAttributes(writer, uiComponent,
-                    HTML.COMMON_PASSTROUGH_ATTRIBUTES);
+                                 HTML.COMMON_PASSTROUGH_ATTRIBUTES);
 
             return;
         }
@@ -690,12 +689,12 @@
             }
 
             renderHTMLAttributes(writer, uiComponent,
-                    HTML.COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE);
+                                 HTML.COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE);
         }
         else
         {
             renderHTMLAttributes(writer, uiComponent,
-                    HTML.COMMON_PASSTROUGH_ATTRIBUTES);
+                                 HTML.COMMON_PASSTROUGH_ATTRIBUTES);
         }
     }
 
@@ -711,10 +710,10 @@
                 SelectItem[] selectItems = ((SelectItemGroup) selectItem)
                         .getSelectItems();
                 renderSelectOptionsAsText(context, component, converter, lookupSet,
-                        Arrays.asList(selectItems), isSelectOne);
+                                          Arrays.asList(selectItems), isSelectOne);
             } else {
                 String itemStrValue = RendererUtils.getConvertedStringValue(context, component,
-                        converter, selectItem);
+                                                                            converter, selectItem);
 
                 if (lookupSet.contains(itemStrValue)) {  //TODO/FIX: we always compare the String vales, better fill lookupSet with Strings only when useSubmittedValue==true, else use the real item value Objects
 
@@ -736,19 +735,19 @@
 
     public static String getDisplayValueOnlyStyleClass(UIComponent component) {
 
-        if(component instanceof DisplayValueOnlyCapable)
+        if(component instanceof org.apache.myfaces.shared.component.DisplayValueOnlyCapable)
         {
-            if(((DisplayValueOnlyCapable) component).getDisplayValueOnlyStyleClass()!=null)
-                return ((DisplayValueOnlyCapable) component).getDisplayValueOnlyStyleClass();
+            if(((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyleClass()!=null)
+                return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyleClass();
 
             UIComponent parent=component;
 
             while((parent = parent.getParent())!=null)
             {
-                if(parent instanceof DisplayValueOnlyCapable &&
-                        ((DisplayValueOnlyCapable) parent).getDisplayValueOnlyStyleClass()!=null)
+                if(parent instanceof org.apache.myfaces.shared.component.DisplayValueOnlyCapable &&
+                   ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) parent).getDisplayValueOnlyStyleClass()!=null)
                 {
-                    return ((DisplayValueOnlyCapable) parent).getDisplayValueOnlyStyleClass();
+                    return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) parent).getDisplayValueOnlyStyleClass();
                 }
             }
         }
@@ -760,15 +759,15 @@
 
         if(component instanceof DisplayValueOnlyCapable)
         {
-            if(((DisplayValueOnlyCapable) component).getDisplayValueOnlyStyle()!=null)
-                return ((DisplayValueOnlyCapable) component).getDisplayValueOnlyStyle();
+            if(((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyle()!=null)
+                return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).getDisplayValueOnlyStyle();
 
             UIComponent parent=component;
 
             while((parent = parent.getParent())!=null)
             {
-                if(parent instanceof DisplayValueOnlyCapable &&
-                        ((DisplayValueOnlyCapable) parent).getDisplayValueOnlyStyle()!=null)
+                if(parent instanceof org.apache.myfaces.shared.component.DisplayValueOnlyCapable &&
+                   ((DisplayValueOnlyCapable) parent).getDisplayValueOnlyStyle()!=null)
                 {
                     return ((DisplayValueOnlyCapable) parent).getDisplayValueOnlyStyle();
                 }
@@ -783,16 +782,16 @@
         if(component instanceof DisplayValueOnlyCapable)
         {
             if(((DisplayValueOnlyCapable) component).isSetDisplayValueOnly())
-                return ((DisplayValueOnlyCapable) component).isDisplayValueOnly();
+                return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) component).isDisplayValueOnly();
 
             UIComponent parent=component;
 
             while((parent = parent.getParent())!=null)
             {
                 if(parent instanceof DisplayValueOnlyCapable &&
-                        ((DisplayValueOnlyCapable) parent).isSetDisplayValueOnly())
+                   ((DisplayValueOnlyCapable) parent).isSetDisplayValueOnly())
                 {
-                    return ((DisplayValueOnlyCapable) parent).isDisplayValueOnly();
+                    return ((org.apache.myfaces.shared.component.DisplayValueOnlyCapable) parent).isDisplayValueOnly();
                 }
             }
         }
@@ -802,7 +801,7 @@
 
     public static void renderDisplayValueOnly(FacesContext facesContext, UIInput input) throws IOException {
         ResponseWriter writer = facesContext.getResponseWriter();
-        writer.startElement(HTML.SPAN_ELEM, input);
+        writer.startElement(org.apache.myfaces.shared.renderkit.html.HTML.SPAN_ELEM, input);
 
         writeIdIfNecessary(writer, input, facesContext);
 
@@ -927,7 +926,7 @@
     public static String getClearHiddenCommandFormParamsFunctionName(
             String formName) {
         return "clear_"
-                + JavascriptUtils.getValidJavascriptName(formName, false);
+               + JavascriptUtils.getValidJavascriptName(formName, false);
     }
 
     /**
@@ -953,7 +952,7 @@
         }
         //not nested in form, we must add a dummy form at the end of the
         // document
-        return DummyFormUtils.DUMMY_FORM_NAME;
+        return org.apache.myfaces.shared.renderkit.html.util.DummyFormUtils.DUMMY_FORM_NAME;
     }
 
     /**
@@ -974,7 +973,7 @@
      */
     public static String getHiddenCommandLinkFieldName(String formName) {
         return formName + NamingContainer.SEPARATOR_CHAR
-                + HIDDEN_COMMANDLINK_FIELD_NAME;
+               + HIDDEN_COMMANDLINK_FIELD_NAME;
     }
 
     private static String HTML_CONTENT_TYPE = "text/html";
@@ -1038,7 +1037,7 @@
         if(selectedContentType==null)
         {
             throw new IllegalArgumentException("ContentTypeList does not contain a supported content type: " +
-                    contentTypeListString);
+                                               contentTypeListString);
         }
         return selectedContentType;
     }
@@ -1046,21 +1045,21 @@
     public static String[] getSupportedContentTypes()
     {
         String[] supportedContentTypeArray = new String[]{HTML_CONTENT_TYPE,ANY_CONTENT_TYPE,
-                XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE};
+                                                          XHTML_CONTENT_TYPE,APPLICATION_XML_CONTENT_TYPE,TEXT_XML_CONTENT_TYPE};
         return supportedContentTypeArray;
     }
 
     private static boolean isHTMLContentType(String contentType)
     {
         return contentType.indexOf(HTML_CONTENT_TYPE) != -1 ||
-                contentType.indexOf(ANY_CONTENT_TYPE) != -1;
+               contentType.indexOf(ANY_CONTENT_TYPE) != -1;
     }
 
     public static boolean isXHTMLContentType(String contentType)
     {
         return contentType.indexOf(XHTML_CONTENT_TYPE) != -1 ||
-                contentType.indexOf(APPLICATION_XML_CONTENT_TYPE) != -1 ||
-                contentType.indexOf(TEXT_XML_CONTENT_TYPE) != -1;
+               contentType.indexOf(APPLICATION_XML_CONTENT_TYPE) != -1 ||
+               contentType.indexOf(TEXT_XML_CONTENT_TYPE) != -1;
     }
 
     private static List splitContentTypeListString(String contentTypeListString)

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
------------------------------------------------------------------------------
    cvs2svn:cvs-rev = 1.30

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (from r380659, myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java)
URL: http://svn.apache.org/viewcvs/myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?p2=myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java&p1=myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java&r1=380659&r2=380686&rev=380686&view=diff
==============================================================================
--- myfaces/shared/trunk/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/shared/trunk/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Fri Feb 24 07:19:28 2006
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.myfaces.renderkit.html;
+package org.apache.myfaces.shared.renderkit.html;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
-import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
-import org.apache.myfaces.renderkit.html.util.UnicodeEncoder;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.UnicodeEncoder;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
@@ -317,7 +317,7 @@
             _writer.write(' ');
             _writer.write(name);
             _writer.write("=\"");
-            _writer.write(HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
+            _writer.write(org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
             _writer.write('"');
         }
     }
@@ -339,7 +339,7 @@
         _writer.write("=\"");
         if (strValue.toLowerCase().startsWith("javascript:"))
         {
-            _writer.write(HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
+            _writer.write(org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
         }
         else
         {
@@ -407,7 +407,7 @@
         }
         else
         {
-            _writer.write(HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
+            _writer.write(org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
         }
     }
 
@@ -429,21 +429,21 @@
             String strValue = new String(cbuf, off, len);
             // Don't bother encoding anything if chosen character encoding is UTF-8
             if (UTF8.equals(_characterEncoding)) _writer.write(strValue);
-            else _writer.write(UnicodeEncoder.encode(strValue) );
+            else _writer.write(org.apache.myfaces.shared.renderkit.html.util.UnicodeEncoder.encode(strValue) );
         }
         else if (isTextarea())
         {
             // For textareas we must *not* map successive spaces to &nbsp or Newlines to <br/>
             // TODO: Make HTMLEncoder support char arrays directly
             String strValue = new String(cbuf, off, len);
-            _writer.write(HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
+            _writer.write(org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(strValue, false, false, !UTF8.equals(_characterEncoding)));
         }
         else
         {
             // We map successive spaces to &nbsp; and Newlines to <br/>
             // TODO: Make HTMLEncoder support char arrays directly
             String strValue = new String(cbuf, off, len);
-            _writer.write(HTMLEncoder.encode(strValue, true, true, !UTF8.equals(_characterEncoding)));
+            _writer.write(org.apache.myfaces.shared.renderkit.html.util.HTMLEncoder.encode(strValue, true, true, !UTF8.equals(_characterEncoding)));
         }
     }
 
@@ -488,7 +488,7 @@
             }
             if(_isStyle == null)
             {
-                if(_startElementName.equalsIgnoreCase(HTML.STYLE_ELEM))
+                if(_startElementName.equalsIgnoreCase(org.apache.myfaces.shared.renderkit.html.HTML.STYLE_ELEM))
                 {
                     _isStyle = Boolean.TRUE;
                     _isTextArea = Boolean.FALSE;
@@ -564,7 +564,7 @@
         {
             // Don't bother encoding anything if chosen character encoding is UTF-8
             if (UTF8.equals(_characterEncoding)) _writer.write(str);
-            else _writer.write(UnicodeEncoder.encode(str) );
+            else _writer.write(org.apache.myfaces.shared.renderkit.html.util.UnicodeEncoder.encode(str) );
         }
     }
 



Mime
View raw message