myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manol...@apache.org
Subject svn commit: r380693 [6/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/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Fri Feb 24 07:47:18 2006
@@ -29,13 +29,13 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.component.UserRoleUtils;
-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.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRenderer;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+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.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRenderer;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -62,7 +62,7 @@
 
     public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) throws IOException
     {
-    	// NoOp
+        // NoOp
     }
 
     public boolean getRendersChildren()
@@ -72,7 +72,7 @@
 
     public void encodeChildren(FacesContext facescontext, UIComponent uicomponent) throws IOException
     {
-    	// NoOp
+        // NoOp
     }
 
     public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
@@ -85,21 +85,21 @@
         }
 
         AddResource addResource = AddResourceFactory.getInstance(facesContext);
-        
-        addResource.addStyleSheet(facesContext,AddResource.HEADER_BEGIN, 
-                HtmlTabbedPaneRenderer.class, "defaultStyles.css");
+
+        addResource.addStyleSheet(facesContext,AddResource.HEADER_BEGIN,
+                                  HtmlTabbedPaneRenderer.class, "defaultStyles.css");
 
         if( tabbedPane.isClientSide() ){
-        		addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN, HtmlTabbedPaneRenderer.class, "dynamicTabs.js");
-        		addResource.addInlineStyleAtPosition(facesContext,AddResource.HEADER_BEGIN, 
-                    '#'+getTableStylableId(tabbedPane,facesContext)+" ."+ACTIVE_HEADER_CELL_CLASS+" input,\n" +
-                    '#'+getTableStylableId(tabbedPane,facesContext)+" ."+TAB_PANE_CLASS+",\n" +
-                    '#'+getTableStylableId(tabbedPane,facesContext)+" ."+SUB_HEADER_CELL_CLASS+"{\n"+
-                        "background-color:" + tabbedPane.getBgcolor()+";\n"+
-                    "}\n");
+                addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN, HtmlTabbedPaneRenderer.class, "dynamicTabs.js");
+                addResource.addInlineStyleAtPosition(facesContext,AddResource.HEADER_BEGIN,
+                                                     '#'+getTableStylableId(tabbedPane,facesContext)+" ."+ACTIVE_HEADER_CELL_CLASS+" input,\n" +
+                                                     '#'+getTableStylableId(tabbedPane,facesContext)+" ."+TAB_PANE_CLASS+",\n" +
+                                                     '#'+getTableStylableId(tabbedPane,facesContext)+" ."+SUB_HEADER_CELL_CLASS+"{\n"+
+                                                     "background-color:" + tabbedPane.getBgcolor()+";\n"+
+                                                     "}\n");
         }
-        
-        
+
+
         ResponseWriter writer = facesContext.getResponseWriter();
 
         HtmlRendererUtils.writePrettyLineSeparator(facesContext);
@@ -113,54 +113,54 @@
         }
 
         List children = tabbedPane.getChildren();
-        
+
         if( tabbedPane.isClientSide() ){
-        	List headerIDs = new ArrayList();
-	        List tabIDs = new ArrayList();
-	        for (int i = 0, len = children.size(); i < len; i++)
-	        {
-	            UIComponent child = getUIComponent((UIComponent)children.get(i));
-	            if (child instanceof HtmlPanelTab && child.isRendered()){
-	            	HtmlPanelTab tab = (HtmlPanelTab) child;
-	            	tabIDs.add( child.getClientId(facesContext) );
-	            	if( ! isDisabled(facesContext, tab) )
-	            		headerIDs.add( getHeaderCellID(tab, facesContext) );
-	            }
-	        }
-        
-	        HtmlRendererUtils.writePrettyLineSeparator(facesContext);
-	        writer.startElement(HTML.SCRIPT_ELEM, tabbedPane);
-	        writer.write('\n');
-	        
-	        writer.write( getHeaderCellsIDsVar(tabbedPane,facesContext)+"= new Array(" );
-	        for(Iterator ids=headerIDs.iterator(); ids.hasNext();){
-	        	String id = (String)ids.next();
-	        	writer.write('"'+JavascriptUtils.encodeString( id )+'"');
-	        	if( ids.hasNext() )
-	        		writer.write(',');
-	        }
-	        writer.write( ");\n" ); // end Array
-	        
-	        writer.write( getTabsIDsVar(tabbedPane,facesContext)+"= new Array(" );
-	        for(Iterator ids=tabIDs.iterator(); ids.hasNext();){
-	        	String id = (String)ids.next();
-	        	writer.write('"'+JavascriptUtils.encodeString( id )+'"');
-	        	if( ids.hasNext() )
-	        		writer.write(',');
-	        }
-	        writer.write( ");\n" ); // end Array
-	        
-	        writer.endElement(HTML.SCRIPT_ELEM);
-	        HtmlRendererUtils.writePrettyLineSeparator(facesContext);
-	        
-	        String submitFieldIDAndName = getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext);
-	        writer.startElement(HTML.INPUT_ELEM, tabbedPane);
-	        writer.writeAttribute(HTML.ID_ATTR, submitFieldIDAndName, null);
-	        writer.writeAttribute(HTML.NAME_ATTR, submitFieldIDAndName, null);
-	        writer.writeAttribute(HTML.STYLE_ATTR, "display:none", null);
-	        writer.endElement(HTML.INPUT_ELEM);
+            List headerIDs = new ArrayList();
+            List tabIDs = new ArrayList();
+            for (int i = 0, len = children.size(); i < len; i++)
+            {
+                UIComponent child = getUIComponent((UIComponent)children.get(i));
+                if (child instanceof HtmlPanelTab && child.isRendered()){
+                    HtmlPanelTab tab = (HtmlPanelTab) child;
+                    tabIDs.add( child.getClientId(facesContext) );
+                    if( ! isDisabled(facesContext, tab) )
+                        headerIDs.add( getHeaderCellID(tab, facesContext) );
+                }
+            }
+
+            HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+            writer.startElement(HTML.SCRIPT_ELEM, tabbedPane);
+            writer.write('\n');
+
+            writer.write( getHeaderCellsIDsVar(tabbedPane,facesContext)+"= new Array(" );
+            for(Iterator ids=headerIDs.iterator(); ids.hasNext();){
+                String id = (String)ids.next();
+                writer.write('"'+JavascriptUtils.encodeString( id )+'"');
+                if( ids.hasNext() )
+                    writer.write(',');
+            }
+            writer.write( ");\n" ); // end Array
+
+            writer.write( getTabsIDsVar(tabbedPane,facesContext)+"= new Array(" );
+            for(Iterator ids=tabIDs.iterator(); ids.hasNext();){
+                String id = (String)ids.next();
+                writer.write('"'+JavascriptUtils.encodeString( id )+'"');
+                if( ids.hasNext() )
+                    writer.write(',');
+            }
+            writer.write( ");\n" ); // end Array
+
+            writer.endElement(HTML.SCRIPT_ELEM);
+            HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+
+            String submitFieldIDAndName = getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext);
+            writer.startElement(HTML.INPUT_ELEM, tabbedPane);
+            writer.writeAttribute(HTML.ID_ATTR, submitFieldIDAndName, null);
+            writer.writeAttribute(HTML.NAME_ATTR, submitFieldIDAndName, null);
+            writer.writeAttribute(HTML.STYLE_ATTR, "display:none", null);
+            writer.endElement(HTML.INPUT_ELEM);
         }
