You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/12/06 04:44:09 UTC
svn commit: r354278 - in
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane:
HtmlPanelTabbedPane.java HtmlTabbedPaneRenderer.java
Author: svieujot
Date: Mon Dec 5 19:44:03 2005
New Revision: 354278
URL: http://svn.apache.org/viewcvs?rev=354278&view=rev
Log:
Expose HtmlPanelTabbedPane.isClientSide.
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java?rev=354278&r1=354277&r2=354278&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlPanelTabbedPane.java Mon Dec 5 19:44:03 2005
@@ -56,7 +56,6 @@
// int tabIdx = 0;
// int selectedIndex = getSelectedIndex();
- getSelectedIndex();
Iterator it = getFacetsAndChildren();
@@ -133,6 +132,16 @@
}
}
}
+ }
+
+ /**
+ * Write out information about the toggling mode - the component might
+ * be toggled server side or client side.
+ */
+ public boolean isClientSide(){
+ Boolean serverSideTabSwitch = (Boolean)getAttributes().get("serverSideTabSwitch");
+
+ return serverSideTabSwitch != null ? !serverSideTabSwitch.booleanValue() : true;
}
//------------------ GENERATED CODE BEGIN (do not modify!) --------------------
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=354278&r1=354277&r2=354278&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Mon Dec 5 19:44:03 2005
@@ -73,20 +73,6 @@
{
// NoOp
}
-
- /**
- * Write out information about the toggling mode - the component might
- * be toggled server side or client side.
- *
- * @param uiComponent
- */
- private boolean isClientSide(HtmlPanelTabbedPane uiComponent){
-
- Boolean serverSideTabSwitch = (Boolean)
- uiComponent.getAttributes().get("serverSideTabSwitch");
-
- return serverSideTabSwitch != null ? !serverSideTabSwitch.booleanValue() : true;
- }
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
{
@@ -102,9 +88,9 @@
addResource.addStyleSheet(facesContext,AddResource.HEADER_BEGIN,
HtmlTabbedPaneRenderer.class, "defaultStyles.css");
- if( isClientSide(tabbedPane) ){
- addResource.addJavaScriptAtPosition(facesContext, AddResource.HEADER_BEGIN, HtmlTabbedPaneRenderer.class, "dynamicTabs.js");
- addResource.addInlineStyleAtPosition(facesContext,AddResource.HEADER_BEGIN,
+ 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"+
@@ -127,7 +113,7 @@
List children = tabbedPane.getChildren();
- if( isClientSide(tabbedPane) ){
+ if( tabbedPane.isClientSide() ){
List headerIDs = new ArrayList();
List tabIDs = new ArrayList();
for (int i = 0, len = children.size(); i < len; i++)
@@ -277,7 +263,7 @@
// No request due to a header button pressed.
// Restore a client-side switch
- if( isClientSide(tabbedPane) ){
+ if( tabbedPane.isClientSide() ){
String clientSideIndex = (String)paramMap.get(getTabIndexSubmitFieldIDAndName(tabbedPane, facesContext));
if (clientSideIndex != null && clientSideIndex.length() > 0)
{
@@ -437,7 +423,7 @@
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( isClientSide(tabbedPane) ){
+ if( tabbedPane.isClientSide() ){
String activeUserClass = tabbedPane.getActiveTabStyleClass();
String inactiveUserClass = tabbedPane.getInactiveTabStyleClass();
String activeSubStyleUserClass = tabbedPane.getActiveSubStyleClass();