February 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r16463 - branches/community/3.3.X/docs.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2010-02-16 18:12:41 -0500 (Tue, 16 Feb 2010) New Revision: 16463 Added: branches/community/3.3.X/docs/richfaces_3.3.3.cr1_docs.zip Removed: branches/community/3.3.X/docs/richfaces_3.3.3.beta1_javadocs.zip Log: Uploading 3.3.3.CR1 docs bundle Deleted: branches/community/3.3.X/docs/richfaces_3.3.3.beta1_javadocs.zip =================================================================== (Binary files differ) Added: branches/community/3.3.X/docs/richfaces_3.3.3.cr1_docs.zip =================================================================== (Binary files differ) Property changes on: branches/community/3.3.X/docs/richfaces_3.3.3.cr1_docs.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16462 - branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2010-02-16 17:30:20 -0500 (Tue, 16 Feb 2010) New Revision: 16462 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml Log: Edited View Scoped Default Queue, RF-8367 Modified: branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2010-02-16 15:24:22 UTC (rev 16461) +++ branches/community/3.3.X/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2010-02-16 22:30:20 UTC (rev 16462) @@ -528,7 +528,7 @@ <para> You can also programmatically enable/disable the global queue on a single view using the following:</para> <programlisting role="XML"><![CDATA[... -<a4j:queue name="org.richfaces.global_queue" disabled="true"... /> +<a4j:queue name="org.richfaces.queue.global" disabled="true"... /> ...]]></programlisting> <para>Hence, to enable the queue for a single view page you need to define the <property>"disable"</property> attribute with @@ -543,7 +543,7 @@ <emphasis role="bold">Example:</emphasis> </para> <programlisting role="XML"><![CDATA[... -<a4j:queue name="org.richfaces.global_queue" requestDelay="1000" /> +<a4j:queue name="org.richfaces.queue.global" requestDelay="1000" /> ...]]></programlisting> <para> View scoped queue can be also added by just definition of the queue without name specified. In this case it should be placed anywhere outside

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16461 - root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-02-16 10:24:22 -0500 (Tue, 16 Feb 2010) New Revision: 16461 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java Log: RF-8109 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-16 15:09:39 UTC (rev 16460) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-16 15:24:22 UTC (rev 16461) @@ -134,6 +134,12 @@ renderChild(context, caption); writer.endElement(HTML.DIV_ELEM); } + UIComponent header = component.getFacet("header"); + if (header != null && header.isRendered()) { + writer.startElement(HTML.DIV_ELEM, component); + renderChild(context, header); + writer.endElement(HTML.DIV_ELEM); + } } @Override @@ -154,6 +160,12 @@ @Override protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + UIComponent facet = component.getFacet("footer"); + if (facet != null && facet.isRendered()) { + writer.startElement(HTML.DIV_ELEM, component); + renderChild(context, facet); + writer.endElement(HTML.DIV_ELEM); + } writer.startElement(HTML.DIV_ELEM, component); writer.writeAttribute(HTML.ID_ATTRIBUTE, component.getClientId(context) + ":d", null); writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-drag", null);

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16460 - root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-02-16 10:09:39 -0500 (Tue, 16 Feb 2010) New Revision: 16460 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java Log: RF-8133 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-16 15:05:00 UTC (rev 16459) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-16 15:09:39 UTC (rev 16460) @@ -128,7 +128,12 @@ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable", (String) component .getAttributes().get("styleClass")), null); getUtils().writeAttribute(writer, HTML.STYLE_ATTRIBUTE, component.getAttributes().get("style")); - + UIComponent caption = component.getFacet("caption"); + if (caption != null && caption.isRendered()) { + writer.startElement(HTML.DIV_ELEM, component); + renderChild(context, caption); + writer.endElement(HTML.DIV_ELEM); + } } @Override @@ -139,12 +144,6 @@ table.captureOrigValue(context); table.setRowKey(context, null); RendererState state = new RendererState(context, table); - UIComponent facet = table.getFacet("caption"); - if (facet != null && facet.isRendered()) { - writer.startElement(HTML.DIV_ELEM, component); - renderChild(context, facet); - writer.endElement(HTML.DIV_ELEM); - } encodeStyle(state); encodeHeaderOrFooter(state, "header"); encodeBody(state);

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16459 - root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-02-16 10:05:00 -0500 (Tue, 16 Feb 2010) New Revision: 16459 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java Log: RF-8133 Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-16 14:42:30 UTC (rev 16458) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-02-16 15:05:00 UTC (rev 16459) @@ -139,7 +139,12 @@ table.captureOrigValue(context); table.setRowKey(context, null); RendererState state = new RendererState(context, table); - // TODO encodeCaption(context, table); + UIComponent facet = table.getFacet("caption"); + if (facet != null && facet.isRendered()) { + writer.startElement(HTML.DIV_ELEM, component); + renderChild(context, facet); + writer.endElement(HTML.DIV_ELEM); + } encodeStyle(state); encodeHeaderOrFooter(state, "header"); encodeBody(state);

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16458 - in branches/community/3.3.X/test-applications/regression-test: src/main/webapp/pages and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-02-16 09:42:30 -0500 (Tue, 16 Feb 2010) New Revision: 16458 Added: branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356-menu-items.xhtml branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356.xhtml Modified: branches/community/3.3.X/test-applications/regression-test/pom.xml branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/index.xhtml Log: - regression-test - added regression test for RF-8356 Modified: branches/community/3.3.X/test-applications/regression-test/pom.xml =================================================================== --- branches/community/3.3.X/test-applications/regression-test/pom.xml 2010-02-16 14:33:09 UTC (rev 16457) +++ branches/community/3.3.X/test-applications/regression-test/pom.xml 2010-02-16 14:42:30 UTC (rev 16458) @@ -16,6 +16,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <version.richfaces>${project.version}</version.richfaces> </properties> <build> @@ -48,7 +49,7 @@ <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${version.richfaces}</version> <exclusions> <exclusion> <artifactId>richfaces-impl</artifactId> @@ -59,7 +60,7 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>${version.richfaces}</version> </dependency> <dependency> <groupId>com.sun.facelets</groupId> @@ -70,8 +71,11 @@ <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> <version>1.2_12</version> - <type>jar</type> - <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_12</version> + </dependency> </dependencies> </project> Modified: branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/index.xhtml =================================================================== --- branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/index.xhtml 2010-02-16 14:33:09 UTC (rev 16457) +++ branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/index.xhtml 2010-02-16 14:42:30 UTC (rev 16458) @@ -21,9 +21,13 @@ <td><a id="rf7975-jira" href="https://jira.jboss.org/jira/browse/RF-7975">https://jira.jboss.org/jira/browse/RF-7975</a></td> </tr> <tr> - <td style="width: 150px;"><a id="rf7994-tc" href="/regression-test/pages/rf7994.jsf">Menu Item</a></td> + <td><a id="rf7994-tc" href="/regression-test/pages/rf7994.jsf">Menu Item</a></td> <td><a id="rf7994-jira" href="https://jira.jboss.org/jira/browse/RF-7994">https://jira.jboss.org/jira/browse/RF-7994</a></td> </tr> + <tr> + <td><a id="rf8356-tc" href="/regression-test/pages/rf8356.jsf">Items inside menu</a></td> + <td><a id="rf8356-jira" href="https://jira.jboss.org/jira/browse/RF-8356">https://jira.jboss.org/jira/browse/RF-8356</a></td> + </tr> </table> </h:form> </ui:define> Added: branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356-menu-items.xhtml =================================================================== --- branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356-menu-items.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356-menu-items.xhtml 2010-02-16 14:42:30 UTC (rev 16458) @@ -0,0 +1,26 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <rich:menuItem submitMode="ajax"> + <h:outputLabel value="h:inputText" /> + <h:inputText value="#{sessionScope['inputText']}"/> + </rich:menuItem> + + <rich:menuItem submitMode="ajax"> + <h:outputText value="h:selectBooleanCheckbox" /> + <h:selectBooleanCheckbox value="#{sessionScope['selectBooleanCheckbox']}" /> + </rich:menuItem> + + <rich:menuItem submitMode="ajax"> + <h:outputText value="rich:inplaceSelect" /> + <rich:inplaceInput value="#{sessionScope['inplaceSelect']}" /> + </rich:menuItem> + +</ui:composition> + Added: branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356.xhtml =================================================================== --- branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356.xhtml (rev 0) +++ branches/community/3.3.X/test-applications/regression-test/src/main/webapp/pages/rf8356.xhtml 2010-02-16 14:42:30 UTC (rev 16458) @@ -0,0 +1,35 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <body> + <h:form> + + <rich:toolBar> + <rich:dropDownMenu> + <f:facet name="label"> + <h:panelGroup> + <h:outputText value="Menu"/> + </h:panelGroup> + </f:facet> + + <ui:include src="rf8356-menu-items.xhtml" /> + + <rich:menuGroup value="Group"> + <ui:include src="rf8356-menu-items.xhtml" /> + </rich:menuGroup> + + </rich:dropDownMenu> + </rich:toolBar> + + <ui:include src="rf8356-menu-items.xhtml" /> + + </h:form> + </body> +</html> +

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16457 - branches/community/3.3.X/test-applications/regression-test.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-02-16 09:33:09 -0500 (Tue, 16 Feb 2010) New Revision: 16457 Modified: branches/community/3.3.X/test-applications/regression-test/ Log: - added svn:ignore to test-applications/regression-test Property changes on: branches/community/3.3.X/test-applications/regression-test ___________________________________________________________________ Name: svn:ignore + .classpath .project target .settings

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16456 - root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2010-02-16 06:39:12 -0500 (Tue, 16 Feb 2010) New Revision: 16456 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java Log: fix build Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java 2010-02-15 16:37:33 UTC (rev 16455) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/taglib/TaglibModule.java 2010-02-16 11:39:12 UTC (rev 16456) @@ -24,7 +24,6 @@ package org.richfaces.cdk.generate.taglib; import org.richfaces.cdk.CdkWriter; -import org.richfaces.cdk.model.ComponentModel; import org.richfaces.cdk.model.ValidatorModel; import org.richfaces.cdk.model.Visitable; @@ -49,7 +48,7 @@ setBinder.addBinding().to(TaglibGenerator.class); MapBinder<Class<? extends Visitable>, TagGenerator<? extends Visitable>> mapBinder = MapBinder.newMapBinder(binder(), new TypeLiteral<Class<? extends Visitable>>(){}, new TypeLiteral<TagGenerator<? extends Visitable>>(){}); mapBinder.addBinding(ValidatorModel.class).to(ValidatorTagGenerator.class); - mapBinder.addBinding(ComponentModel.class).to(ComponentTagGenerator.class); +// mapBinder.addBinding(ComponentModel.class).to(ComponentTagGenerator.class); TODO } }

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16455 - in branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main: java/org/richfaces/convert/selection and 3 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-02-15 11:37:33 -0500 (Mon, 15 Feb 2010) New Revision: 16455 Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js Log: RF-7166 RF-1760 RFPL-394 Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2010-02-15 16:01:09 UTC (rev 16454) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/component/UIScrollableDataTable.java 2010-02-15 16:37:33 UTC (rev 16455) @@ -465,6 +465,8 @@ public abstract Object getActiveRowKey(); public abstract void setActiveRowKey(Object activeRowKey); + public abstract int getShiftRowIndex(); + public abstract void setShiftRowIndex(int shiftRowIndex); /* (non-Javadoc) * @see org.ajax4jsf.component.UIDataAdaptor#setRowIndex(int) */ Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java 2010-02-15 16:01:09 UTC (rev 16454) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/convert/selection/ClientSelectionConverter.java 2010-02-15 16:37:33 UTC (rev 16455) @@ -89,7 +89,12 @@ clientSelection.setSelectionFlag(selections[length-1]); length--; } - clientSelection.setActiveRowIndex(Integer.parseInt(selections[length-1])); + String[] rows = selections[length-1].split("\\|"); + clientSelection.setActiveRowIndex(Integer.parseInt(rows[0])); + String shiftRowIndex = rows[1]; + if (shiftRowIndex.charAt(0) > '0') { + clientSelection.setShiftRowIndex(Integer.parseInt(shiftRowIndex)); + } length--; for (int i = 0; i < length; i++) { Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java 2010-02-15 16:01:09 UTC (rev 16454) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/model/selection/ClientSelection.java 2010-02-15 16:37:33 UTC (rev 16455) @@ -39,10 +39,16 @@ public static final String FLAG_ALL = "a"; + public static final String FLAG_ADD2SELECTION_AFTER_RANGE = "d"; + + public static final String FLAG_ADD2SELECTION_BEFORE_RANGE = "u"; + private String selectionFlag; private int activeRowIndex = -1; + private int shiftRowIndex = -1; + private List<SelectionRange> ranges = new ArrayList<SelectionRange>(); public ClientSelection() { @@ -145,17 +151,24 @@ if (FLAG_ALL.equals(selectionFlag)) { selectAll = true; - } else if (FLAG_RESET.equals(selectionFlag)) { + } else if (FLAG_RESET.equals(selectionFlag) || FLAG_ADD2SELECTION_AFTER_RANGE.equals(selectionFlag) + || FLAG_ADD2SELECTION_BEFORE_RANGE.equals(selectionFlag)) { reset = true; } } + public int getShiftRowIndex() { + return shiftRowIndex; + } + public void setShiftRowIndex(int shiftRowIndex) { + this.shiftRowIndex = shiftRowIndex; + } + public int getActiveRowIndex() { return activeRowIndex; } - public void setActiveRowIndex(int activeRowIndex) { this.activeRowIndex = activeRowIndex; } Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2010-02-15 16:01:09 UTC (rev 16454) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2010-02-15 16:37:33 UTC (rev 16455) @@ -81,7 +81,8 @@ .getAsObject(context, grid, value); final ScrollableDataTableRendererState state = ScrollableDataTableRendererState .createState(context, grid); - state.setRowIndex(ScrollableDataTableUtils.getClientRowIndex(grid)); + int clientRowIndex = ScrollableDataTableUtils.getClientRowIndex(grid); + state.setRowIndex(clientRowIndex); final SimpleSelection simpleSelection = grid.getSelection() == null ? new SimpleSelection() : (SimpleSelection) grid.getSelection(); if (clientSelection.isReset() || clientSelection.isSelectAll()) { @@ -117,6 +118,39 @@ } catch (IOException e) { throw new FacesException(e); } + int shiftRowIndex = clientSelection.getShiftRowIndex(); + if (shiftRowIndex != -1) { + int rows = grid.getRows(); + grid.setShiftRowIndex(grid.getFirst() + (rows + shiftRowIndex - clientRowIndex) % rows); + } + int oldFirst = grid.getFirst(); + int oldRows = grid.getRows(); + int newFirst = -1; + int newRows = -1; + + if (ClientSelection.FLAG_ADD2SELECTION_BEFORE_RANGE.equals(clientSelection.getSelectionFlag())) { + newFirst = grid.getShiftRowIndex(); + newRows = oldFirst - newFirst; + } else if (ClientSelection.FLAG_ADD2SELECTION_AFTER_RANGE.equals(clientSelection.getSelectionFlag())) { + newFirst = oldFirst + oldRows; + newRows = grid.getShiftRowIndex() - newFirst + 1; + } + if (newFirst != -1) { + grid.setFirst(newFirst); + grid.setRows(newRows); + try { + grid.walk(context, new DataVisitor() { + public void process(FacesContext context, Object rowKey, + Object argument) throws IOException { + simpleSelection.addKey(rowKey); + } + }, null); + } catch (IOException e) { + throw new FacesException(e); + } + grid.setFirst(oldFirst); + grid.setRows(oldRows); + } grid.setSelection(simpleSelection); ValueExpression selectionBinding = grid .getValueExpression("selection"); @@ -277,7 +311,20 @@ string = ""; } - string += selection.getActiveRowIndex(); + int first = grid.getFirst(); + int rows = grid.getRows(); + int shiftRowIndex = grid.getShiftRowIndex(); + String shiftRow = "|."; + if (shiftRowIndex > 0) { + if (shiftRowIndex < first) { + shiftRow = "|-"; + } else if (shiftRowIndex > first + rows) { + shiftRow = "|+"; + } else { + shiftRow = "|" + (rows + shiftRowIndex - first + ScrollableDataTableUtils.getClientRowIndex(grid)) % rows; + } + } + string += selection.getActiveRowIndex() + shiftRow; String id = getSelectionInputName(context, grid); Modified: branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js =================================================================== --- branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2010-02-15 16:01:09 UTC (rev 16454) +++ branches/enterprise/3.3.1.SP1_RFPL-394/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Selection.js 2010-02-15 16:37:33 UTC (rev 16455) @@ -248,11 +248,21 @@ restoreState: function() { this.selectionFlag = null; var selStrAr = $(this.inputElement).value.split(";"); - var activeRow = NaN; - while (selStrAr.length != 0 && selStrAr[selStrAr.length - 1].indexOf(",") == -1 && - isNaN(activeRow = Number(selStrAr.pop()))); - if (!isNaN(activeRow)) { - this.setActiveRow(activeRow); + var rowsString = ""; + while (selStrAr.length != 0 && (rowsString = selStrAr.pop()).indexOf("|") == -1); + var rows = rowsString.split("|"); + if (rows.length == 2) { + var activeRow = Number(rows[0]); + if (!isNaN(activeRow)) { + this.setActiveRow(activeRow); + } + var shiftRowString = rows[1]; + var shiftRow = Number(shiftRowString); + if (!isNaN(shiftRow)) { + this.shiftRow = shiftRow; + } else if ("+-".indexOf(shiftRowString) != -1 ) { + this.shiftRow = shiftRowString; + } } this.selection.initRanges(selStrAr); // this.firstIndex = Number($(this.prefix + ":f").rows[0].id.split(this.prefix)[1].split(":")[2]);; @@ -407,11 +417,23 @@ var range; if ( event.shiftKey && !event.ctrlKey && !event.altKey && !this.isSingleMode) { this.firstIndex = Number($(this.prefix + ":n").rows[0].id.split(this.prefix)[1].split(":")[2]);; - this.selectionFlag = "x"; if(!this.shiftRow) { - this.shiftRow = this.activeRow; + if (this.activeRow == -1) { + this.shiftRow = rowIndex; + } else { + this.shiftRow = this.activeRow; + } } - this.startRow = this.shiftRow; + if (this.shiftRow == "-") { + this.selectionFlag = "u"; + this.startRow = this.firstIndex; + } else if (this.shiftRow == "+") { + this.selectionFlag = "d"; + this.startRow = this.firstIndex ? this.firstIndex - 1 : this.rowCount - 1; + } else { + this.selectionFlag = "x"; + this.startRow = this.shiftRow; + } if (((this.startRow <= rowIndex) && (this.firstIndex <= this.startRow || rowIndex < this.firstIndex)) || (this.startRow > rowIndex && this.firstIndex < this.startRow && rowIndex < this.firstIndex)) { this.endRow = rowIndex; @@ -444,7 +466,8 @@ }, selectionChanged: function(event) { - $(this.inputElement).value = this.selection.inspectRanges() + this.activeRow + ";" + (this.selectionFlag ? this.selectionFlag : "") ; + $(this.inputElement).value = this.selection.inspectRanges() + this.activeRow + "|" + + (this.shiftRow ? this.shiftRow : this.activeRow) + ";" + (this.selectionFlag ? this.selectionFlag : "") ; var state = this.selection.getState(); event.oldSelection = this.oldState; event.newSelection = state;

14 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r16454 - root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-02-15 11:01:09 -0500 (Mon, 15 Feb 2010) New Revision: 16454 Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd Log: Schema refactored to exclude global attributes Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2010-02-15 10:44:15 UTC (rev 16453) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/schema/cdk-jstl-core.xsd 2010-02-15 16:01:09 UTC (rev 16454) @@ -37,17 +37,6 @@ <xs:import schemaLocation="cdk-template.xsd" namespace="http://richfaces.org/cdk/core" /> - <xs:attributeGroup name="testGroup"> - <xs:attribute name="test" form="unqualified" use="required" - type="cdk:elStrictExpression"> - <xs:annotation> - <xs:documentation> - <p>The test condition that determines whether or not the body content should be processed.</p> - </xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> - <xs:complexType name="arbitraryContent" mixed="true"> <xs:choice> <xs:any minOccurs="0" maxOccurs="unbounded" /> @@ -57,7 +46,14 @@ <xs:complexType name="arbitraryConditionalContent"> <xs:complexContent> <xs:extension base="arbitraryContent"> - <xs:attributeGroup ref="testGroup" /> + <xs:attribute name="test" form="unqualified" use="required" + type="cdk:elStrictExpression"> + <xs:annotation> + <xs:documentation> + <p>The test condition that determines whether or not the body content should be processed.</p> + </xs:documentation> + </xs:annotation> + </xs:attribute> </xs:extension> </xs:complexContent> </xs:complexType>

14 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2010