myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r380693 [5/9] - in /myfaces: core/branches/1_1_2/assembly/ core/branches/1_1_2/impl/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/ core/branches/1_1_2/impl/src/main/java/org/apache/myfaces/application/jsp/ core/bran...
Date Fri, 24 Feb 2006 15:47:41 GMT
Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputHtml/InputHtmlTag.java Fri Feb 24 07:47:18 2006
@@ -17,10 +17,10 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 /**
  * @author Sylvain Vieujot (latest modification by $Author$)
@@ -43,15 +43,15 @@
     private String showLinksToolBox;
     private String showImagesToolBox;
     private String showTablesToolBox;
-	private String showCleanupExpressionsToolBox;
+    private String showCleanupExpressionsToolBox;
     private String showDebugToolBox;
 
     private String enabledOnUserRole;
     private String visibleOnUserRole;
-    
+
     private String displayValueOnly;
-	private String displayValueOnlyStyle;
-	private String displayValueOnlyStyleClass;
+    private String displayValueOnlyStyle;
+    private String displayValueOnlyStyleClass;
 
     private String immediate;
     private String required;
@@ -62,28 +62,28 @@
         super.release();
         style=null;
         styleClass=null;
-		fallback=null;
+        fallback=null;
         type=null;
         allowEditSource=null;
         allowExternalLinks=null;
         addKupuLogo=null;
 
-		showAllToolBoxes=null;
+        showAllToolBoxes=null;
         showPropertiesToolBox=null;
         showLinksToolBox=null;
         showImagesToolBox=null;
         showTablesToolBox=null;
-		showCleanupExpressionsToolBox=null;
+        showCleanupExpressionsToolBox=null;
         showDebugToolBox=null;
-        
+
         enabledOnUserRole=null;
         visibleOnUserRole=null;
-        
+
         displayValueOnly=null;
         displayValueOnlyStyle=null;
         displayValueOnlyStyleClass=null;
 
-		immediate=null;
+        immediate=null;
         required=null;
         validator=null;
         valueChangeListener=null;
@@ -95,29 +95,29 @@
         setStringProperty(component, "style", style);
         setStringProperty(component, "styleClass", styleClass);
 
-		setStringProperty(component, "fallback", fallback);
+        setStringProperty(component, "fallback", fallback);
         setStringProperty(component, "type", type);
 
         setBooleanProperty(component, "allowEditSource", allowEditSource);
         setBooleanProperty(component, "allowExternalLinks", allowExternalLinks);
         setBooleanProperty(component, "addKupuLogo", addKupuLogo);
 
-		setBooleanProperty(component, "showAllToolBoxes", showAllToolBoxes);
+        setBooleanProperty(component, "showAllToolBoxes", showAllToolBoxes);
         setBooleanProperty(component, "showPropertiesToolBox", showPropertiesToolBox);
         setBooleanProperty(component, "showLinksToolBox", showLinksToolBox);
         setBooleanProperty(component, "showImagesToolBox", showImagesToolBox);
         setBooleanProperty(component, "showTablesToolBox", showTablesToolBox);
-		setBooleanProperty(component, "showCleanupExpressionsToolBox", showCleanupExpressionsToolBox);
+        setBooleanProperty(component, "showCleanupExpressionsToolBox", showCleanupExpressionsToolBox);
         setBooleanProperty(component, "showDebugToolBox", showDebugToolBox);
 
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, visibleOnUserRole);
-        
+
         setBooleanProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_ATTR, displayValueOnly);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_ATTR, displayValueOnlyStyle);
         setStringProperty(component, DisplayValueOnlyCapable.DISPLAY_VALUE_ONLY_STYLE_CLASS_ATTR, displayValueOnlyStyleClass);
 
-		setBooleanProperty(component, JSFAttr.IMMEDIATE_ATTR, immediate);
+        setBooleanProperty(component, JSFAttr.IMMEDIATE_ATTR, immediate);
         setBooleanProperty(component, JSFAttr.REQUIRED_ATTR, required);
         setValidatorProperty(component, validator);
         setValueChangedListenerProperty(component, valueChangeListener);
@@ -159,7 +159,7 @@
         this.addKupuLogo = addKupuLogo;
     }
 
-	public void setShowAllToolBoxes(String showAllToolBoxes){
+    public void setShowAllToolBoxes(String showAllToolBoxes){
         this.showAllToolBoxes = showAllToolBoxes;
     }
 
@@ -179,7 +179,7 @@
         this.showTablesToolBox = showTablesToolBox;
     }
 
-	public void setShowCleanupExpressionsToolBox(String showCleanupExpressionsToolBox){
+    public void setShowCleanupExpressionsToolBox(String showCleanupExpressionsToolBox){
         this.showCleanupExpressionsToolBox = showCleanupExpressionsToolBox;
     }
 
@@ -194,7 +194,7 @@
     public void setVisibleOnUserRole(String visibleOnUserRole){
         this.visibleOnUserRole = visibleOnUserRole;
     }
-    
+
     public void setDisplayValueOnly(String displayValueOnly){
         this.displayValueOnly = displayValueOnly;
     }
@@ -207,7 +207,7 @@
         this.displayValueOnlyStyleClass = displayValueOnlyStyleClass;
     }
 
-	public void setImmediate(String immediate){
+    public void setImmediate(String immediate){
         this.immediate = immediate;
     }
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlInputTextHelp.java Fri Feb 24 07:47:18 2006
@@ -17,7 +17,7 @@
 
 import org.apache.myfaces.component.html.ext.HtmlInputText;
 import org.apache.myfaces.component.html.util.HtmlComponentUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/inputTextHelp/HtmlTextHelpRenderer.java Fri Feb 24 07:47:18 2006
@@ -23,14 +23,13 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.ConverterException;
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlTextRenderer;
-import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
 
 /**
  * @author Thomas Obereder
@@ -97,8 +96,8 @@
     }
 
     private void renderHelpTextAttributes(UIComponent component,
-                                                ResponseWriter writer,
-                                                FacesContext facesContext)
+                                          ResponseWriter writer,
+                                          FacesContext facesContext)
             throws IOException
     {
         if(!(component instanceof HtmlInputTextHelp))
@@ -111,13 +110,13 @@
             if(isSelectText(component))
             {
                 HtmlRendererUtils.renderHTMLAttributes(writer, component,
-                        HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK);
+                                                       HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK);
                 writer.writeAttribute(HTML.ONFOCUS_ATTR,
-                        HtmlInputTextHelp.JS_FUNCTION_SELECT_TEXT + "('" +
-                            getHelpText(component) + "', '" + id +"')", null);
+                                      HtmlInputTextHelp.JS_FUNCTION_SELECT_TEXT + "('" +
+                                      getHelpText(component) + "', '" + id +"')", null);
                 writer.writeAttribute(HTML.ONCLICK_ATTR,
-                        HtmlInputTextHelp.JS_FUNCTION_SELECT_TEXT + "('" +
-                            getHelpText(component) + "', '" + id +"')", null);
+                                      HtmlInputTextHelp.JS_FUNCTION_SELECT_TEXT + "('" +
+                                      getHelpText(component) + "', '" + id +"')", null);
 
             }
             else
@@ -125,18 +124,18 @@
                 if(getHelpText(component) != null)
                 {
                     HtmlRendererUtils.renderHTMLAttributes(writer, component,
-                            HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK);
+                                                           HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK);
                     writer.writeAttribute(HTML.ONFOCUS_ATTR,
-                            HtmlInputTextHelp.JS_FUNCTION_RESET_HELP + "('" +
-                            getHelpText(component) + "', '" + id +"')", null);
+                                          HtmlInputTextHelp.JS_FUNCTION_RESET_HELP + "('" +
+                                          getHelpText(component) + "', '" + id +"')", null);
                 writer.writeAttribute(HTML.ONCLICK_ATTR,
-                        HtmlInputTextHelp.JS_FUNCTION_RESET_HELP + "('" +
-                            getHelpText(component) + "', '" + id +"')", null);
+                                      HtmlInputTextHelp.JS_FUNCTION_RESET_HELP + "('" +
+                                      getHelpText(component) + "', '" + id +"')", null);
                 }
                 else
                 {
                     HtmlRendererUtils.renderHTMLAttributes(writer,
-                            component, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+                                                           component, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
                 }
             }
         }
@@ -155,8 +154,8 @@
     public Object getConvertedValue(FacesContext facesContext, UIComponent component, Object submittedValue) throws ConverterException
     {
         if(submittedValue!=null && component instanceof HtmlInputTextHelp &&
-                ((HtmlInputTextHelp) component).getHelpText()!=null &&
-            submittedValue.equals(((HtmlInputTextHelp) component).getHelpText()))
+           ((HtmlInputTextHelp) component).getHelpText()!=null &&
+           submittedValue.equals(((HtmlInputTextHelp) component).getHelpText()))
         {
             submittedValue = "";
         }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListener.java Fri Feb 24 07:47:18 2006
@@ -3,7 +3,7 @@
  */
 package org.apache.myfaces.custom.jslistener;
 
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIOutput;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerRenderer.java Fri Feb 24 07:47:18 2006
@@ -5,10 +5,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 
 import javax.faces.application.Application;
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jslistener/JsValueChangeListenerTag.java Fri Feb 24 07:47:18 2006
@@ -3,7 +3,7 @@
  */
 package org.apache.myfaces.custom.jslistener;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSet.java Fri Feb 24 07:47:18 2006