-        
+
         writeTableStart(writer, facesContext, tabbedPane);
         HtmlRendererUtils.writePrettyLineSeparator(facesContext);
         writer.startElement(HTML.TR_ELEM, tabbedPane);
@@ -177,8 +177,8 @@
                 if (child.isRendered())
                 {
                     writeHeaderCell(writer,
-                    				facesContext,
-                    				tabbedPane,
+                                    facesContext,
+                                    tabbedPane,
                                     (HtmlPanelTab)child,
                                     tabIdx,
                                     visibleTabCount,
@@ -218,9 +218,9 @@
         writer.writeAttribute(HTML.COLSPAN_ATTR, Integer.toString(visibleTabCount + 1), null);
         String tabContentStyleClass = tabbedPane.getTabContentStyleClass();
         writer.writeAttribute(HTML.CLASS_ATTR, TAB_PANE_CLASS+(tabContentStyleClass==null ? "" : " "+tabContentStyleClass), null);
-        
+
         writeTabsContents(writer,  facesContext, tabbedPane, selectedIndex);
-        
+
         writer.endElement(HTML.TD_ELEM);
         writer.endElement(HTML.TR_ELEM);
 
@@ -261,14 +261,14 @@
                 tabIdx++;
             }
         }
-        
+
         // No request due to a header button pressed.
         // Restore a client-side switch
         if( tabbedPane.isClientSide() ){
-        	String clientSideIndex = (String)paramMap.get(getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext));
-        	if (clientSideIndex != null && clientSideIndex.length() > 0)
+            String clientSideIndex = (String)paramMap.get(getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext));
+            if (clientSideIndex != null && clientSideIndex.length() > 0)
             {
-        		tabbedPane.setSelectedIndex( Integer.parseInt(clientSideIndex) );
+                tabbedPane.setSelectedIndex( Integer.parseInt(clientSideIndex) );
                 return;
             }
         }
@@ -293,41 +293,41 @@
                                  null);
         writer.flush();
     }
-    
+
     protected String getHeaderCellsIDsVar(HtmlPanelTabbedPane tabbedPane, FacesContext facesContext){
-    	return JavascriptUtils.getValidJavascriptName(
-    			"panelTabbedPane_"+tabbedPane.getClientId(facesContext)+"_HeadersIDs",
-    			false);
+        return JavascriptUtils.getValidJavascriptName(
+                "panelTabbedPane_"+tabbedPane.getClientId(facesContext)+"_HeadersIDs",
+                false);
     }
-    
+
     protected String getTabsIDsVar(HtmlPanelTabbedPane tabbedPane, FacesContext facesContext){
-    	return JavascriptUtils.getValidJavascriptName(
-    			"panelTabbedPane_"+tabbedPane.getClientId(facesContext)+"_IDs",
-    			false);
+        return JavascriptUtils.getValidJavascriptName(
+                "panelTabbedPane_"+tabbedPane.getClientId(facesContext)+"_IDs",
+                false);
     }
-    
+
     protected String getDefaultActiveHeaderStyleClass(HtmlPanelTabbedPane tabbedPane, FacesContext facesContext){
-    	return JavascriptUtils.getValidJavascriptName(
-    			"panelTabbedPane_"+tabbedPane.getClientId(facesContext)+"_ActiveStyle",
-    			false);
+        return JavascriptUtils.getValidJavascriptName(
+                "panelTabbedPane_"+tabbedPane.getClientId(facesContext)+"_ActiveStyle",
+                false);
     }
-    
+
     protected String getActiveHeaderClasses(HtmlPanelTabbedPane tabbedPane){
-    	String userActiveStyleClass = tabbedPane.getActiveTabStyleClass();
-    	
-    	if( userActiveStyleClass == null || userActiveStyleClass.length() == 0 )
-    		return ACTIVE_HEADER_CELL_CLASS;
-    	
-    	return ACTIVE_HEADER_CELL_CLASS+' '+userActiveStyleClass;
+        String userActiveStyleClass = tabbedPane.getActiveTabStyleClass();
+
+        if( userActiveStyleClass == null || userActiveStyleClass.length() == 0 )
+            return ACTIVE_HEADER_CELL_CLASS;
+
+        return ACTIVE_HEADER_CELL_CLASS+' '+userActiveStyleClass;
     }
