JBoss Rich Faces SVN: r7127 - trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-24 13:06:37 -0400 (Mon, 24 Mar 2008)
New Revision: 7127
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/usage.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-398
- Language correction
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/inplaceSelect/usage.xhtml 2008-03-24 17:06:37 UTC (rev 7127)
@@ -8,17 +8,16 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
- <p>
- <b>Inplace Select</b>is a simple input component which displays current value as
- <i>outputText </i>and switches to <i>Select </i>based representation after defined event
- to allow edit this value.
- </p>
-
- <p>
- You could try simplest example below. Just click on label
- to edit the value and
- click somewhere outside the component to store this value(Or just press ENTER button).
- </p>
+ <p>
+ <b>Inplace Select</b>is a simple input component which displays current value as
+ <i>outputText </i>and switches to <i>Select </i>based representation after a defined event
+ to allow editing this value.
+ </p>
+
+ <p>
+ You could try the simplest example below. Just click on a label
+ to edit the value and click somewhere outside the component to store this value(Or just press ENTER button).
+ </p>
<div class="sample-container" >
<ui:include src="/richfaces/inplaceSelect/examples/simple.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
@@ -26,36 +25,36 @@
</ui:include>
</div>
<p>
- In this example <i>f:selectItems</i> tag used to define list of items to be used.
- Additionally next usefull attributes used:
- </p>
- <ul>
- <li>Controls "save" and "cancel" turned on with <b>showControls</b> attribute</li>
- <li><b>editEvent</b> set as <i>ondblclick</i>. <u>So you should click twice to edit value</u> </li>
- <li><b>Layout</b> attribute defined as <b>block</b> and inplace rendered as <i>div</i> element instead of<i> span </i></li>
-
- <li>
- <b>openOnEdit</b> with true value defines that select popup list will be opened
- automatically after edit state activated.
- </li>
- <li> Classes customization used</li>
+ In this example <i>f:selectItems</i> tag is used to define a list of items to use.
+ Additionally the next useful attributes are used:
+ </p>
+ <ul>
+ <li>Controls "save" and "cancel" are turned on with <b>showControls</b> attribute</li>
+ <li><b>editEvent</b> set as <i>ondblclick</i>. <u>So you should click twice to edit a value</u> </li>
+ <li><b>Layout</b> attribute is defined as <b>block</b> and inplace is rendered as <i>div</i> an element instead of<i> span </i></li>
+
+ <li>
+ <b>openOnEdit</b> with true value defines that a select popup list will be opened
+ automatically after edit state is activated.
+ </li>
+ <li> Classes customization is used</li>
</ul>
<div class="sample-container" >
<ui:include src="/richfaces/inplaceSelect/examples/selectItems.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/inplaceSelect/examples/selectItems.xhtml"/>
</ui:include>
- </div>
- <p>
- Ant the last example shows simplest value saving through Ajax request and
- controls customization using <b>controls</b> facet
+ </div>
+ <p>
+ And the last example shows how to save the simplest value via Ajax request and
+ how customize controls using <b>controls</b> facet.
</p>
- <div class="sample-container" >
- <ui:include src="/richfaces/inplaceSelect/examples/controlsCustomization.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/inplaceSelect/examples/controlsCustomization.xhtml"/>
- </ui:include>
- </div>
+ <div class="sample-container" >
+ <ui:include src="/richfaces/inplaceSelect/examples/controlsCustomization.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/inplaceSelect/examples/controlsCustomization.xhtml"/>
+ </ui:include>
+ </div>
</ui:define>
</ui:composition>
16 years, 9 months
JBoss Rich Faces SVN: r7126 - in trunk/samples/richfaces-demo/src/main/webapp: richfaces/dropDownMenu and 7 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-24 13:00:52 -0400 (Mon, 24 Mar 2008)
New Revision: 7126
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/example/menu.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml
Log:
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/example/menu.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/example/menu.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/example/menu.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -18,7 +18,7 @@
<h:panelGrid columns="1" columnClasses="cent">
<h:panelGroup id="picture">
- <h:graphicImage value="/richfaces/jQuery/images/pic1.jpg" id="pic"/>
+ <h:graphicImage value="/richfaces/jQuery/images/pic1.jpg" id="pic" style="border : 5px solid #E4EAEF"/>
<rich:contextMenu event="oncontextmenu" attached="true" submitMode="none">
<rich:menuItem value="Zoom In" onclick="enlarge();" id="zin"></rich:menuItem>
<rich:menuItem value="Zoom Out" onclick="decrease();" id="zout"></rich:menuItem>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/dropDownMenu/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -18,7 +18,6 @@
<div class="sample-container">
<ui:include src="/richfaces/dropDownMenu/examples/topmenu.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/dropDownMenu/examples/topmenu.xhtml"/>
</ui:include>
@@ -40,7 +39,6 @@
You can place a block of drop down menus horizontally or vertially how it is shown below. <br/><br/>
<ui:include src="/richfaces/dropDownMenu/examples/sidemenu.xhtml"/>
<br/><img src="images/spacer.gif" width="1" height="25" alt="" border="0"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/dropDownMenu/examples/sidemenu.xhtml"/>
</ui:include>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/modalPanel/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -19,7 +19,6 @@
<a href="javascript:Richfaces.showModalPanel('mp',{width:450, top:200})">
Richfaces.showModalPanel('mp',{width:450, top:200})</a><br/><br/>
<ui:include src="/richfaces/modalPanel/examples/simplePanel.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/modalPanel/examples/simplePanel.xhtml"/>
<ui:param name="openlabel" value="View Page Source" />
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel/usage.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panel/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -34,21 +34,19 @@
<div class="sample-container" >
<ui:include src="/richfaces/panel/examples/simplePanel.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/panel/examples/simplePanel.xhtml"/>
</ui:include>
</div>
</fieldset>
-
+
<fieldset class="demo_fieldset">
<legend class="demo_legend">Panel without header</legend>
<div class="sample-container" >
<ui:include src="/richfaces/panel/examples/headlessPanel.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/panel/examples/headlessPanel.xhtml"/>
</ui:include>
@@ -62,7 +60,6 @@
The panels can be nested:
<br/><br/>
<ui:include src="/richfaces/panel/examples/nestedPanels.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/panel/examples/nestedPanels.xhtml"/>
</ui:include>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/usage.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -16,9 +16,7 @@
<fieldset class="demo_fieldset">
<legend class="demo_legend">Panel Bar demo</legend>
<div class="sample-container" >
-
<ui:include src="/richfaces/panelBar/examples/example.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/panelBar/examples/example.xhtml"/>
</ui:include>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/usage.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/spacer/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -14,7 +14,6 @@
<legend class="demo_legend">Spacer example</legend>
<div class="sample-container">
<ui:include src="/richfaces/spacer/examples/spacers.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/spacer/examples/spacers.xhtml"/>
</ui:include>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -21,7 +21,6 @@
<legend class="demo_legend">Ajax switch type</legend>
<div class="sample-container">
<ui:include src="/richfaces/tree/examples/ajaxTree.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/tree/examples/ajaxTree.xhtml"/>
</ui:include>
@@ -32,7 +31,6 @@
<div class="sample-container" >
<ui:include src="/richfaces/tree/examples/clientTree.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/tree/examples/clientTree.xhtml"/>
</ui:include>
@@ -42,7 +40,6 @@
<legend class="demo_legend">Server switch type</legend>
<div class="sample-container" >
<ui:include src="/richfaces/tree/examples/serverTree.xhtml"/>
- <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/tree/examples/serverTree.xhtml"/>
</ui:include>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -26,29 +26,25 @@
<h:panelGroup rendered="#{not empty fileSystemBean.sourceRoots}">
<div class="sample-container" >
<ui:include src="/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml"/>
- <br/><br/><br/><br/>
+ <br/><br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml"/>
</ui:include>
- <br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/FileSystemBean.java"/>
<ui:param name="openlabel" value="View FileSystemBean.java Source" />
<ui:param name="sourcetype" value="java" />
</ui:include>
- <br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/FileSystemNode.java"/>
<ui:param name="openlabel" value="View FileSystemNode.java Source" />
<ui:param name="sourcetype" value="java" />
</ui:include>
- <br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/PostbackPhaseListener.java"/>
<ui:param name="openlabel" value="View PostbackPhaseListener.java Source" />
<ui:param name="sourcetype" value="java" />
</ui:include>
- <br/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java"/>
<ui:param name="openlabel" value="View TreeDemoStateAdvisor.java Source" />
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml 2008-03-24 16:58:03 UTC (rev 7125)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/sourceview.xhtml 2008-03-24 17:00:52 UTC (rev 7126)
@@ -6,6 +6,7 @@
xmlns:rich="http://richfaces.org/rich">
<ui:composition>
+ <br/><br/>
<script>
//<![CDATA[
Effect.Transitions.exponential = function(pos) {
16 years, 9 months
JBoss Rich Faces SVN: r7125 - trunk/ui/suggestionbox/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-03-24 12:58:03 -0400 (Mon, 24 Mar 2008)
New Revision: 7125
Modified:
trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml
Log:
http://jira.jboss.com/jira/browse/RF-2576
attribute desc is corrected
Modified: trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml
===================================================================
--- trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2008-03-24 16:35:06 UTC (rev 7124)
+++ trunk/ui/suggestionbox/src/main/config/component/suggestionbox.xml 2008-03-24 16:58:03 UTC (rev 7125)
@@ -91,7 +91,7 @@
<name>usingSuggestObjects</name>
<classname>boolean</classname>
<description>
- if true suggested object list will be created and witt be updated every time when user changes input value
+ if true, a suggested object list will be created and will be updated every time when an input value is changed
</description>
<defaultvalue>false</defaultvalue>
</property>
@@ -124,7 +124,7 @@
<classname>java.lang.String</classname>
<description>
A comma-delimited list of CSS style classes that is applied to popup table rows. A space separated list of classes may also be specified for any individual row. The styles are applied, in turn, to each row in the table. For example, if the list has two elements, the first style class in the list is applied to the first row, the second to the second row, the first to the third row, the second to the fourth row, etc. In other words, we keep iterating through the list until we reach the end, and then we start at the beginning again
- </description>
+ </description>
<defaultvalue>""</defaultvalue>
</property>
@@ -201,7 +201,7 @@
<description>
HTML CSS class attribute of element for pop-up
suggestion content
- </description>
+ </description>
<defaultvalue>""</defaultvalue>
</property>
<property>
@@ -210,26 +210,26 @@
<description>
HTML CSS style attribute of element for pop-up
suggestion content
- </description>
+ </description>
<defaultvalue>""</defaultvalue>
- </property>
- <property>
- <name>style</name>
- <classname>java.lang.String</classname>
- <description>
- CSS style(s) is/are to be applied when this component is rendered
- </description>
- <defaultvalue>""</defaultvalue>
- </property>
- <property>
- <name>styleClass</name>
- <classname>java.lang.String</classname>
- <description>
- Corresponds to the HTML class attribute
- </description>
- <defaultvalue>""</defaultvalue>
</property>
<property>
+ <name>style</name>
+ <classname>java.lang.String</classname>
+ <description>
+ CSS style(s) is/are to be applied when this component is rendered
+ </description>
+ <defaultvalue>""</defaultvalue>
+ </property>
+ <property>
+ <name>styleClass</name>
+ <classname>java.lang.String</classname>
+ <description>
+ Corresponds to the HTML class attribute
+ </description>
+ <defaultvalue>""</defaultvalue>
+ </property>
+ <property>
<name>frequency</name>
<classname>double</classname>
<description>
@@ -356,22 +356,22 @@
</property>
<property hidden="true">
<name>rows</name>
- </property>
- <property>
- <name>nothingLabel</name>
- <classname>java.lang.String</classname>
- <description>
- "nothingLabel" is inserted to popup list if the autocomplete returns empty list.
- It isn't selectable and list is closed as always after click on it and nothing is put to input.
- </description>
- </property>
- <property elonly="true" hidden="true" existintag="false" exist="false" >
- <name>data</name>
- <classname>java.lang.Object</classname>
- </property>
- <property elonly="true" hidden="true" existintag="false" exist="false" >
- <name>rowNumber</name>
- <classname>java.lang.Object</classname>
+ </property>
+ <property>
+ <name>nothingLabel</name>
+ <classname>java.lang.String</classname>
+ <description>
+ "nothingLabel" is inserted to popup list if the autocomplete returns empty list.
+ It isn't selectable and list is closed as always after click on it and nothing is put to input.
+ </description>
+ </property>
+ <property elonly="true" hidden="true" existintag="false" exist="false" >
+ <name>data</name>
+ <classname>java.lang.Object</classname>
</property>
+ <property elonly="true" hidden="true" existintag="false" exist="false" >
+ <name>rowNumber</name>
+ <classname>java.lang.Object</classname>
+ </property>
</component>
</components>
16 years, 9 months
JBoss Rich Faces SVN: r7124 - trunk/framework/impl/src/main/java/org/richfaces/component/util.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-24 12:35:06 -0400 (Mon, 24 Mar 2008)
New Revision: 7124
Modified:
trunk/framework/impl/src/main/java/org/richfaces/component/util/ColumnUtil.java
Log:
http://jira.jboss.com/jira/browse/RF-2293
Modified: trunk/framework/impl/src/main/java/org/richfaces/component/util/ColumnUtil.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/component/util/ColumnUtil.java 2008-03-24 16:35:01 UTC (rev 7123)
+++ trunk/framework/impl/src/main/java/org/richfaces/component/util/ColumnUtil.java 2008-03-24 16:35:06 UTC (rev 7124)
@@ -21,8 +21,8 @@
package org.richfaces.component.util;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
-import javax.faces.el.ValueBinding;
import org.richfaces.component.Column;
@@ -42,24 +42,35 @@
* If attribute is not set, fall aback to component id
*/
- public static String getColumnSorting(Column column) {
+ public static String getColumnSorting(UIComponent column) {
UIComponent component = (UIComponent) column;
- ValueBinding binding = component.getValueBinding("sortExpression");
+ ValueExpression binding = component.getValueExpression("sortExpression");
if (binding != null) {
return binding.getExpressionString();
}
- String sorting = column.getSortExpression();
-
- if (sorting != null) {
- return sorting;
+ if (component instanceof Column) {
+ Column col = (Column) component;
+ String sorting = col.getSortExpression();
+
+ if (sorting != null) {
+ return sorting;
+ }
}
return component.getId();
}
+
+ public static boolean isSortable(UIComponent component) {
+ if (component instanceof Column) {
+ return ((Column) component).isSortable();
+ }
+ return Boolean.valueOf(String.valueOf(component.getAttributes().get("sortable")));
+ }
+
}
16 years, 9 months
JBoss Rich Faces SVN: r7123 - in trunk/ui/scrollableDataTable/src/main: java/org/richfaces/renderkit/html and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-24 12:35:01 -0400 (Mon, 24 Mar 2008)
New Revision: 7123
Modified:
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java
trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java
trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
Log:
http://jira.jboss.com/jira/browse/RF-2293
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2008-03-24 16:34:52 UTC (rev 7122)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/MultiColumnSortListener.java 2008-03-24 16:35:01 UTC (rev 7123)
@@ -8,9 +8,9 @@
import java.util.LinkedList;
import java.util.List;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import org.richfaces.component.Column;
import org.richfaces.component.UIScrollableDataTable;
import org.richfaces.component.util.ColumnUtil;
import org.richfaces.model.SortField;
@@ -35,8 +35,8 @@
UIScrollableDataTable grid = (UIScrollableDataTable) e.getComponent();
int columnIndex = e.getSortColumn();
- Column column =
- (Column) grid.getChildren().get(columnIndex);
+ UIComponent column =
+ grid.getChildren().get(columnIndex);
String name = ColumnUtil.getColumnSorting(column);
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2008-03-24 16:34:52 UTC (rev 7122)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/event/sort/SingleColumnSortListener.java 2008-03-24 16:35:01 UTC (rev 7123)
@@ -3,9 +3,9 @@
*/
package org.richfaces.event.sort;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import org.richfaces.component.Column;
import org.richfaces.component.UIScrollableDataTable;
import org.richfaces.component.util.ColumnUtil;
import org.richfaces.model.SortField;
@@ -28,8 +28,8 @@
public void processSort(SortEvent e) {
UIScrollableDataTable grid = (UIScrollableDataTable) e.getComponent();
int columnIndex = e.getSortColumn();
- Column column =
- (Column) grid.getChildren().get(columnIndex);
+ UIComponent column =
+ grid.getChildren().get(columnIndex);
String name = ColumnUtil.getColumnSorting(column);
Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java
===================================================================
--- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java 2008-03-24 16:34:52 UTC (rev 7122)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ColumnWalker.java 2008-03-24 16:35:01 UTC (rev 7123)
@@ -6,6 +6,7 @@
import java.io.IOException;
import java.util.Iterator;
+import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -38,7 +39,7 @@
for (Iterator<UIComponent> iter = component.getChildren().iterator(); iter.hasNext(); ) {
UIComponent kid = (UIComponent) iter.next();
if (kid.isRendered()) {
- if (kid instanceof Column){
+ if (kid instanceof Column || kid instanceof UIColumn){
columnsCount += visitor.visit(context, kid, writer, state);
state.nextCell();
}
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 2008-03-24 16:34:52 UTC (rev 7122)
+++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/ScrollableDataTableBaseRenderer.java 2008-03-24 16:35:01 UTC (rev 7123)
@@ -6,6 +6,7 @@
import java.util.Map;
import javax.faces.FacesException;
+import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
@@ -21,7 +22,6 @@
import org.ajax4jsf.renderkit.RendererUtils.HTML;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.richfaces.component.Column;
import org.richfaces.component.UIScrollableDataTable;
import org.richfaces.component.util.ColumnUtil;
import org.richfaces.event.scroll.ScrollEvent;
@@ -334,7 +334,7 @@
if (kid.isRendered()) {
- if (kid instanceof Column){
+ if (kid instanceof UIColumn){
if(state.isFrozenColumn() && !frozenTRRendered && state.getFrozenColumnCount() > 0){
state.setFrozenPart(true);
@@ -642,9 +642,9 @@
}
- Column column = (Column)grid.getChildren().get(sortColumn);
+ UIComponent column = (UIComponent)grid.getChildren().get(sortColumn);
- if(column.isSortable()){
+ if(ColumnUtil.isSortable(column)){
sorted = true;
SortEvent sortEvent = new SortEvent(grid,sortColumn, grid.getRows(), sortDataIndex);
@@ -933,8 +933,8 @@
Boolean sorting = null;
- Column column =
- (Column) grid.getChildren().get(columnIndex);
+ UIComponent column =
+ grid.getChildren().get(columnIndex);
String name = ColumnUtil.getColumnSorting(column);
Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx
===================================================================
--- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2008-03-24 16:34:52 UTC (rev 7122)
+++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table-header-cell.jspx 2008-03-24 16:35:01 UTC (rev 7123)
@@ -16,7 +16,7 @@
<jsp:scriptlet>
- if(Boolean.TRUE.equals(component.getAttributes().get("sortable"))) {
+ if(org.richfaces.component.util.ColumnUtil.isSortable(component)) {
getUtils().writeAttribute(writer, "style", "cursor:pointer" );
}
16 years, 9 months
JBoss Rich Faces SVN: r7122 - in trunk/ui/dataTable/src: test/java/org/richfaces/util and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2008-03-24 12:34:52 -0400 (Mon, 24 Mar 2008)
New Revision: 7122
Removed:
trunk/ui/dataTable/src/main/java/org/richfaces/util/
trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java
Log:
http://jira.jboss.com/jira/browse/RF-2293
Deleted: trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java
===================================================================
--- trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java 2008-03-24 15:42:42 UTC (rev 7121)
+++ trunk/ui/dataTable/src/test/java/org/richfaces/util/ColumnUtilTest.java 2008-03-24 16:34:52 UTC (rev 7122)
@@ -1,74 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces 3.0 - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.util;
-
-import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.richfaces.component.UIColumn;
-
-/**
- * @author Maksim Kaszynski
- *
- */
-public class ColumnUtilTest extends AbstractAjax4JsfTestCase {
-
- private UIColumn column;
-
- public ColumnUtilTest(String name) {
- super(name);
- }
-
- public void setUp() throws Exception {
- super.setUp();
- column = (UIColumn) application.createComponent(UIColumn.COMPONENT_TYPE);
- }
-
- public void tearDown() throws Exception {
- column = null;
- super.tearDown();
- }
-
- /**
- * Test method for {@link org.richfaces.util.ColumnUtil#getColumnSorting(org.richfaces.component.UIColumn)}.
- */
- public void testGetColumnSorting() {
- String id = "aaa";
- column.setId(id);
- String expression = "#{aaaaaa.aaa}";
- String literal = "zzzzz";
-
- assertEquals(id, ColumnUtil.getColumnSorting(column));
-
- column.setValueBinding("sortExpression", application.createValueBinding(expression));
-
-// /externalContext.getRequestMap().put("aaaaaa", Collections.singletonMap("aaa", "000"));
-
- assertEquals(expression, ColumnUtil.getColumnSorting(column));
- column.setValueBinding("sortExpression", null);
-
- column.setSortExpression(literal);
-
- assertEquals(literal, ColumnUtil.getColumnSorting(column));
-
-
- }
-
-}
16 years, 9 months
JBoss Rich Faces SVN: r7121 - trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-03-24 11:42:42 -0400 (Mon, 24 Mar 2008)
New Revision: 7121
Modified:
trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
Log:
resolve defauklt skin css styles conflicts
Modified: trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss
===================================================================
--- trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-03-24 15:35:43 UTC (rev 7120)
+++ trunk/ui/inplaceSelect/src/main/resources/org/richfaces/renderkit/html/css/inplaceselect.xcss 2008-03-24 15:42:42 UTC (rev 7121)
@@ -48,6 +48,18 @@
/*position : relative;*/
}
+input.rich-inplace-select-field {
+ padding : 0px 0px 0px 0px;
+ border-width: 1px;
+ border-style: inset;
+ margin : 0px;
+ font: inherit;
+ position:absolute;
+ top:0px;
+ left:0px;
+ background-image: url();
+}
+
.rich-inplace-select-field {
padding : 0px 0px 0px 0px;
border-width: 1px;
@@ -180,11 +192,16 @@
<u:style name="border-bottom-color" skin="generaTextColor"/>
</u:selector>
+ <u:selector name="input.rich-inplace-select-field">
+ <u:style name="background-color" skin="editBackgroundColor"/>
+ <u:style name="border-color" skin="panelBorderColor"/>
+ </u:selector>
+
<u:selector name=".rich-inplace-select-field">
<u:style name="background-color" skin="editBackgroundColor"/>
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
-
+
<u:selector name=".rich-inplace-select-control">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonGradient"/>
@@ -234,7 +251,7 @@
</u:style>
</u:selector>
- <u:selector name=".rich-inplace-select-arrow">
+ <u:selector name="input.rich-inplace-select-arrow">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.SpinnerButtonDown"/>
</u:style>
16 years, 9 months
JBoss Rich Faces SVN: r7120 - in trunk/ui/dataTable/src/main: java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-03-24 11:35:43 -0400 (Mon, 24 Mar 2008)
New Revision: 7120
Modified:
trunk/ui/dataTable/src/main/config/component/columnAttributes.ent
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
RF-2497
Modified: trunk/ui/dataTable/src/main/config/component/columnAttributes.ent
===================================================================
--- trunk/ui/dataTable/src/main/config/component/columnAttributes.ent 2008-03-24 15:16:10 UTC (rev 7119)
+++ trunk/ui/dataTable/src/main/config/component/columnAttributes.ent 2008-03-24 15:35:43 UTC (rev 7120)
@@ -105,9 +105,3 @@
<description>Event for filter input that forces the filtration (default = onchange)</description>
<defaultvalue>"onchange"</defaultvalue>
</property>
-<property>
- <name>filterDefaultLabel</name>
- <classname>java.lang.String</classname>
- <description></description>
- <defaultvalue><![CDATA[""]]></defaultvalue>
-</property>
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-03-24 15:16:10 UTC (rev 7119)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-03-24 15:35:43 UTC (rev 7120)
@@ -498,35 +498,19 @@
String buffer) throws IOException {
UIInput filterValueInput = (UIInput) column
.getFacet(FILTER_INPUT_FACET_NAME);
- boolean inplaceInput = true;
if (null == filterValueInput) {
- try {
- filterValueInput = (UIInput) context.getApplication().createComponent("org.richfaces.InplaceInput");
- } catch (FacesException e) {
- filterValueInput = (UIInput) context.getApplication().createComponent(UIInput.COMPONENT_TYPE);
- inplaceInput = false;
- }
+ filterValueInput = (UIInput) context.getApplication().createComponent(UIInput.COMPONENT_TYPE);
filterValueInput.setId(column.getId() + SORT_FILTER_PARAMETER);
filterValueInput.setImmediate(true);
column.getFacets().put(FILTER_INPUT_FACET_NAME, filterValueInput);
filterValueInput.getAttributes().put(HTML.onclick_ATTRIBUTE, "Event.stop(event);");
}
- String onkeydownEvent = HTML.onkeydown_ATTRIBUTE;
-
String filterEvent = (String) column.getAttributes().get("filterEvent");
- if (inplaceInput) {
- onkeydownEvent = "oninputkeydown";
- filterValueInput.getAttributes().put("defaultLabel", column.getAttributes().get("filterDefaultLabel"));
- }
if (null == filterEvent || "".equals(filterEvent)) {
filterEvent = "onchange";
}
- filterValueInput.getAttributes().put(filterEvent, buffer);
- if (!onkeydownEvent.equals(filterEvent)) {
- filterValueInput.getAttributes().put(onkeydownEvent, "RichFaces.blurFilterInput(event);");
- }
-
+ filterValueInput.getAttributes().put(filterEvent, buffer);
filterValueInput.setValue(column.getAttributes().get("filterValue"));
getUtils().encodeBeginFormIfNessesary(context, column);
16 years, 9 months
JBoss Rich Faces SVN: r7119 - trunk/test-applications/jsp/src/main/webapp/OrderingList.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-24 11:16:10 -0400 (Mon, 24 Mar 2008)
New Revision: 7119
Modified:
trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp
Log:
+update convector
Modified: trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-03-24 15:15:38 UTC (rev 7118)
+++ trunk/test-applications/jsp/src/main/webapp/OrderingList/OrderingList.jsp 2008-03-24 15:16:10 UTC (rev 7119)
@@ -10,7 +10,7 @@
</a4j:outputPanel>
<rich:orderingList id="orderingListID" value="#{orderingList.list}" var="item" listHeight="#{orderingList.listHeight}"
- listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}" converter="orderingListConverter"
+ listWidth="#{orderingList.listWidth}" controlsType="#{orderingList.controlsType}" converter="dataConverter"
bottomControlLabel="#{orderingList.bottomControlLabel}" captionLabel="#{orderingList.captionLabel}"
topControlLabel="#{orderingList.topControlLabel}" upControlLabel="#{orderingList.upControlLabel}"
controlsHorizontalAlign="#{orderingList.controlsHorizontalAlign}" controlsVerticalAlign="#{orderingList.controlsVerticalAlign}"
16 years, 9 months