JBoss Rich Faces SVN: r2617 - in trunk/ui/dataTable/src: test/java/org/richfaces/util and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-08-30 10:32:23 -0400 (Thu, 30 Aug 2007)
New Revision: 2617
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java
trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java
Log:
fixed incorrect COMPONENT_TYPE declaration. It MUST be public
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2007-08-30 14:31:00 UTC (rev 2616)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2007-08-30 14:32:23 UTC (rev 2617)
@@ -21,17 +21,16 @@
package org.richfaces.component;
-import java.util.Date;
/**
* JSF component class
- *
+ *
*/
public abstract class UIColumn extends javax.faces.component.UIColumn implements Column {
- private static final String COMPONENT_TYPE = "org.richfaces.Column";
+ public static final String COMPONENT_TYPE = "org.richfaces.Column";
- private static final String COMPONENT_FAMILY = "org.richfaces.Column";
+ public static final String COMPONENT_FAMILY = "org.richfaces.Column";
}
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java 2007-08-30 14:31:00 UTC (rev 2616)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumnGroup.java 2007-08-30 14:32:23 UTC (rev 2617)
@@ -33,9 +33,9 @@
*/
public abstract class UIColumnGroup extends UIPanel implements Row {
- private static final String COMPONENT_TYPE = "org.richfaces.Colgroup";
+ public static final String COMPONENT_TYPE = "org.richfaces.Colgroup";
- private static final String COMPONENT_FAMILY = "org.richfaces.Colgroup";
+ public static final String COMPONENT_FAMILY = "org.richfaces.Colgroup";
public Iterator columns(){
return new FilterIterator(getChildren().iterator(),UIDataTable.isColumn);
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java 2007-08-30 14:31:00 UTC (rev 2616)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataGrid.java 2007-08-30 14:32:23 UTC (rev 2617)
@@ -31,9 +31,9 @@
*/
public abstract class UIDataGrid extends SequenceDataAdaptor {
- private static final String COMPONENT_TYPE = "org.richfaces.DataGrig";
+ public static final String COMPONENT_TYPE = "org.richfaces.DataGrig";
- private static final String COMPONENT_FAMILY = "org.richfaces.DataGrig";
+ public static final String COMPONENT_FAMILY = "org.richfaces.DataGrig";
/**
* Number of columns in one table row.
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java 2007-08-30 14:31:00 UTC (rev 2616)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataList.java 2007-08-30 14:32:23 UTC (rev 2617)
@@ -27,13 +27,13 @@
/**
* JSF component class
- *
+ *
*/
public abstract class UIDataList extends SequenceDataAdaptor {
- private static final String COMPONENT_TYPE = "org.richfaces.DataList";
+ public static final String COMPONENT_TYPE = "org.richfaces.DataList";
- private static final String COMPONENT_FAMILY = "org.richfaces.DataList";
+ public static final String COMPONENT_FAMILY = "org.richfaces.DataList";
/* (non-Javadoc)
* @see org.ajax4jsf.ajax.repeat.UIDataAdaptor#dataChildren()
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-08-30 14:31:00 UTC (rev 2616)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2007-08-30 14:32:23 UTC (rev 2617)
@@ -145,8 +145,8 @@
return new FilterIterator(getChildren().iterator(), isColumn);
}
- private static final String COMPONENT_TYPE = "org.richfaces.DataTable";
+ public static final String COMPONENT_TYPE = "org.richfaces.DataTable";
- private static final String COMPONENT_FAMILY = "org.richfaces.DataTable";
+ public static final String COMPONENT_FAMILY = "org.richfaces.DataTable";
}
\ No newline at end of file
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java 2007-08-30 14:31:00 UTC (rev 2616)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UISubTable.java 2007-08-30 14:32:23 UTC (rev 2617)
@@ -23,18 +23,16 @@
import java.util.Iterator;
-import org.apache.commons.collections.iterators.FilterIterator;
-
/**
* JSF component class
*
*/
public abstract class UISubTable extends UIDataTable implements Row {
- private static final String COMPONENT_TYPE = "org.richfaces.SubTable";
+ public static final String COMPONENT_TYPE = "org.richfaces.SubTable";
- private static final String COMPONENT_FAMILY = "org.richfaces.SubTable";
+ public static final String COMPONENT_FAMILY = "org.richfaces.SubTable";
/* (non-Javadoc)
* @see org.richfaces.component.Column#isBreakBefore()
Modified: trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java
===================================================================
--- trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java 2007-08-30 14:31:00 UTC (rev 2616)
+++ trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java 2007-08-30 14:32:23 UTC (rev 2617)
@@ -21,8 +21,6 @@
package org.richfaces.util;
-import java.util.Collections;
-
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.richfaces.component.UIColumn;
16 years, 8 months
JBoss Rich Faces SVN: r2616 - trunk/ui/scrollableDataTable/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-08-30 10:31:00 -0400 (Thu, 30 Aug 2007)
New Revision: 2616
Modified:
trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
Log:
http://jira.jboss.com/jira/browse/RF-447
Modified: trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml
===================================================================
--- trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2007-08-30 14:27:28 UTC (rev 2615)
+++ trunk/ui/scrollableDataTable/src/main/config/component/scrollable-data-table.xml 2007-08-30 14:31:00 UTC (rev 2616)
@@ -140,6 +140,9 @@
<property attachedstate="true">
<name>sortOrder</name>
<classname>org.richfaces.model.SortOrder</classname>
+ <description>
+ ValueBinding pointing at a property of a class to manage rows sorting
+ </description>
</property>
<property attachedstate="true" hidden="true">
@@ -228,6 +231,13 @@
</description>
</property>
+ <property>
+ <name>ajaxKeys</name>
+ <classname>java.lang.String</classname>
+ <description>This attribute defines rows that are updated after an AJAX request</description>
+ </property>
+
+
&ajax_component_attributes;
&ui_component_attributes;
&ui_data_attributes;
16 years, 8 months
JBoss Rich Faces SVN: r2615 - trunk/test-applications/jsp/src/main/webapp/Div.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-08-30 10:27:28 -0400 (Thu, 30 Aug 2007)
New Revision: 2615
Modified:
trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp
Log:
update
Modified: trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp 2007-08-30 14:26:49 UTC (rev 2614)
+++ trunk/test-applications/jsp/src/main/webapp/Div/Div.jsp 2007-08-30 14:27:28 UTC (rev 2615)
@@ -2,81 +2,61 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
-<f:view>
+
+
+
<html>
<head>
<title></title>
</head>
-
- <body>
- <h:form id="divTestID">
- <div id="div_1_ID" style="position: relative; left:#{divBean.left[0]}; top:#{divBean.top[0]}">
- <div id="div_2_ID" style="position: absolute; left:#{divBean.left[1]}; top:#{divBean.top[1]}">
- <jsp:include page="${divBean.src}" />
+ <body >
+ <jsp:useBean id="tDivID" scope="session" class="div.DivBean"/>
+ <% String res = request.getParameter("srcSelect");
+ int index;
+ if(res == null)
+ index = 0;
+ else index = Integer.valueOf(res);
+ %>
+ <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;">
+ <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;">
+ <jsp:include page="<%= tDivID.getSrc()[Integer.valueOf(index)] %>" />
</div>
</div>
- </h:form>
- <h:form id="forvDivOpthID">
- <div id="divOpthID" style="position:relative" align="right">
- <h:panelGrid columns="2">
- <h:outputText value="Select component:" />
- <h:selectOneMenu value="#{divBean.src}">
- <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" />
- <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" />
- <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" />
- <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" />
- <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" />
- <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" />
- <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" />
- <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" />
- <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" />
- <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" />
- <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" />
- <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" />
- <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" />
- <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" />
- <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" />
- <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" />
- <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" />
- <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" />
- <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" />
- <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" />
- <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" />
- <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" />
- <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" />
- <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" />
- <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" />
- <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" />
- <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" />
- </h:selectOneMenu>
-
- <h:commandLink value="Submit" action="submit();"></h:commandLink>
- <f:verbatim></f:verbatim>
-
- <h:outputText value="div 1 left:" />
- <h:inputText value="#{divBean.left[0]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
- <h:outputText value="div 1 top:" />
- <h:inputText value="#{divBean.top[0]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
- <h:outputText value="div 2 left:" />
- <h:inputText value="#{divBean.left[1]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
-
-
- <h:outputText value="div 2 top:" />
- <h:inputText value="#{divBean.top[1]}" >
- <a4j:support event="onchange" action="submit();"></a4j:support>
- </h:inputText>
- </h:panelGrid>
- <h:commandLink value="Back" action="main"></h:commandLink>
- </div>
- </h:form>
+
+ <div id="divTestOpthn" align="right">
+ <%= "Current: " + tDivID.getSrc()[Integer.valueOf(index)] %>
+ <form action="/jsp/Div/Div.jsf" method="get">
+ <SELECT NAME="srcSelect">
+ <option value="0">Calendar</option>
+ <option value="1">DataFilterSlider</option>
+ <option value="2">Date Scroller</option>
+ <option value="3">Drag And Drop</option>
+ <option value="4">Drop Down Menu</option>
+ <option value="5">Effect</option>
+ <option value="6">Gmap</option>
+ <option value="7">Input Number Slider</option>
+ <option value="8">Input Number Spinner</option>
+ <option value="9">Insert</option>
+ <option value="10">Message</option>
+ <option value="11">Modal Panel</option>
+ <option value="12">Paint2D</option>
+ <option value="13">Panel</option>
+ <option value="14">Panel2</option>
+ <option value="15">Panel Bar</option>
+ <option value="16">Panel Menu</option>
+ <option value="17">Separator</option>
+ <option value="18">Simple Toggle Panel</option>
+ <option value="19">Spacer</option>
+ <option value="20">Suggestion Box</option>
+ <option value="21">Tab Panel</option>
+ <option value="22">Toggle Panel</option>
+ <option value="23">Tool Bar</option>
+ <option value="24">Tooltip</option>
+ <option value="25">Tree</option>
+ <option value="26">Virtual Earth</option>
+ </SELECT>
+ <input type="submit" value="Submit" />
+ </form>
+ </div>
</body>
</html>
-</f:view>
\ No newline at end of file
16 years, 8 months
JBoss Rich Faces SVN: r2614 - trunk/cdk/maven-cdk-plugin/src/main/resources/component.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-08-30 10:26:49 -0400 (Thu, 30 Aug 2007)
New Revision: 2614
Modified:
trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java
Log:
fixed incorrect COMPONENT_TYPE declaration. It MUST be public
Modified: trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java 2007-08-30 14:25:24 UTC (rev 2613)
+++ trunk/cdk/maven-cdk-plugin/src/main/resources/component/UIClass.java 2007-08-30 14:26:49 UTC (rev 2614)
@@ -12,8 +12,8 @@
*/
public abstract class UI${className} extends ${baseClassName} {
- private static final String COMPONENT_TYPE = "${prefix}.${className}";
+ public static final String COMPONENT_TYPE = "${prefix}.${className}";
- private static final String COMPONENT_FAMILY = "${prefix}.${className}";
+ public static final String COMPONENT_FAMILY = "${prefix}.${className}";
}
16 years, 8 months
JBoss Rich Faces SVN: r2613 - in trunk/ui/scrollableDataTable/src/main/javascript/ClientUI: layouts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-08-30 10:25:24 -0400 (Thu, 30 Aug 2007)
New Revision: 2613
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
Log:
RF-726
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-08-30 14:25:24 UTC (rev 2613)
@@ -231,7 +231,7 @@
this.scrollBox.setHeight(this.getHeight());
var scrollLeft = this.grid.getScrollOffset();
- var height = this.scrollBox.getViewportHeight();
+ var height = this.scrollBox.getHeight();
var fixH = this.grid.getFooter() ? this.grid.getFooter().getHeight() : 0;
if(fixH > height) fixH = 0;
@@ -241,8 +241,7 @@
this.contentBox.moveTo(frozenContentWidth, 0);
this.sizeBox.moveTo(0, 0);
this.sizeBox.setWidth(totalWidth);
- this.defaultRowHeight = this._calcDefaultRowHeight();
- this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
+ this.sizeBox.setHeight(this.templNormal.getElement().offsetHeight);
this.scrollBox.setWidth(this.getWidth()+1);
this.scrollBox.setHeight(this.getHeight()+1);
@@ -258,7 +257,7 @@
this.contentBox.setWidth(Math.max(this.getWidth(), totalWidth));
}
- height = this.scrollBox.getViewportHeight();
+ height = this.scrollBox.getHeight();
this.contentBox.setHeight(height - fixH);
this.frozenContentBox.setWidth(frozenContentWidth);
@@ -784,8 +783,8 @@
},
_calcDefaultRowHeight: function() {
- var templNormal = this.templNormal.getElement();
- return Math.ceil(templNormal.offsetHeight / templNormal.rows.length);
+ //var templNormal = this.templNormal.getElement();
+ return this.templNormal.getElement().rows[1].offsetTop;//Math.ceil(templNormal.offsetHeight / templNormal.rows.length);
}
});
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2007-08-30 14:25:24 UTC (rev 2613)
@@ -139,7 +139,7 @@
}
ClientUI.controls.grid.GridFooter.parentClass.method("updateLayout").call(this);
- var height = this.getViewportHeight();
+ var height = this.getHeight();
var totalWidth = this.grid.getColumnsTotalWidth();
var frozenContentWidth = this.grid.getColumnsFrozenWidth();
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2007-08-30 14:25:24 UTC (rev 2613)
@@ -236,7 +236,7 @@
this.frozenSubstrate = new ClientUI.common.box.Box(this.gridId + ":hs", this.getElement());
this.frozenSubstrate.getElement().name = this.getElement().id + "HRFrm";
- this.frozenSubstrate.setHeight(this.headerRow.getViewportHeight());
+ this.frozenSubstrate.setHeight(this.headerRow.getHeight());
return true;
},
@@ -302,7 +302,7 @@
return;
}
ClientUI.controls.grid.GridHeader.parentClass.method("updateLayout").call(this);
- var height = this.getViewportHeight();
+ var height = this.getHeight();
var totalWidth = this.grid.getColumnsTotalWidth();
var frozenContentWidth = this.grid.getColumnsFrozenWidth();
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js 2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/GridLayoutManager.js 2007-08-30 14:25:24 UTC (rev 2613)
@@ -38,7 +38,7 @@
var parentBox = this.getContainer();
if(parentBox==null) parentBox = this;
- var height = parentBox.getViewportHeight();
+ var height = parentBox.getHeight();
var width = parentBox.getViewportWidth();
// NOTE: not implemented in this class
@@ -62,7 +62,7 @@
body.setHeight(bodyHeight);
body.moveTo(0, headerHeight);
body.updateLayout();
- bodyBottom = body.getY() + body.contentBox.getY() + body.scrollBox.getViewportHeight();
+ bodyBottom = body.getY() + body.contentBox.getY() + body.scrollBox.getHeight();
}
if(this.panels[GridLayout_Enum.FOOTER]) {
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2007-08-30 14:23:56 UTC (rev 2612)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2007-08-30 14:25:24 UTC (rev 2613)
@@ -62,7 +62,7 @@
var parentBox = this.getContainer();
if(!parentBox) parentBox = this;
- var height = parentBox.getViewportHeight();
+ var height = parentBox.getHeight();
var width = parentBox.getViewportWidth();
if(ClientUILib.isGecko) {
width -= parentBox.getBorderWidth("lr") + parentBox.getPadding("lr");
16 years, 8 months
JBoss Rich Faces SVN: r2612 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkukharchuk
Date: 2007-08-30 10:23:56 -0400 (Thu, 30 Aug 2007)
New Revision: 2612
Modified:
trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
Log:
http://jira.jboss.com/jira/browse/RF-447
Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-08-30 14:14:05 UTC (rev 2611)
+++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2007-08-30 14:23:56 UTC (rev 2612)
@@ -109,7 +109,7 @@
</para>
<para>
- <emphasis role="bold">Those a the typical variants of using:</emphasis>
+ <emphasis role="bold">The typical variant of using:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
<rich:scrollableDataTable value="#{modelBuilder.model}" var="issues"
@@ -144,8 +144,14 @@
</itemizedlist>
</para>
- </section>
+ </section>
+ <section>
+ <title>Relevant resources links</title>
+ <para>
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/scrollableDataTable.j...">Here</ulink>
+ you can see the example of <emphasis role="bold"><rich:scrollableDataTable></emphasis> usage. </para>
+ </section>
<!--section>
<title>Details of Usage</title>
<para>The <property>table</property> component is very similar to the custom JSF dataTable one,
16 years, 8 months
JBoss Rich Faces SVN: r2611 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-08-30 10:14:05 -0400 (Thu, 30 Aug 2007)
New Revision: 2611
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
Log:
small gfix
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-08-30 13:59:06 UTC (rev 2610)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-08-30 14:14:05 UTC (rev 2611)
@@ -283,7 +283,7 @@
writer.startElement(HTML.TR_ELEMENT, grid);
state.setFrozenColumnCount(ScrollableDataTableUtils.getFrozenColumnsCount(grid));
getUtils().writeAttribute(writer, "id",row_id);
- getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row" + state.getRowClass(index));
+ getUtils().writeAttribute(writer, "class","dr-sdt-rb rich-sdt-row " + state.getRowClass(index));
addRowJavascriptEvents(writer, grid);
if (log.isDebugEnabled()) {
log.debug("rowIndex : " + index);
@@ -292,7 +292,7 @@
ColumnWalker.iterateOverColumns(context, grid, cellRenderer, writer, state);
if(!state.isFrozenPart()){
writer.startElement("td", grid);
- getUtils().writeAttribute(writer, "class","dr-sdt-bc rich-sdt-row" + state.getColumnClass(state.getCellIndex()));
+ getUtils().writeAttribute(writer, "class","dr-sdt-bc rich-sdt-row " + state.getColumnClass(state.getCellIndex()));
writer.endElement("td");
}
writer.endElement(HTML.TR_ELEMENT);
16 years, 8 months
JBoss Rich Faces SVN: r2610 - trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-08-30 09:59:06 -0400 (Thu, 30 Aug 2007)
New Revision: 2610
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
Log:
small fix
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-08-30 13:49:39 UTC (rev 2609)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2007-08-30 13:59:06 UTC (rev 2610)
@@ -455,6 +455,7 @@
}
state.setFake(false);
+ state.setRowIndex(0);
grid.setRowKey(null);
}
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-08-30 13:49:39 UTC (rev 2609)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableRendererState.java 2007-08-30 13:59:06 UTC (rev 2610)
@@ -229,9 +229,6 @@
* @return Returns the rowIndex.
*/
public int getRowIndex() {
- if((_grid.getRows() != 0 && _rowIndex >= _grid.getRows()) || _rowIndex >= _grid.getRowCount()){
- _rowIndex = 0;
- }
return _rowIndex;
}
16 years, 8 months
JBoss Rich Faces SVN: r2609 - in trunk: ui/calendar/src/main/java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-08-30 09:49:39 -0400 (Thu, 30 Aug 2007)
New Revision: 2609
Modified:
trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-725 fixed;
ondateselect, ondatemouseover, ondatemouseout, onexpand, oncollapse, oncurrentdatechange;
Modified: trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-30 13:47:25 UTC (rev 2608)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/Calendar.jsp 2007-08-30 13:49:39 UTC (rev 2609)
@@ -35,7 +35,6 @@
<br />
<br />
<calendar:calendar
- ondateselect=""
id="calendar"
data="#{calendarDataModel}"
locale="#{calendarBean.locale}"
Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-08-30 13:47:25 UTC (rev 2608)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-08-30 13:49:39 UTC (rev 2609)
@@ -152,7 +152,7 @@
UIComponent facet = component.getFacet(facetName);
if (facet != null && facet.isRendered()) {
ResponseWriter writer = context.getResponseWriter();
- writer.writeText(", " + facetName + MARKUP_SUFFIX + ": ", null);
+ writer.writeText(", " + facetName + MARKUP_SUFFIX + ": ", null);
writeMarkupScriptBody(context, facet, false);
}
}
@@ -203,6 +203,20 @@
writer.write(definition.toScript());
}
+ public void writeEventHandlerFunction(FacesContext context,
+ UIComponent component, String eventName) throws IOException {
+
+ ResponseWriter writer = context.getResponseWriter();
+ Object script = component.getAttributes().get(eventName);
+ if (script!=null && !script.equals(""))
+ {
+ JSFunctionDefinition onEventDefinition = new JSFunctionDefinition();
+ onEventDefinition.addParameter("event");
+ onEventDefinition.addToBody(script);
+ writer.writeText(",\n" + eventName + ": "+onEventDefinition.toScript(), null);
+ }
+ }
+
public String getInputValue(FacesContext context, UIComponent component) {
UICalendar input = (UICalendar) component;
// XXX nick - nick - can contain either Date or String instance
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-30 13:47:25 UTC (rev 2608)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-08-30 13:49:39 UTC (rev 2609)
@@ -545,64 +545,72 @@
this.stopPopupEvents($(this.id));
this.stopPopupEvents($(this.POPUP_ID));*/
- if (Richfaces.browser.isIE6) Element.hide(this.IFRAME_ID);
- Element.hide(this.id);
- this.isVisible = false;
+ var element = $(this.id);
+
+ if (this.invokeEvent("collapse", element))
+ {
+ if (Richfaces.browser.isIE6) Element.hide(this.IFRAME_ID);
+ Element.hide(element);
+ this.isVisible = false;
+ }
},
doExpand: function() {
if (!this.params.popup || this.isVisible) return;
- var base = $(this.POPUP_ID)
- var baseInput = base.firstChild;
- var baseButton = baseInput.nextSibling;
-
- if (baseInput && baseInput.value!=undefined)
- {
- this.selectDate(baseInput.value, true);
- }
+ var element = $(this.id);
- var e = $(this.id);
- var iframe = $(this.IFRAME_ID);
-
- var a = this;
- setTimeout(function () { Event.observe(window.document, "click", a.eventOnCollapse, false); }, 50);
-
- /*this.setPopupEvents(e);
- this.setPopupEvents(base);*/
-
- //rect calculation
- var offsetBase1 = Position.cumulativeOffset(baseInput);
- var offsetBase2 = Position.cumulativeOffset(baseButton);
- var els = e.style;
-
- var offsetBase = [offsetBase1[0]<offsetBase2[0] ? offsetBase1[0] : offsetBase2[0],
- offsetBase1[1]<offsetBase2[1] ? offsetBase1[1] : offsetBase2[1]];
-
- var offsetDimBase = Richfaces.Calendar.getOffsetDimensions(base);
- var offsetDimButton = Richfaces.Calendar.getOffsetDimensions(baseButton);
- var offsetDimInput = Richfaces.Calendar.getOffsetDimensions(baseInput);
- var o = {left: offsetBase[0],
- top: offsetBase[1],
- width: offsetDimBase.width,
- height: (offsetDimButton.height>offsetDimInput.height ? offsetDimButton.height : offsetDimInput.height)};
-
- Richfaces.Calendar.setElementPosition(e, o, this.params.jointPoint, this.params.direction);
-
- if (Richfaces.browser.isIE6)
+ if (this.invokeEvent("expand", element))
{
- iframe.style.left = e.style.left;
- iframe.style.top = e.style.top;
- var edim = Richfaces.Calendar.getOffsetDimensions(e);
- iframe.style.width = edim.width+'px';
- iframe.style.height = edim.height+'px';
- Element.show(iframe);
+ var base = $(this.POPUP_ID)
+ var baseInput = base.firstChild;
+ var baseButton = baseInput.nextSibling;
+
+ if (baseInput && baseInput.value!=undefined)
+ {
+ this.selectDate(baseInput.value, true);
+ }
+
+ var iframe = $(this.IFRAME_ID);
+
+ var a = this;
+ setTimeout(function () { Event.observe(window.document, "click", a.eventOnCollapse, false); }, 50);
+
+ /*this.setPopupEvents(e);
+ this.setPopupEvents(base);*/
+
+ //rect calculation
+ var offsetBase1 = Position.cumulativeOffset(baseInput);
+ var offsetBase2 = Position.cumulativeOffset(baseButton);
+ var els = element.style;
+
+ var offsetBase = [offsetBase1[0]<offsetBase2[0] ? offsetBase1[0] : offsetBase2[0],
+ offsetBase1[1]<offsetBase2[1] ? offsetBase1[1] : offsetBase2[1]];
+
+ var offsetDimBase = Richfaces.Calendar.getOffsetDimensions(base);
+ var offsetDimButton = Richfaces.Calendar.getOffsetDimensions(baseButton);
+ var offsetDimInput = Richfaces.Calendar.getOffsetDimensions(baseInput);
+ var o = {left: offsetBase[0],
+ top: offsetBase[1],
+ width: offsetDimBase.width,
+ height: (offsetDimButton.height>offsetDimInput.height ? offsetDimButton.height : offsetDimInput.height)};
+
+ Richfaces.Calendar.setElementPosition(element, o, this.params.jointPoint, this.params.direction);
+
+ if (Richfaces.browser.isIE6)
+ {
+ iframe.style.left = element.style.left;
+ iframe.style.top = element.style.top;
+ var edim = Richfaces.Calendar.getOffsetDimensions(element);
+ iframe.style.width = edim.width+'px';
+ iframe.style.height = edim.height+'px';
+ Element.show(iframe);
+ }
+
+ Element.show(element);
+
+ this.isVisible = true;
}
-
- Element.show(e);
-
- this.isVisible = true;
-
},
doSwitch: function() {
@@ -726,14 +734,12 @@
Event.stopObserving(obj, "mouseout", this.eventCellOnMouseOut, false);
},
- invokeEvent: function(eventName, event, date) {
- var eventScript = this.params['on'+eventName];
+ invokeEvent: function(eventName, element, event, date) {
+ var eventFunction = this.params['on'+eventName];
var result = true;
- if (eventScript)
+ if (eventFunction)
{
- var props = {};
- if (date) props.date = date;
var eventObj;
if (event)
@@ -746,15 +752,16 @@
}
else if( document.createEvent )
{
- eventObj = document.createEvent();
- eventObj.initEvent( e, true, false );
+ eventObj = document.createEvent('Events');
+ eventObj.initEvent( eventName, true, false );
}
- Object.extend(eventObj, props);
+ eventObj.rich = {component:this};
+ if (date) eventObj.rich.date = date;
try
{
- result = new Function("event", eventScript).call(this, eventObj);
+ result = eventFunction.call(element, eventObj);
}
catch (e) { LOG.warn("Exception: "+e.Message + "\n[on"+eventName + "]"); }
@@ -771,9 +778,9 @@
if (daydata._month==0)
{
var date=new Date(this.currentDate);
- date.setDate(obj.data);
+ date.setDate(daydata.day);
- if (this.invokeEvent("dateselect", e, date))
+ if (this.invokeEvent("dateselect", obj, e, date))
{
this.selectedDate=date;
if (this.selectedDateElement) Element.removeClassName(this.selectedDateElement, "rich-calendar-select");
@@ -794,7 +801,7 @@
else if (this.params.boundaryDatesMode == "select")
{
var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
- if (this.invokeEvent("dateselect", e, date))
+ if (this.invokeEvent("dateselect", obj, e, date))
{
this.selectDate(date, true);
$(this.INPUT_DATE_ID).value=this.getSelectedDateString(this.params.datePattern);
@@ -811,7 +818,11 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- if (daydata._month==0) Element.addClassName(obj,'rich-calendar-hover');
+ var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
+ if (this.invokeEvent("datemouseover", obj, e, date))
+ {
+ if (daydata._month==0) Element.addClassName(obj,'rich-calendar-hover');
+ }
}
},
@@ -820,7 +831,11 @@
if (obj)
{
var daydata = this.days[parseInt(obj.id.substr(this.DATE_ELEMENT_ID.length),10)];
- if (daydata._month==0) Element.removeClassName(obj,'rich-calendar-hover');
+ var date = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+daydata._month, daydata.day);
+ if (this.invokeEvent("datemouseout", obj, e, date))
+ {
+ if (daydata._month==0) Element.removeClassName(obj,'rich-calendar-hover');
+ }
}
},
@@ -1001,7 +1016,6 @@
// TODO fix start/stop event's calls
this.stopCellEvents(element);
- element.data=dataobj.day;
dataobj.componentId=this.getDateComponentId(p);
element.innerHTML = this.evaluateMarkup(this.params.dayListMarkup, dataobj );
@@ -1088,25 +1102,30 @@
},
nextMonth: function() {
- this.currentDate = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()+1,1);
- this.onUpdate();
+ this.changeCurrentDate(0,1);
},
prevMonth: function() {
- this.currentDate = new Date(this.currentDate.getFullYear(), this.currentDate.getMonth()-1,1);
- this.onUpdate();
+ this.changeCurrentDate(0,-1);
},
nextYear: function() {
- this.currentDate = new Date(this.currentDate.getFullYear() + 1, this.currentDate.getMonth(),1);
- this.onUpdate();
+ this.changeCurrentDate(1,0);
},
prevYear: function() {
- this.currentDate = new Date(this.currentDate.getFullYear() - 1, this.currentDate.getMonth(),1);
- this.onUpdate();
+ this.changeCurrentDate(-1,0);
},
+ changeCurrentDate: function(yearOffset, monthOffset) {
+ var date = new Date(this.currentDate.getFullYear()+yearOffset, this.currentDate.getMonth()+monthOffset,1);
+ if (this.invokeEvent("currentdatechange", $(this.id), null, date))
+ {
+ this.currentDate = date;
+ this.onUpdate();
+ }
+ },
+
today: function(noUpdate) {
var now = new Date();
var nowyear = now.getFullYear();
Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-30 13:47:25 UTC (rev 2608)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-08-30 13:49:39 UTC (rev 2609)
@@ -37,9 +37,15 @@
disabled: #{component.disabled},
<f:call name="writeSymbols" />,
firstWeekDay: #{this:getFirstWeekDay(context, component)},
- minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)},
- ondateselect: "#{component.attributes['ondateselect']}"
+ minDaysInFirstWeek: #{this:getMinDaysInFirstWeek(context, component)}
+ <f:call name="writeEventHandlerFunction"><f:parameter value="ondateselect" /></f:call>
+ <f:call name="writeEventHandlerFunction"><f:parameter value="ondatemouseover" /></f:call>
+ <f:call name="writeEventHandlerFunction"><f:parameter value="ondatemouseout" /></f:call>
+ <f:call name="writeEventHandlerFunction"><f:parameter value="onexpand" /></f:call>
+ <f:call name="writeEventHandlerFunction"><f:parameter value="oncollapse" /></f:call>
+ <f:call name="writeEventHandlerFunction"><f:parameter value="oncurrentdatechange" /></f:call>
+
<jsp:scriptlet> /*<![CDATA[*/
if (component.getFacet("optionalHeader")!= null&& component.getFacet("optionalHeader").isRendered()){
/*]]>*/ </jsp:scriptlet>
16 years, 8 months
JBoss Rich Faces SVN: r2608 - trunk/ui/simpleTogglePanel/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-08-30 09:47:25 -0400 (Thu, 30 Aug 2007)
New Revision: 2608
Modified:
trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
Log:
fix RF-763
Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-08-30 13:24:36 UTC (rev 2607)
+++ trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-08-30 13:47:25 UTC (rev 2608)
@@ -31,47 +31,48 @@
<f:call name="utils.encodeBeginFormIfNessesary"/>
<div id="#{clientId}_header"
class="dr-stglpnl-h rich-stglpanel-header #{component.attributes['headerClass']}"
- style="float: right;"
onclick="#{this:getOnClick(context,component)}">
-
+
+ <div style="float: right">
+ <div id="#{clientId}_switch_on" style="padding-right: 15px; display: #{this:getSwitchOnStatus(context, component)};">
+ <jsp:scriptlet><![CDATA[
+ if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) {
+ ]]></jsp:scriptlet>
+ <u:insertFacet name="closeMarker" />
+ <jsp:scriptlet><![CDATA[
+ } else {
+ writer.write("«");
+ }
+ ]]></jsp:scriptlet>
+ </div>
+ <div id="#{clientId}_switch_off"
+ style="padding-right: 15px; display: #{this:getSwitchOffStatus(context, component)};">
+ <jsp:scriptlet><![CDATA[
+ if(component.getFacet("openMarker")!=null && component.getFacet("openMarker").isRendered()) {
+ ]]></jsp:scriptlet>
+ <u:insertFacet name="openMarker" />
+ <jsp:scriptlet><![CDATA[
+ } else {
+ writer.write("»");
+ }
+ ]]></jsp:scriptlet>
+ </div>
+ </div>
+
<jsp:scriptlet><![CDATA[
- if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {
- ]]></jsp:scriptlet>
- <u:insertFacet name="header" />
- <jsp:scriptlet><![CDATA[
- } else {
- ]]></jsp:scriptlet>
- #{component.attributes['label']}
- <jsp:scriptlet><![CDATA[
- writer.write(" ");
- }
- ]]></jsp:scriptlet>
-
- <div id="#{clientId}_switch_on"
- style="padding-right: 15px; display: #{this:getSwitchOnStatus(context, component)};">
- <jsp:scriptlet><![CDATA[
- if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) {
- ]]></jsp:scriptlet>
- <u:insertFacet name="closeMarker" />
- <jsp:scriptlet><![CDATA[
- } else {
- writer.write("«");
- }
- ]]></jsp:scriptlet>
- </div>
- <div id="#{clientId}_switch_off"
- style="padding-right: 15px; display: #{this:getSwitchOffStatus(context, component)};">
- <jsp:scriptlet><![CDATA[
- if(component.getFacet("openMarker")!=null && component.getFacet("openMarker").isRendered()) {
- ]]></jsp:scriptlet>
- <u:insertFacet name="openMarker" />
- <jsp:scriptlet><![CDATA[
- } else {
- writer.write("»");
- }
- ]]></jsp:scriptlet>
- </div>
+ if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {
+ ]]></jsp:scriptlet>
+ <u:insertFacet name="header" />
+ <jsp:scriptlet><![CDATA[
+ } else {
+ ]]></jsp:scriptlet>
+ #{component.attributes['label']}
+ <jsp:scriptlet><![CDATA[
+ writer.write(" ");
+ }
+ ]]></jsp:scriptlet>
</div>
+
<jsp:scriptlet>
<![CDATA[if((component.getSwitchType()!=null) && (component.getSwitchType().equals(component.CLIENT_SWITCH_TYPE)==true)){]]>
</jsp:scriptlet>
16 years, 8 months