@@ -4,7 +4,7 @@
 package org.apache.myfaces.custom.jsvalueset;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIOutput;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.myfaces.custom.jsvalueset;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import javax.faces.application.Application;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/jsvalueset/HtmlJsValueSetTag.java Fri Feb 24 07:47:18 2006
@@ -3,7 +3,7 @@
  */
 package org.apache.myfaces.custom.jsvalueset;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlLayoutRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlLayoutRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlLayoutRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlLayoutRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,10 +15,10 @@
  */
 package org.apache.myfaces.custom.layout;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayout.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.layout;
 
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.html.HtmlPanelGroup;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/layout/HtmlPanelLayoutTag.java Fri Feb 24 07:47:18 2006
@@ -16,8 +16,8 @@
 package org.apache.myfaces.custom.layout;
 
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.taglib.html.HtmlComponentBodyTagBase;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.taglib.html.HtmlComponentBodyTagBase;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,9 +15,9 @@
  */
 package org.apache.myfaces.custom.navigation;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlLinkRenderer;
 
 import org.apache.commons.logging.Log;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigation.java Fri Feb 24 07:47:18 2006
@@ -22,7 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.component.html.ext.HtmlPanelGroup;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigationTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigationTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigationTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navigation/HtmlPanelNavigationTag.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.navigation;
 
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.taglib.html.ext.HtmlPanelGroupTag;
 
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemTag.java Fri Feb 24 07:47:18 2006
@@ -16,8 +16,8 @@
 package org.apache.myfaces.custom.navmenu;
 
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.taglib.core.SelectItemTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.core.SelectItemTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/HtmlNavigationMenuItemsTag.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.navmenu;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 /**
  * @author Thomas Spiegl (latest modification by $Author$)

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/UINavigationMenuItem.java Fri Feb 24 07:47:18 2006
@@ -17,7 +17,7 @@
 
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.ActionSource;
 import javax.faces.component.UISelectItem;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java Fri Feb 24 07:47:18 2006
@@ -20,9 +20,9 @@
 import org.apache.myfaces.custom.navmenu.NavigationMenuItem;
 import org.apache.myfaces.custom.navmenu.NavigationMenuUtils;
 import org.apache.myfaces.custom.navmenu.UINavigationMenuItem;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlLinkRenderer;
 
 import javax.faces.component.*;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java Fri Feb 24 07:47:18 2006
@@ -15,11 +15,11 @@
  */
 package org.apache.myfaces.custom.navmenu.htmlnavmenu;
 
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 import org.apache.myfaces.custom.navmenu.UINavigationMenuItem;
-import org.apache.myfaces.el.SimpleActionMethodBinding;
+import org.apache.myfaces.shared.el.SimpleActionMethodBinding;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenu.java Fri Feb 24 07:47:18 2006
@@ -22,7 +22,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.component.html.ext.HtmlPanelGroup;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlPanelNavigationMenuTag.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.navmenu.htmlnavmenu;
 
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.taglib.html.ext.HtmlPanelGroupTag;
 
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlCommandJSCookMenu.java Fri Feb 24 07:47:18 2006
@@ -17,7 +17,7 @@
 
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UICommand;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuRenderer.java Fri Feb 24 07:47:18 2006
@@ -33,19 +33,19 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.renderkit.html.util.AddResource;
 import org.apache.myfaces.custom.navmenu.NavigationMenuItem;
 import org.apache.myfaces.custom.navmenu.NavigationMenuUtils;
 import org.apache.myfaces.custom.navmenu.UINavigationMenuItem;