-    
+
     protected String getInactiveHeaderClasses(HtmlPanelTabbedPane tabbedPane){
-    	String userInactiveStyleClass = tabbedPane.getInactiveTabStyleClass();
-    	
-    	if( userInactiveStyleClass == null || userInactiveStyleClass.length() == 0 )
-    		return INACTIVE_HEADER_CELL_CLASS;
-    	
-    	return INACTIVE_HEADER_CELL_CLASS+' '+userInactiveStyleClass;
+        String userInactiveStyleClass = tabbedPane.getInactiveTabStyleClass();
+
+        if( userInactiveStyleClass == null || userInactiveStyleClass.length() == 0 )
+            return INACTIVE_HEADER_CELL_CLASS;
+
+        return INACTIVE_HEADER_CELL_CLASS+' '+userInactiveStyleClass;
     }
 
     protected void writeTableStart(ResponseWriter writer,
@@ -347,26 +347,26 @@
 
         tabbedPane.setBgcolor(oldBgColor);
     }
-    
+
     /**
      * As the colon (:) can't be used in CSS, transforms the id to make it safe to use for CSS. 
      */
     protected String getTableStylableId(HtmlPanelTabbedPane tabbedPane, FacesContext facesContext){
-    	String originalID = tabbedPane.getClientId( facesContext );
-    	return originalID.replace(':','_');
+        String originalID = tabbedPane.getClientId( facesContext );
+        return originalID.replace(':','_');
     }
-    
+
     protected String getTabIndexSubmitFieldIDAndName(HtmlPanelTabbedPane tabbedPane, FacesContext facesContext){
-    	return tabbedPane.getClientId(facesContext)+"_indexSubmit";
+        return tabbedPane.getClientId(facesContext)+"_indexSubmit";
     }
 
     protected String getHeaderCellID(HtmlPanelTab tab, FacesContext facesContext){
-    	return tab.getClientId(facesContext)+"_headerCell";
+        return tab.getClientId(facesContext)+"_headerCell";
     }
-    
+
     // Do not change without modifying the .js
     private String getSubHeaderCellID(HtmlPanelTab tab, FacesContext facesContext){
-    	return tab.getClientId(facesContext)+"_headerCell_sub";
+        return tab.getClientId(facesContext)+"_headerCell_sub";
     }
 
     protected void writeHeaderCell(ResponseWriter writer,
@@ -383,27 +383,27 @@
         HtmlRendererUtils.writePrettyIndent(facesContext);
         writer.startElement(HTML.TD_ELEM, tabbedPane);
         writer.writeAttribute(HTML.ID_ATTR, getHeaderCellID(tab, facesContext), null);
-        
+
         if (disabled)
         {
-        	String disabledClass = tabbedPane.getDisabledTabStyleClass();
+            String disabledClass = tabbedPane.getDisabledTabStyleClass();
             writer.writeAttribute(HTML.CLASS_ATTR,
-            					  DISABLED_HEADER_CELL_CLASS + (disabledClass==null ? "" : ' '+disabledClass),
+                                  DISABLED_HEADER_CELL_CLASS + (disabledClass==null ? "" : ' '+disabledClass),
                                   null);
         }
         else{
-        	if (active)
-	        {
-	            writer.writeAttribute(HTML.CLASS_ATTR,
-	                                  getActiveHeaderClasses(tabbedPane),
-	                                  null);
-	        }
-	        else
-	        {
-	            writer.writeAttribute(HTML.CLASS_ATTR,
-	            					  getInactiveHeaderClasses(tabbedPane),
-	                                  null);
-	        }
+            if (active)
+            {
+                writer.writeAttribute(HTML.CLASS_ATTR,
+                                      getActiveHeaderClasses(tabbedPane),
+                                      null);
+            }
+            else
+            {
+                writer.writeAttribute(HTML.CLASS_ATTR,
+                                      getInactiveHeaderClasses(tabbedPane),
+                                      null);
+            }
         }
 
 
@@ -419,24 +419,24 @@
             writer.writeText(label, null);
             writer.endElement(HTML.LABEL_ELEM);
         } else {
-        	// Button
-    		writer.startElement(HTML.INPUT_ELEM, tabbedPane);
+            // Button
+            writer.startElement(HTML.INPUT_ELEM, tabbedPane);
             writer.writeAttribute(HTML.TYPE_ATTR, "submit", null);
             writer.writeAttribute(HTML.NAME_ATTR, tabbedPane.getClientId(facesContext) + "." + tabIndex, null);
             writer.writeAttribute(HTML.VALUE_ATTR, label, null);
             if( tabbedPane.isClientSide() ){
-            	String activeUserClass = tabbedPane.getActiveTabStyleClass();
-            	String inactiveUserClass = tabbedPane.getInactiveTabStyleClass();
-            	String activeSubStyleUserClass = tabbedPane.getActiveSubStyleClass();
-            	String inactiveSubStyleUserClass = tabbedPane.getInactiveSubStyleClass();
-	            writer.writeAttribute(HTML.ONCLICK_ATTR,
-	        			"return myFaces_showPanelTab("
-	            			+tabIndex+",'"+getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext)+"',"
-	            			+'\''+getHeaderCellID(tab, facesContext)+"','"+tab.getClientId(facesContext)+"',"
-	        				+getHeaderCellsIDsVar(tabbedPane,facesContext)+','+getTabsIDsVar(tabbedPane,facesContext)+','
-							+ (activeUserClass==null ? "null" : '\''+activeUserClass+'\'')+','+ (inactiveUserClass==null ? "null" : '\''+inactiveUserClass+'\'')+','
-							+ (activeSubStyleUserClass==null ? "null" : '\''+activeSubStyleUserClass+'\'')+','+ (inactiveSubStyleUserClass==null ? "null" : '\''+inactiveSubStyleUserClass+'\'')+");",
-						null);
+                String activeUserClass = tabbedPane.getActiveTabStyleClass();
+                String inactiveUserClass = tabbedPane.getInactiveTabStyleClass();
+                String activeSubStyleUserClass = tabbedPane.getActiveSubStyleClass();
+                String inactiveSubStyleUserClass = tabbedPane.getInactiveSubStyleClass();
+                writer.writeAttribute(HTML.ONCLICK_ATTR,
+                                      "return myFaces_showPanelTab("
+                                      +tabIndex+",'"+getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext)+"',"
+                                      +'\''+getHeaderCellID(tab, facesContext)+"','"+tab.getClientId(facesContext)+"',"
+                                      +getHeaderCellsIDsVar(tabbedPane,facesContext)+','+getTabsIDsVar(tabbedPane,facesContext)+','
+                                      + (activeUserClass==null ? "null" : '\''+activeUserClass+'\'')+','+ (inactiveUserClass==null ? "null" : '\''+inactiveUserClass+'\'')+','
+                                      + (activeSubStyleUserClass==null ? "null" : '\''+activeSubStyleUserClass+'\'')+','+ (inactiveSubStyleUserClass==null ? "null" : '\''+inactiveSubStyleUserClass+'\'')+");",
+                                      null);
             }
 
             writer.endElement(HTML.INPUT_ELEM);