-import org.apache.myfaces.el.SimpleActionMethodBinding;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlFormRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.html.util.DummyFormUtils;
-import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.el.SimpleActionMethodBinding;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlFormRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.DummyFormUtils;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
 
 /**
  * @author Thomas Spiegl
@@ -57,7 +57,7 @@
     private static final String MYFACES_HACK_SCRIPT = "MyFacesHack.js";
 
     private static final String JSCOOK_MENU_SCRIPT = "JSCookMenu.js";
-    
+
     private static final Log log = LogFactory.getLog(HtmlJSCookMenuRenderer.class);
 
     private static final String JSCOOK_ACTION_PARAM = "jscook_action";
@@ -70,7 +70,7 @@
         builtInThemes.put("ThemeIE", "ThemeIE/");
         builtInThemes.put("ThemePanel", "ThemePanel/");
     }
-    
+
     public void decode(FacesContext context, UIComponent component)
     {
         RendererUtils.checkParamValidity(context, component, HtmlCommandJSCookMenu.class);
@@ -78,7 +78,7 @@
         Map parameter = context.getExternalContext().getRequestParameterMap();
         String actionParam = (String)parameter.get(JSCOOK_ACTION_PARAM);
         if (actionParam != null && !actionParam.trim().equals("") &&
-                !actionParam.trim().equals("null"))
+            !actionParam.trim().equals("null"))
         {
             String compId = getMenuId(context,component);
             StringTokenizer tokenizer = new StringTokenizer(actionParam, ":");
@@ -200,14 +200,14 @@
      * @return String
      */
     private String getFormName(UIForm parentForm,
-            FacesContext facesContext) {
+                               FacesContext facesContext) {
         // See if we are in a form
         if (parentForm != null) { return parentForm.getClientId(facesContext); }
 
         // Not in a form. Return the child form's name
         return null;
     }
-    
+
     /**
      * Get the parent UIForm. If no parent is a UIForm then returns null.
      * 
@@ -222,7 +222,7 @@
         }
         return (UIForm) parent;
     }
-    
+
     private void encodeNavigationMenuItems(FacesContext context,
                                            StringBuffer writer,
                                            NavigationMenuItem[] items,
@@ -256,7 +256,7 @@
             if (item.isSplit())
             {
                 writer.append("_cmSplit,");
-                
+
                 if (item.getLabel().equals("0"))
                 {
                     continue;
@@ -319,7 +319,7 @@
             // Change here to allow the use of non dummy form.
             writer.append(formName);
             writer.append("', null");
-            
+
             if (item.isRendered() && ! item.isDisabled()) {
                 // render children only if parent is visible/enabled
                 NavigationMenuItem[] menuItems = item.getNavigationMenuItems();
@@ -329,10 +329,10 @@
                     if (uiNavMenuItem != null)
                     {
                         encodeNavigationMenuItems(context, writer, menuItems,
-                                uiNavMenuItem.getChildren(), menuId, formName);
+                                                  uiNavMenuItem.getChildren(), menuId, formName);
                     } else {
                         encodeNavigationMenuItems(context, writer, menuItems,
-                                new ArrayList(1), menuId, formName);
+                                                  new ArrayList(1), menuId, formName);
                     }
                 }
             }
@@ -433,7 +433,7 @@
         String javascriptLocation = (String) menu.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
         String imageLocation = (String) menu.getAttributes().get(JSFAttr.IMAGE_LOCATION);
         String styleLocation = (String) menu.getAttributes().get(JSFAttr.STYLE_LOCATION);
-        
+
         AddResource addResource = AddResourceFactory.getInstance(context);
 
         if(javascriptLocation != null)
@@ -484,8 +484,8 @@
      * 
      * @param context is the current faces context.
      */
-    private void addThemeSpecificResources(String themeName, String styleLocation, 
-            String javascriptLocation, String imageLocation, FacesContext context)
+    private void addThemeSpecificResources(String themeName, String styleLocation,
+                                           String javascriptLocation, String imageLocation, FacesContext context)
     {
         String themeLocation = (String) builtInThemes.get(themeName);
         if(themeLocation == null)
@@ -511,12 +511,12 @@
             if (imageLocation != null)
             {
                 buf.append(externalContext.encodeResourceURL(addResource.getResourceUri(context,
-                        imageLocation + "/" + themeName)));
+                                                                                        imageLocation + "/" + themeName)));
             }
             else
             {
                 buf.append(externalContext.encodeResourceURL(addResource.getResourceUri(context,
-                        HtmlJSCookMenuRenderer.class, themeLocation)));
+                                                                                        HtmlJSCookMenuRenderer.class, themeLocation)));
             }
             buf.append("';");
             addResource.addInlineScriptAtPosition(context, AddResource.HEADER_BEGIN, buf.toString());
@@ -535,13 +535,13 @@
                 // version of the jscookMenu.js file then the theme.js file can be found
                 // in the same location.
                 addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, javascriptLocation + "/" + themeName
-                        + "/theme.js");
+                                                                                       + "/theme.js");
             }
             else
             {
                 // Using a built-in theme, so we know where the theme.js file is.
                 addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN, HtmlJSCookMenuRenderer.class, themeName
-                        + "/theme.js");
+                                                                                                                     + "/theme.js");
             }
         }
 
@@ -558,7 +558,7 @@
             else
             {
                 addResource.addStyleSheet(context, AddResource.HEADER_BEGIN, HtmlJSCookMenuRenderer.class, themeName
-                        + "/theme.css");
+                                                                                                           + "/theme.css");
             }
         }
     }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/navmenu/jscookmenu/HtmlJSCookMenuTag.java Fri Feb 24 07:47:18 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.myfaces.custom.navmenu.jscookmenu;
 
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 import org.apache.myfaces.component.UserRoleAware;
 
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableRenderer.java Fri Feb 24 07:47:18 2006
@@ -21,13 +21,14 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.component.UIColumn;
 import javax.faces.component.UIData;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlTableRendererBase;
-import org.apache.myfaces.util.ArrayUtils;
-import org.apache.myfaces.util.StringUtils;
+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.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase;
+import org.apache.myfaces.shared.util.ArrayUtils;
+import org.apache.myfaces.shared.util.StringUtils;
+
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/newspaper/HtmlNewspaperTableTag.java Fri Feb 24 07:47:18 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.custom.newspaper;
 
 import javax.faces.component.UIComponent;