@@ -452,76 +452,76 @@
                                        int visibleTabSelectedIndex)
             throws IOException
     {
-    	String activeSubStyleUserClass = tabbedPane.getActiveSubStyleClass();
-    	String inactiveSubStyleUserClass = tabbedPane.getInactiveSubStyleClass();
-    	
-    	List children = tabbedPane.getChildren();
+        String activeSubStyleUserClass = tabbedPane.getActiveSubStyleClass();
+        String inactiveSubStyleUserClass = tabbedPane.getInactiveSubStyleClass();
+
+        List children = tabbedPane.getChildren();
         StringBuffer classes = new StringBuffer();
         for (int i = 0, len = children.size(), renderedIndex = 0; i < len; i++)
         {
             UIComponent child = getUIComponent((UIComponent)children.get(i));
             if (child instanceof HtmlPanelTab && child.isRendered())
             {
-            	HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+                HtmlRendererUtils.writePrettyLineSeparator(facesContext);
                 HtmlRendererUtils.writePrettyIndent(facesContext);
                 writer.startElement(HTML.TD_ELEM, tabbedPane);
                 writer.writeAttribute(HTML.ID_ATTR, getSubHeaderCellID((HtmlPanelTab)child, facesContext), null);
                 classes.setLength(0);
                 classes.append(SUB_HEADER_CELL_CLASS);
                 if( renderedIndex == 0 ){
-                	classes.append(' ');
-                	classes.append(SUB_HEADER_CELL_CLASS_FIRST);
+                    classes.append(' ');
+                    classes.append(SUB_HEADER_CELL_CLASS_FIRST);
                 }
                 if( renderedIndex == visibleTabCount ){
-                	classes.append(' ');
-                	classes.append(SUB_HEADER_CELL_CLASS_LAST);
-                	if( activeSubStyleUserClass != null ){
-                		classes.append(' ');
-                		classes.append(activeSubStyleUserClass);
-                	}
+                    classes.append(' ');
+                    classes.append(SUB_HEADER_CELL_CLASS_LAST);
+                    if( activeSubStyleUserClass != null ){
+                        classes.append(' ');
+                        classes.append(activeSubStyleUserClass);
+                    }
                 }else{
-                	if( inactiveSubStyleUserClass != null ){
-                		classes.append(' ');
-                		classes.append(inactiveSubStyleUserClass);
-                	}
+                    if( inactiveSubStyleUserClass != null ){
+                        classes.append(' ');
+                        classes.append(inactiveSubStyleUserClass);
+                    }
                 }
 
-            	classes.append(' ');
+                classes.append(' ');
                 classes.append(renderedIndex == visibleTabSelectedIndex ? SUB_HEADER_CELL_CLASS_ACTIVE : SUB_HEADER_CELL_CLASS_INACTIVE);
-                
+
                 writer.writeAttribute(HTML.CLASS_ATTR, classes.toString(), null);
 
                 writer.write("&#160;");
                 writer.endElement(HTML.TD_ELEM);
-                
-            	renderedIndex++;
+
+                renderedIndex++;
             }
         }
-        
+
         // Empty Cell Sub
         HtmlRendererUtils.writePrettyLineSeparator(facesContext);
         HtmlRendererUtils.writePrettyIndent(facesContext);
         writer.startElement(HTML.TD_ELEM, tabbedPane);
         writer.writeAttribute(
-        		HTML.CLASS_ATTR,
-        		SUB_HEADER_CELL_CLASS+' '+SUB_HEADER_CELL_CLASS_LAST
-        		+(inactiveSubStyleUserClass != null ? ' '+inactiveSubStyleUserClass : ""),
-        		 null);
+                HTML.CLASS_ATTR,
+                SUB_HEADER_CELL_CLASS+' '+SUB_HEADER_CELL_CLASS_LAST
+                +(inactiveSubStyleUserClass != null ? ' '+inactiveSubStyleUserClass : ""),
+                null);
         writer.write("&#160;");
         writer.endElement(HTML.TD_ELEM);
     }
 
     protected void writeTabsContents(ResponseWriter writer, FacesContext facesContext, HtmlPanelTabbedPane tabbedPane,
-           int selectedIndex) throws IOException {
+                                     int selectedIndex) throws IOException {
        HtmlRendererUtils.writePrettyLineSeparator(facesContext);
-            
+
        int tabIdx = 0;
        List children = tabbedPane.getChildren();
        for (int i = 0, len = children.size(); i < len; i++) {
            UIComponent child = getUIComponent((UIComponent) children.get(i));
            if (child instanceof HtmlPanelTab) {
-        	   HtmlPanelTab tab = (HtmlPanelTab)child;
-        	   writer.startElement(HTML.DIV_ELEM, tabbedPane);
+               HtmlPanelTab tab = (HtmlPanelTab)child;
+               writer.startElement(HTML.DIV_ELEM, tabbedPane);
                writer.writeAttribute(HTML.ID_ATTR, tab.getClientId(facesContext), null);
                // the inactive tabs are hidden with a div-tag
                if (tabIdx != selectedIndex) {

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tabbedpane/TabChangeListenerTag.java Fri Feb 24 07:47:18 2006
@@ -23,7 +23,7 @@
 import javax.servlet.jsp.tagext.Tag;
 import javax.servlet.jsp.tagext.TagSupport;
 
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeCheckboxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeCheckboxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeCheckboxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeCheckboxRenderer.java Fri Feb 24 07:47:18 2006
@@ -25,8 +25,8 @@
 import javax.faces.convert.Converter;
 
 import org.apache.myfaces.custom.tree.HtmlTreeCheckbox;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlCheckboxRendererBase;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlCheckboxRendererBase;
 
 /**
  * @author <a href="mailto:dlestrat@apache.org">David Le Strat </a>
@@ -52,7 +52,7 @@
         if (uiComponent == null)
         {
             throw new IllegalStateException("Could not find component '" + forAttr
-                    + "' (calling findComponent on component '" + checkbox.getClientId(context) + "')");
+                                            + "' (calling findComponent on component '" + checkbox.getClientId(context) + "')");
         }
         if (!(uiComponent instanceof UISelectMany))
         {
@@ -70,7 +70,7 @@
         {
             converter = null;
         }
-        
+
         Set lookupSet = RendererUtils.getSelectedValuesAsSet(context, component, converter, uiSelectMany);
 
         Object itemValue = checkbox.getItemValue();
@@ -88,16 +88,16 @@
         }
 
         renderCheckbox(context,
-        		uiSelectMany,
-        		itemStrValue,
-        		checkbox.getItemLabel(),
-        		isDisabled(context,uiSelectMany),
-        		lookupSet.contains(itemStrValue),
-                true);
+                       uiSelectMany,
+                       itemStrValue,
+                       checkbox.getItemLabel(),
+                       isDisabled(context,uiSelectMany),
+                       lookupSet.contains(itemStrValue),
+                       true);
     }
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlCheckboxRendererBase#isDisabled(javax.faces.context.FacesContext,
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlCheckboxRendererBase#isDisabled(javax.faces.context.FacesContext,
      *      javax.faces.component.UIComponent)
      */
     protected boolean isDisabled(FacesContext facesContext, UIComponent uiComponent)

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeImageCommandLinkRenderer.java Fri Feb 24 07:47:18 2006
@@ -17,9 +17,9 @@
 
 import org.apache.myfaces.custom.tree.HtmlTreeImageCommandLink;
 import org.apache.myfaces.custom.tree.HtmlTreeNode;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlLinkRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlLinkRendererBase;
 
 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/tree/renderkit/html/HtmlTreeNodeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeNodeRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeNodeRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeNodeRenderer.java Fri Feb 24 07:47:18 2006
@@ -16,8 +16,8 @@
 package org.apache.myfaces.custom.tree.renderkit.html;
 
 import org.apache.myfaces.custom.tree.HtmlTreeNode;
-import org.apache.myfaces.renderkit.html.HtmlLinkRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlLinkRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 
 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/tree/renderkit/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,20 +15,20 @@
  */
 package org.apache.myfaces.custom.tree.renderkit.html;
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
+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.custom.tree.HtmlTree;
 import org.apache.myfaces.custom.tree.HtmlTreeColumn;
 import org.apache.myfaces.custom.tree.HtmlTreeImageCommandLink;
 import org.apache.myfaces.custom.tree.HtmlTreeNode;
 import org.apache.myfaces.custom.tree.IconProvider;
 import org.apache.myfaces.custom.tree.TreeNode;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-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.RendererUtils;
+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 javax.faces.component.UIColumn;
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/IconProviderTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/IconProviderTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/IconProviderTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/IconProviderTag.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.custom.tree.taglib;
 
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
 import org.apache.myfaces.custom.tree.HtmlTree;
 import org.apache.myfaces.custom.tree.IconProvider;
 

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeCheckboxTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeCheckboxTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeCheckboxTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeCheckboxTag.java Fri Feb 24 07:47:18 2006
@@ -18,7 +18,7 @@
 import javax.faces.component.UIComponent;
 
 import org.apache.myfaces.custom.tree.HtmlTreeCheckbox;
-import org.apache.myfaces.taglib.core.SelectItemTagBase;
+import org.apache.myfaces.shared.taglib.core.SelectItemTagBase;
 
 /**
  * @author <a href="dlestrat@apache.org">David Le Strat</a>

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeColumnTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeColumnTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeColumnTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeColumnTag.java Fri Feb 24 07:47:18 2006
@@ -16,7 +16,7 @@
 package org.apache.myfaces.custom.tree.taglib;
 
 import org.apache.myfaces.custom.tree.HtmlTreeColumn;
-import org.apache.myfaces.taglib.html.HtmlComponentBodyTagBase;
+import org.apache.myfaces.shared.taglib.html.HtmlComponentBodyTagBase;
 
 
 /**
@@ -28,7 +28,7 @@
  */
 public class TreeColumnTag extends HtmlComponentBodyTagBase
 {
-  
+
     /**
      * @see javax.faces.webapp.UIComponentTag#getComponentType()
      */

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeSelectionListenerTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeSelectionListenerTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeSelectionListenerTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeSelectionListenerTag.java Fri Feb 24 07:47:18 2006
@@ -25,7 +25,7 @@
 
 import org.apache.myfaces.custom.tree.HtmlTree;
 import org.apache.myfaces.custom.tree.event.TreeSelectionListener;
-import org.apache.myfaces.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree/taglib/TreeTag.java Fri Feb 24 07:47:18 2006
@@ -19,7 +19,7 @@
 import org.apache.myfaces.custom.tree.model.TreeModel;
 import org.apache.myfaces.custom.tree.model.TreePath;
 import org.apache.myfaces.custom.tree.HtmlTree;
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 
 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/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java Fri Feb 24 07:47:18 2006
@@ -17,13 +17,12 @@
 package org.apache.myfaces.custom.tree2;
 
 
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.custom.tree2.TreeWalkerBase;
+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.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
 
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
@@ -42,7 +41,6 @@
 import java.net.URLDecoder;
 import javax.servlet.http.Cookie;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * @author Sean Schofield
@@ -637,7 +635,7 @@
         if (imageLocation == null)
         {
             return addResource.getResourceUri(context, HtmlTreeRenderer.class,
-                "images/" + imageName, withContextPath);
+                                              "images/" + imageName, withContextPath);
         }
         else
         {

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/TreeTag.java Fri Feb 24 07:47:18 2006
@@ -16,11 +16,11 @@
 
 package org.apache.myfaces.custom.tree2;
 
-import org.apache.myfaces.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentTagBase;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 /**
  * @author Sean Schofield

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java Fri Feb 24 07:47:18 2006
@@ -35,7 +35,7 @@
 import javax.faces.event.FacesListener;
 import javax.faces.event.PhaseId;
 
-import org.apache.myfaces.util.MessageUtils;
+import org.apache.myfaces.shared.util.MessageUtils;
 
 /**
  * TreeData is a {@link UIComponent} that supports binding data stored in a tree represented

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

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java Fri Feb 24 07:47:18 2006
@@ -18,14 +18,14 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 import org.apache.myfaces.component.html.ext.HtmlSelectManyCheckbox;
 import org.apache.myfaces.custom.checkbox.HtmlCheckbox;
-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.HtmlCheckboxRendererBase;
-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.HtmlCheckboxRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlGridRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlGridRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlGridRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlGridRenderer.java Fri Feb 24 07:47:18 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.myfaces.renderkit.html.ext;
 
-import org.apache.myfaces.renderkit.html.HtmlGridRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlGridRendererBase;
 
 /**
  * X-CHECKED: tlddoc h:panelGrid 1.0 final

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

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

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlLinkRenderer.java Fri Feb 24 07:47:18 2006
@@ -17,10 +17,10 @@
 
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.component.html.ext.HtmlCommandLink;
-import org.apache.myfaces.renderkit.html.HtmlLinkRendererBase;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HtmlLinkRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIOutput;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlListboxRenderer.java Fri Feb 24 07:47:18 2006
@@ -21,8 +21,8 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.renderkit.html.HtmlListboxRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlListboxRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMenuRenderer.java Fri Feb 24 07:47:18 2006
@@ -21,8 +21,8 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.renderkit.html.HtmlMenuRendererBase;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlMenuRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessageRenderer.java Fri Feb 24 07:47:18 2006
@@ -19,9 +19,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.component.html.ext.HtmlMessage;
 import org.apache.myfaces.component.html.ext.HtmlMessages;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlMessageRendererBase;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessageRendererBase;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIColumn;
@@ -247,7 +247,7 @@
 
         if(component instanceof ValueHolder)
         {
-            text=RendererUtils.getStringValue(facesContext, component);
+            text= RendererUtils.getStringValue(facesContext, component);
         }
 
         if (text == null || text.length() < 1)

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlMessagesRenderer.java Fri Feb 24 07:47:18 2006
@@ -17,8 +17,8 @@
 
 import org.apache.myfaces.component.html.ext.HtmlMessage;
 import org.apache.myfaces.component.html.ext.HtmlMessages;
-import org.apache.myfaces.renderkit.html.HtmlMessagesRendererBase;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlMessagesRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlRadioRenderer.java Fri Feb 24 07:47:18 2006
@@ -28,10 +28,10 @@
 
 import org.apache.myfaces.component.UserRoleUtils;
 import org.apache.myfaces.custom.radio.HtmlRadio;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRadioRendererBase;
-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.HtmlRadioRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlSecretRenderer.java Fri Feb 24 07:47:18 2006
@@ -23,10 +23,10 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.renderkit.JSFAttr;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlSecretRendererBase;
+import org.apache.myfaces.shared.renderkit.JSFAttr;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlSecretRendererBase;
 
 
 /**
@@ -48,35 +48,35 @@
             return super.isDisabled(facesContext, uiComponent);
         }
     }
-    
+
     public void encodeEnd(FacesContext facesContext, UIComponent component)
     throws IOException
-	{
-	    if(HtmlRendererUtils.isDisplayValueOnly(component))
-	    {
-	    	renderInputValueOnly(facesContext,
-	                (UIInput) component);
-	    }
-	    else
-	    {
-	        super.encodeEnd(facesContext, component);
-	    }
-	}
-	
-	protected void renderInputValueOnly(FacesContext facesContext, UIInput uiInput)
-	    throws IOException
-	{
-	    ResponseWriter writer = facesContext.getResponseWriter();
-	
-	    writer.startElement(HTML.SPAN_ELEM, uiInput);
-	
-	    HtmlRendererUtils.writeIdIfNecessary(writer, uiInput, facesContext);
-	
-	    HtmlRendererUtils.renderDisplayValueOnlyAttributes(uiInput, writer);
-	
-	    // renders five asterisks instead of the component value
-	    writer.writeText("*****", JSFAttr.VALUE_ATTR);
-	
-	    writer.endElement(HTML.SPAN_ELEM);
-	}
+    {
+        if(HtmlRendererUtils.isDisplayValueOnly(component))
+        {
+            renderInputValueOnly(facesContext,
+                                 (UIInput) component);
+        }
+        else
+        {
+            super.encodeEnd(facesContext, component);
+        }
+    }
+
+    protected void renderInputValueOnly(FacesContext facesContext, UIInput uiInput)
+        throws IOException
+    {
+        ResponseWriter writer = facesContext.getResponseWriter();
+
+        writer.startElement(HTML.SPAN_ELEM, uiInput);
+
+        HtmlRendererUtils.writeIdIfNecessary(writer, uiInput, facesContext);
+
+        HtmlRendererUtils.renderDisplayValueOnlyAttributes(uiInput, writer);
+
+        // renders five asterisks instead of the component value
+        writer.writeText("*****", JSFAttr.VALUE_ATTR);
+
+        writer.endElement(HTML.SPAN_ELEM);
+    }
 }

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTableRenderer.java Fri Feb 24 07:47:18 2006
@@ -27,11 +27,11 @@
 import org.apache.myfaces.component.html.ext.HtmlDataTable;
 import org.apache.myfaces.custom.column.HtmlColumn;
 import org.apache.myfaces.custom.crosstable.UIColumns;
-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.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlTableRendererBase;
+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;
 
 /**
  * Renderer for the Tomahawk extended HtmlDataTable component.
@@ -82,7 +82,7 @@
 	}
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#encodeBegin(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
      */
     public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) throws IOException
     {
@@ -101,7 +101,7 @@
     }
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#encodeChildren(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
      */
     public void encodeChildren(FacesContext facesContext, UIComponent component) throws IOException
     {
@@ -120,7 +120,7 @@
     }
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#encodeEnd(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
      */
     public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
     {
@@ -160,7 +160,7 @@
     }
     
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#renderRowStyle(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIData, java.util.Iterator)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#renderRowStyle(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIData, java.util.Iterator)
      */
     protected void renderRowStyle(FacesContext facesContext, ResponseWriter writer, UIData uiData, Iterator rowStyleIterator) throws IOException
     {
@@ -231,7 +231,7 @@
      * attribute on the UIColumns object, then they end up rendering content
      * that is extracted from the current column object.  
      * 
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#encodeColumnChild(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIData, javax.faces.component.UIComponent, java.util.Iterator)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#encodeColumnChild(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIData, javax.faces.component.UIComponent, java.util.Iterator)
      */
     protected void encodeColumnChild(FacesContext facesContext,
                     ResponseWriter writer, UIData uiData,
@@ -254,7 +254,7 @@
     }
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#renderColumnBody(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIData, javax.faces.component.UIComponent, java.util.Iterator)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#renderColumnBody(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIData, javax.faces.component.UIComponent, java.util.Iterator)
      */
     protected void renderColumnBody(FacesContext facesContext,
                     ResponseWriter writer, UIData uiData,
@@ -312,7 +312,7 @@
      * attribute on the UIColumns object, then it ends up rendering content
      * that is extracted from the current column object.
      *   
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#renderColumnChildHeaderOrFooterRow(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIComponent, java.lang.String, boolean)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#renderColumnChildHeaderOrFooterRow(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIComponent, java.lang.String, boolean)
      */
     protected void renderColumnChildHeaderOrFooterRow(
                     FacesContext facesContext, ResponseWriter writer,
@@ -343,7 +343,7 @@
     }
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#renderColumnHeaderCell(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIComponent, javax.faces.component.UIComponent, java.lang.String, int)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#renderColumnHeaderCell(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIComponent, javax.faces.component.UIComponent, java.lang.String, int)
      */
     protected void renderColumnHeaderCell(FacesContext facesContext,
                     ResponseWriter writer, UIComponent uiComponent,
@@ -383,7 +383,7 @@
     }
 
     /**
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#renderColumnFooterCell(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIComponent, javax.faces.component.UIComponent, java.lang.String, int)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#renderColumnFooterCell(javax.faces.context.FacesContext, javax.faces.context.ResponseWriter, javax.faces.component.UIComponent, javax.faces.component.UIComponent, java.lang.String, int)
      */
     protected void renderColumnFooterCell(FacesContext facesContext,
                     ResponseWriter writer, UIComponent uiComponent,
@@ -448,7 +448,7 @@
      * For UIColumns children, return the number of dynamic columns rendered
      * by that child.
      * 
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase
      *   #determineChildColSpan(javax.faces.component.UIComponent)
      */
     protected int determineChildColSpan(UIComponent uiComponent)
@@ -465,7 +465,7 @@
      * Return true if the specified component has a facet that needs to be
      * rendered in a THEAD or TFOOT section.
      * 
-     * @see org.apache.myfaces.renderkit.html.HtmlTableRendererBase#hasFacet(boolean, javax.faces.component.UIComponent)
+     * @see org.apache.myfaces.shared.renderkit.html.HtmlTableRendererBase#hasFacet(boolean, javax.faces.component.UIComponent)
      */
     protected boolean hasFacet(boolean header, UIComponent uiComponent)
     {

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextRenderer.java Fri Feb 24 07:47:18 2006
@@ -22,8 +22,8 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlTextRendererBase;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
 
 
 /**
@@ -63,7 +63,7 @@
         throws IOException
     {
             HtmlRendererUtils.renderDisplayValueOnly(facesContext,
-                    (UIInput) component);
+                                                     (UIInput) component);
     }
 
     protected void renderNormal(FacesContext facesContext, UIComponent component)

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlTextareaRenderer.java Fri Feb 24 07:47:18 2006
@@ -22,9 +22,9 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.component.UserRoleUtils;
-import org.apache.myfaces.renderkit.RendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlRendererUtils;
-import org.apache.myfaces.renderkit.html.HtmlTextareaRendererBase;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlRendererUtils;
+import org.apache.myfaces.shared.renderkit.html.HtmlTextareaRendererBase;
 
 
 /**

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/renderkit/html/util/ExtensionsPhaseListener.java Fri Feb 24 07:47:18 2006
@@ -17,8 +17,11 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.config.MyfacesConfig;
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.config.MyfacesConfig;
+import org.apache.myfaces.shared.renderkit.html.util.DummyFormUtils;
+import org.apache.myfaces.shared.renderkit.html.util.HtmlBufferResponseWriterWrapper;
+import org.apache.myfaces.shared.renderkit.html.util.JavascriptUtils;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;

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

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

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlDataTableTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlDataTableTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlDataTableTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlDataTableTag.java Fri Feb 24 07:47:18 2006
@@ -17,8 +17,8 @@
 
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlDataTable;
-import org.apache.myfaces.taglib.html.HtmlDataTableTagBase;
-import org.apache.myfaces.renderkit.JSFAttr;
+import org.apache.myfaces.shared.taglib.html.HtmlDataTableTagBase;
+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/taglib/html/ext/HtmlGraphicImageTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlGraphicImageTag.java Fri Feb 24 07:47:18 2006
@@ -17,10 +17,10 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.renderkit.html.HTML;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.taglib.html.HtmlGraphicImageTagBase;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlGraphicImage;
-import org.apache.myfaces.taglib.html.HtmlGraphicImageTagBase;
 
 /**
  * @author Bruno Aranda
@@ -39,22 +39,22 @@
         return "org.apache.myfaces.Image";
     }
 
-    private String _align;  
+    private String _align;
     private String _border;
     private String _enabledOnUserRole;
     private String _hspace;
     private String _visibleOnUserRole;
-    private String _vspace;    
+    private String _vspace;
 
     public void release() {
         super.release();
 
         _align=null;
-        _border=null;        
+        _border=null;
         _enabledOnUserRole=null;
-        _hspace=null;        
+        _hspace=null;
         _visibleOnUserRole=null;
-        _vspace=null;        
+        _vspace=null;
    }
 
     protected void setProperties(UIComponent component)
@@ -64,7 +64,7 @@
         setStringProperty(component, HTML.ALIGN_ATTR, _align);
         setStringProperty(component, HTML.BORDER_ATTR, _border);
         setStringProperty(component, HTML.HSPACE_ATTR, _hspace);
-        setStringProperty(component, HTML.VSPACE_ATTR, _vspace);        
+        setStringProperty(component, HTML.VSPACE_ATTR, _vspace);
         setStringProperty(component, UserRoleAware.ENABLED_ON_USER_ROLE_ATTR, _enabledOnUserRole);
         setStringProperty(component, UserRoleAware.VISIBLE_ON_USER_ROLE_ATTR, _visibleOnUserRole);
     }

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

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputSecretTag.java Fri Feb 24 07:47:18 2006
@@ -17,11 +17,11 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.component.DisplayValueOnlyCapable;
+import org.apache.myfaces.shared.renderkit.html.HTML;
 import org.apache.myfaces.component.UserRoleAware;
 import org.apache.myfaces.component.html.ext.HtmlInputSecret;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.taglib.html.HtmlInputSecretTagBase;
+import org.apache.myfaces.shared.taglib.html.HtmlInputSecretTagBase;
 
 /**
  * @author Bruno Aranda 
@@ -47,8 +47,8 @@
     private String _dataformatas;
 
     private String _displayValueOnly;
-	private String _displayValueOnlyStyle;
-	private String _displayValueOnlyStyleClass;
+    private String _displayValueOnlyStyle;
+    private String _displayValueOnlyStyleClass;
 
     public void release() {
         super.release();
@@ -100,7 +100,7 @@
     {
         _displayValueOnlyStyleClass = displayValueOnlyStyleClass;
     }
-    
+
     public void setDatafld(String datafld)
     {
         _datafld = datafld;

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

Modified: myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputTextareaTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputTextareaTag.java?rev=380693&r1=380692&r2=380693&view=diff
==============================================================================
--- myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputTextareaTag.java (original)
+++ myfaces/tomahawk/branches/1_1_2/core/src/main/java/org/apache/myfaces/taglib/html/ext/HtmlInputTextareaTag.java Fri Feb 24 07:47:18 2006
@@ -17,11 +17,11 @@
 
 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.component.html.ext.HtmlInputTextarea;
-import org.apache.myfaces.renderkit.html.HTML;
-import org.apache.myfaces.taglib.html.HtmlInputTextareaTagBase;
+import org.apache.myfaces.shared.renderkit.html.HTML;
+import org.apache.myfaces.shared.taglib.html.HtmlInputTextareaTagBase;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
@@ -32,7 +32,7 @@
 {
     private static final String TEXTAREA_RENDERER = "org.apache.myfaces.Textarea";
 
-	public String getComponentType()
+    public String getComponentType()
     {
         return HtmlInputTextarea.COMPONENT_TYPE;
     }
@@ -46,11 +46,11 @@
     private String _visibleOnUserRole;
 
     private String _displayValueOnly;
-	private String _displayValueOnlyStyle;
-	private String _displayValueOnlyStyleClass;
+    private String _displayValueOnlyStyle;
+    private String _displayValueOnlyStyleClass;
 
     private String _wrap;
-	
+
     public void release() {
         super.release();
 
@@ -60,7 +60,7 @@
         _displayValueOnly=null;
         _displayValueOnlyStyle=null;
         _displayValueOnlyStyleClass=null;
-        
+
         _wrap = null;
     }
 
@@ -69,13 +69,13 @@
         super.setProperties(component);
         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);
-        
+
         setStringProperty(component, HTML.WRAP_ATTR, _wrap);
-        
+
     }
 
     public void setEnabledOnUserRole(String enabledOnUserRole)

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

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

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

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

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

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

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



Mime
View raw message