-import org.apache.myfaces.taglib.html.HtmlDataTableTagBase;
+import org.apache.myfaces.shared.taglib.html.HtmlDataTableTagBase;
 
 /**
  * Tag for a table in multiple balanced columns.

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStack.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.panelstack;
 
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.html.HtmlPanelGroup;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/HtmlPanelStackRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,8 +15,8 @@
  */
 package org.apache.myfaces.custom.panelstack;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/panelstack/PanelStackTag.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.panelstack;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 import javax.faces.component.UIComponent;
 import javax.servlet.jsp.JspException;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopup.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopup.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopup.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopup.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.popup;
 
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIComponentBase;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,12 +15,12 @@
  */
 package org.apache.myfaces.custom.popup;
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/popup/HtmlPopupTag.java Fri Feb 24 07:47:18 2006
@@ -4,7 +4,7 @@
 package org.apache.myfaces.custom.popup;
 
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.taglib.html.HtmlComponentTagBase;
+import org.apache.myfaces.shared.taglib.html.HtmlComponentTagBase;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadio.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.radio;
 
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIComponentBase;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadioTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadioTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadioTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/radio/HtmlRadioTag.java Fri Feb 24 07:47:18 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.custom.radio;
 
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 import javax.faces.component.UIComponent;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/regexprvalidator/RegExprValidator.java Fri Feb 24 07:47:18 2006
@@ -22,7 +22,7 @@
 import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 
-import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.shared.util.MessageUtils;
 
 import org.apache.commons.validator.GenericValidator;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/savestate/SaveStateTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/savestate/SaveStateTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/savestate/SaveStateTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/savestate/SaveStateTag.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.savestate;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountry.java Fri Feb 24 07:47:18 2006
@@ -30,8 +30,8 @@
 import javax.faces.model.SelectItem;
 
 import org.apache.myfaces.component.html.ext.HtmlSelectOneMenu;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.MessageUtils;
 
 /**
  * @author Sylvain Vieujot (latest modification by $Author$)
@@ -47,14 +47,14 @@
         setRendererType(DEFAULT_RENDERER_TYPE);
     }
 
-	public Integer getMaxLength() {
-		if (_maxLength != null) return _maxLength;
-		ValueBinding vb = getValueBinding("maxLength");
-		return vb != null ? (Integer)vb.getValue(getFacesContext()) : null;
-	}
-	public void setMaxLength(Integer maxLength) {
-		_maxLength = maxLength;
-	}
+    public Integer getMaxLength() {
+        if (_maxLength != null) return _maxLength;
+        ValueBinding vb = getValueBinding("maxLength");
+        return vb != null ? (Integer)vb.getValue(getFacesContext()) : null;
+    }
+    public void setMaxLength(Integer maxLength) {
+        _maxLength = maxLength;
+    }
 
     public Object saveState(FacesContext context) {
         Object values[] = new Object[2];
@@ -68,22 +68,22 @@
         super.restoreState(context, values[0]);
         _maxLength = (Integer)values[1];
     }
-    
+
     private Set getFilterSet(){
         List selectItems = RendererUtils.getSelectItemList( this );
-        Set set = new HashSet( selectItems.size() );        
-        
+        Set set = new HashSet( selectItems.size() );
+
         for (Iterator i = selectItems.iterator(); i.hasNext(); )
-        	set.add( ((SelectItem)i.next()).getValue().toString().toUpperCase() );
+            set.add( ((SelectItem)i.next()).getValue().toString().toUpperCase() );
 
         return set;
     }
-    
-	protected List getCountriesChoicesAsSelectItemList(){
-		//return RendererUtils.getSelectItemList(component);
 
-		Set filterSet = getFilterSet();
-    	
+    protected List getCountriesChoicesAsSelectItemList(){
+        //return RendererUtils.getSelectItemList(component);
+
+        Set filterSet = getFilterSet();
+
         String[] availableCountries = Locale.getISOCountries();
 
         Locale currentLocale;
@@ -102,7 +102,7 @@
         for(int i=0; i<availableCountries.length; i++){
             String countryCode = availableCountries[i];
             if( ! filterSet.isEmpty() && ! filterSet.contains(countryCode))
-            	continue;
+                continue;
             Locale tmp = new Locale(countryCode, countryCode);
             map.put(tmp.getDisplayCountry(currentLocale), countryCode);
         }
@@ -128,19 +128,19 @@
 
         return countriesSelectItems;
     }
-    
+
     protected void validateValue(FacesContext context, Object value) {
         if( !isValid() || value == null )
             return;
 
         // selected value must match to one of the available options
         for(Iterator i = getCountriesChoicesAsSelectItemList().iterator(); i.hasNext() ; ){
-        	if( value.equals( ((SelectItem)i.next()).getValue() ) )
-        		return;
+            if( value.equals( ((SelectItem)i.next()).getValue() ) )
+                return;
         }
 
         MessageUtils.addMessage(FacesMessage.SEVERITY_ERROR, INVALID_MESSAGE_ID,  new Object[] {getId()}, context);
-        
+
         setValid(false);
     }
 }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneCountry/SelectOneCountryRenderer.java Fri Feb 24 07:47:18 2006
@@ -25,9 +25,9 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlMenuRenderer;
 
 /**
@@ -35,33 +35,33 @@
  * @version $Revision$ $Date$
  */
 public class SelectOneCountryRenderer extends HtmlMenuRenderer {
-	
-	public void encodeEnd(FacesContext facesContext, UIComponent component)
+
+    public void encodeEnd(FacesContext facesContext, UIComponent component)
     throws IOException
-	{
-		RendererUtils.checkParamValidity(facesContext, component, null);
-		
-		SelectOneCountry selectOneCountry = (SelectOneCountry) component;
-		ResponseWriter writer = facesContext.getResponseWriter();
-		
-		if(HtmlRendererUtils.isDisplayValueOnly(component))
-		{
-		    //HtmlRendererUtils.renderDisplayValueOnlyForSelects(facesContext, component);
-			writer.startElement(HTML.SPAN_ELEM, selectOneCountry);
-	        HtmlRendererUtils.writeIdIfNecessary(writer, selectOneCountry, facesContext);
-	    
-	        String[] supportedAttributes = {HTML.STYLE_CLASS_ATTR, HTML.STYLE_ATTR};
+    {
+        RendererUtils.checkParamValidity(facesContext, component, null);
+
+        SelectOneCountry selectOneCountry = (SelectOneCountry) component;
+        ResponseWriter writer = facesContext.getResponseWriter();
+
+        if(HtmlRendererUtils.isDisplayValueOnly(component))
+        {
+            //HtmlRendererUtils.renderDisplayValueOnlyForSelects(facesContext, component);
+            writer.startElement(HTML.SPAN_ELEM, selectOneCountry);
+            HtmlRendererUtils.writeIdIfNecessary(writer, selectOneCountry, facesContext);
+
+            String[] supportedAttributes = {HTML.STYLE_CLASS_ATTR, HTML.STYLE_ATTR};
             HtmlRendererUtils.renderHTMLAttributes(writer, selectOneCountry, supportedAttributes);
-	        
-	        String countryCode = selectOneCountry.getValue().toString();
-	        String countryName = new Locale(countryCode, countryCode).getDisplayCountry( facesContext.getViewRoot().getLocale() );
-	        
-	        writer.write( countryName );
-	        
-	        writer.endElement(HTML.SPAN_ELEM);
-		    return;
-		}
-		
+
+            String countryCode = selectOneCountry.getValue().toString();
+            String countryName = new Locale(countryCode, countryCode).getDisplayCountry( facesContext.getViewRoot().getLocale() );
+
+            writer.write( countryName );
+
+            writer.endElement(HTML.SPAN_ELEM);
+            return;
+        }
+
         writer.startElement(HTML.SELECT_ELEM, selectOneCountry);
         HtmlRendererUtils.writeIdIfNecessary(writer, selectOneCountry, facesContext);
         writer.writeAttribute(HTML.NAME_ATTR, component.getClientId(facesContext), null);
@@ -82,5 +82,5 @@
         // bug #970747: force separate end tag
         writer.writeText("", null);
         writer.endElement(HTML.SELECT_ELEM);
-	}
+    }
 }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguage.java Fri Feb 24 07:47:18 2006
@@ -30,8 +30,8 @@
 import javax.faces.model.SelectItem;
 
 import org.apache.myfaces.component.html.ext.HtmlSelectOneMenu;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.util.MessageUtils;
 
 /**
  * @author Sylvain Vieujot (latest modification by $Author$)
@@ -47,14 +47,14 @@
         setRendererType(DEFAULT_RENDERER_TYPE);
     }
 
-	public Integer getMaxLength() {
-		if (_maxLength != null) return _maxLength;
-		ValueBinding vb = getValueBinding("maxLength");
-		return vb != null ? (Integer)vb.getValue(getFacesContext()) : null;
-	}
-	public void setMaxLength(Integer maxLength) {
-		_maxLength = maxLength;
-	}
+    public Integer getMaxLength() {
+        if (_maxLength != null) return _maxLength;
+        ValueBinding vb = getValueBinding("maxLength");
+        return vb != null ? (Integer)vb.getValue(getFacesContext()) : null;
+    }
+    public void setMaxLength(Integer maxLength) {
+        _maxLength = maxLength;
+    }
 
     public Object saveState(FacesContext context) {
         Object values[] = new Object[2];
@@ -68,23 +68,23 @@
         super.restoreState(context, values[0]);
         _maxLength = (Integer)values[1];
     }
-    
+
     private Set getFilterSet(){
         List selectItems = RendererUtils.getSelectItemList( this );
-        Set set = new HashSet( selectItems.size() );        
-        
+        Set set = new HashSet( selectItems.size() );
+
         for (Iterator i = selectItems.iterator(); i.hasNext(); )
-        	set.add( ((SelectItem)i.next()).getValue().toString().toLowerCase() );
+            set.add( ((SelectItem)i.next()).getValue().toString().toLowerCase() );
 
         return set;
     }
-    
-	protected List getLanguagesChoicesAsSelectItemList(){
-		//return RendererUtils.getSelectItemList(component);
-
-		Set filterSet = getFilterSet();
-    	
-		String[] availableLanguages = Locale.getISOLanguages();
+
+    protected List getLanguagesChoicesAsSelectItemList(){
+        //return RendererUtils.getSelectItemList(component);
+
+        Set filterSet = getFilterSet();
+
+        String[] availableLanguages = Locale.getISOLanguages();
 
         Locale currentLocale;
 
@@ -100,9 +100,9 @@
         // TreeMap is sorted according to the keys' natural order
 
         for(int i=0; i<availableLanguages.length; i++){
-        	String languageCode = availableLanguages[i];
+            String languageCode = availableLanguages[i];
             if( ! filterSet.isEmpty() && ! filterSet.contains(languageCode))
-            	continue;
+                continue;
             Locale tmp = new Locale(languageCode);
             map.put(tmp.getDisplayLanguage(currentLocale), languageCode);
         }
@@ -115,7 +115,7 @@
             maxDescriptionLength = 5;
 
         for(Iterator i = map.keySet().iterator(); i.hasNext(); ){
-        	String languageName = (String) i.next();
+            String languageName = (String) i.next();
             String languageCode = (String) map.get( languageName );
             String label;
             if( languageName.length() <= maxDescriptionLength )
@@ -128,19 +128,19 @@
 
         return languagesSelectItems;
     }
-	
+
     protected void validateValue(FacesContext context, Object value) {
         if( !isValid() || value == null )
             return;
 
         // selected value must match to one of the available options
         for(Iterator i = getLanguagesChoicesAsSelectItemList().iterator(); i.hasNext() ; ){
-        	if( value.equals( ((SelectItem)i.next()).getValue() ) )
-        		return;
+            if( value.equals( ((SelectItem)i.next()).getValue() ) )
+                return;
         }
 
         MessageUtils.addMessage(FacesMessage.SEVERITY_ERROR, INVALID_MESSAGE_ID,  new Object[] {getId()}, context);
-        
+
         setValid(false);
     }
 }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguageRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguageRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguageRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/selectOneLanguage/SelectOneLanguageRenderer.java Fri Feb 24 07:47:18 2006
@@ -25,9 +25,9 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.convert.Converter;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlMenuRenderer;
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/sortheader/HtmlSortHeaderRenderer.java Fri Feb 24 07:47:18 2006
@@ -23,7 +23,7 @@
 
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.ext.HtmlDataTable;
-import org.apache.myfaces.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 import org.apache.myfaces.renderkit.html.ext.HtmlLinkRenderer;
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/Stylesheet.java Fri Feb 24 07:47:18 2006
@@ -20,7 +20,7 @@
 import javax.faces.el.ValueBinding;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 
 /**
@@ -30,9 +30,9 @@
 
 public class Stylesheet extends UIOutput {
 
-	public static final String COMPONENT_TYPE = "org.apache.myfaces.Stylesheet";
-	public static final String COMPONENT_FAMILY = "javax.faces.Output";
-	private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Stylesheet";
+    public static final String COMPONENT_TYPE = "org.apache.myfaces.Stylesheet";
+    public static final String COMPONENT_FAMILY = "javax.faces.Output";
+    private static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.Stylesheet";
 
     private String _path = null;
     private Boolean _inline = null;
@@ -59,15 +59,15 @@
 
     public String getPath() {
 
-		if (_path != null) return _path;
-		ValueBinding vb = getValueBinding("path");
-		return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+        if (_path != null) return _path;
+        ValueBinding vb = getValueBinding("path");
+        return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
     }
 
     public void setPath(String path) {
         this._path = path;
     }
-    
+
     /**
      * @return true if the styles are inlined to the jsp file
      */
@@ -76,7 +76,7 @@
           return this._inline.booleanValue();
             ValueBinding vb = getValueBinding("inline");
             return ((vb != null) ? (Boolean) vb.getValue(getFacesContext())
-                : Boolean.FALSE).booleanValue();
+                    : Boolean.FALSE).booleanValue();
       }
 
     /**
@@ -85,19 +85,19 @@
     public void setInline(boolean inline) {
         this._inline = Boolean.valueOf(inline);
     }
-    
+
 
     public String getMedia() {
-    	if (this._media != null)
-    		return this._media;
-    	ValueBinding vb = getValueBinding("media");
-    		return ((vb != null) ? (String) vb.getValue(getFacesContext()) : null);
-    	}
-    
+        if (this._media != null)
+            return this._media;
+        ValueBinding vb = getValueBinding("media");
+            return ((vb != null) ? (String) vb.getValue(getFacesContext()) : null);
+        }
+
     public void setMedia(String media) {
-    	this._media = media;  
+        this._media = media;
     }
-    
+
     public void setEnabledOnUserRole(String enabledOnUserRole)
     {
         _enabledOnUserRole = enabledOnUserRole;
@@ -128,7 +128,7 @@
         return super.isRendered();
     }
 
-    
+
     public void restoreState(FacesContext context, Object state) {
 
         Object values[] = (Object[]) state;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetRenderer.java Fri Feb 24 07:47:18 2006
@@ -21,8 +21,8 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
 
 /**
  * @author mwessendorf (latest modification by $Author$)
@@ -31,7 +31,7 @@
 
 public class StylesheetRenderer extends HtmlRenderer {
 
-	 public void encodeEnd(FacesContext context, UIComponent component)
+     public void encodeEnd(FacesContext context, UIComponent component)
         throws IOException {
 
         if ((context == null) || (component == null)) {
@@ -39,7 +39,7 @@
         }
         Stylesheet stylesheet = (Stylesheet) component;
         ResponseWriter writer = context.getResponseWriter();
-        
+
         if(stylesheet.isInline())
         {
           //include as inline css
@@ -48,7 +48,7 @@
           if(stylesheet.getMedia() != null)
           {
             writer.writeAttribute("media", stylesheet.getMedia(), null);
-          }          
+          }
           //writer.writeText("<!--\n", null);
           Object text = RendererUtils.loadResourceFile(context, stylesheet.getPath());
           if (text != null)
@@ -56,7 +56,7 @@
               writer.writeText(text, null);
           }
           //writer.writeText("\n-->", null);
-          writer.endElement("style");  
+          writer.endElement("style");
         }
         else
         {
@@ -71,10 +71,10 @@
           writer.writeURIAttribute
               ("href",
                context.getExternalContext().getRequestContextPath()+stylesheet.getPath(),
-             "path");
-          writer.endElement("link");          
+               "path");
+          writer.endElement("link");
         }
-        
+
 
     }
 }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/stylesheet/StylesheetTag.java Fri Feb 24 07:47:18 2006
@@ -18,7 +18,7 @@
 import javax.faces.component.UIComponent;
 
 import org.apache.myfaces.component.UserRoleAware;
-import org.apache.myfaces.taglib.html.HtmlOutputTextTagBase;
+import org.apache.myfaces.shared.taglib.html.HtmlOutputTextTagBase;
 
 /**
  * @author mwessendorf (latest modification by $Author$)
@@ -30,10 +30,10 @@
     private String _path = null;
     private String _media = null;
     private boolean _inline = false;
-    
-	// User Role support
-	private String _enabledOnUserRole;
-	private String _visibleOnUserRole;
+
+    // User Role support
+    private String _enabledOnUserRole;
+    private String _visibleOnUserRole;
 
     public String getComponentType() {
 
@@ -53,15 +53,15 @@
         super.release();
         _path=null;
         _media=null;
-    	_enabledOnUserRole=null;
-    	_visibleOnUserRole=null;
+        _enabledOnUserRole=null;
+        _visibleOnUserRole=null;
 
 
     }
 
      /**
- 	 * overrides setProperties() form UIComponentTag.
- 	 */
+      * overrides setProperties() form UIComponentTag.
+      */
     protected void setProperties(UIComponent component) {
 
         super.setProperties(component);
@@ -81,21 +81,21 @@
     public void setMedia(String media) {
         this._media = media;
     }
-	public void setEnabledOnUserRole(String string) {
-		_enabledOnUserRole = string;
-	}
-
-	public void setVisibleOnUserRole(String string) {
-		_visibleOnUserRole = string;
-	}
+    public void setEnabledOnUserRole(String string) {
+        _enabledOnUserRole = string;
+    }
+
+    public void setVisibleOnUserRole(String string) {
+        _visibleOnUserRole = string;
+    }
+
 
-  
   public boolean isInline()
   {
     return _inline;
   }
 
-  
+
   public void setInline(boolean inline)
   {
     this._inline = inline;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImage.java Fri Feb 24 07:47:18 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.custom.swapimage;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIGraphic;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/swapimage/HtmlSwapImageRenderer.java Fri Feb 24 07:47:18 2006
@@ -17,13 +17,13 @@
 
 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.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResource;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.AddResourceFactory;
 import org.apache.myfaces.custom.navigation.HtmlCommandNavigation;
 
 import javax.faces.component.UIComponent;
@@ -48,7 +48,7 @@
 
         ResponseWriter writer = facesContext.getResponseWriter();
 
-        AddResourceFactory.getInstance(facesContext).addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN, 
+        AddResourceFactory.getInstance(facesContext).addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN,
                 HtmlSwapImage.class, "swapimage.js");
 
         String url;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTab.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTab.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTab.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTab.java Fri Feb 24 07:47:18 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.custom.tabbedpane;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.html.HtmlPanelGroup;
 import javax.faces.context.FacesContext;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java Fri Feb 24 07:47:18 2006
@@ -18,7 +18,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.myfaces.util._ComponentUtils;
+import org.apache.myfaces.shared.util._ComponentUtils;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIForm;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPaneTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPaneTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPaneTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPaneTag.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.tabbedpane;
 
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.taglib.html.ext.HtmlPanelGroupTag;
 
 import javax.faces.component.UIComponent;



Mime
View raw message