JBoss Rich Faces SVN: r4724 - in branches/3.1.x/samples/richfaces-demo/src/main: webapp/images and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-12-11 11:51:26 -0500 (Tue, 11 Dec 2007)
New Revision: 4724
Added:
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/copy.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/create_doc.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/create_folder.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/cut.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/delete.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/edit.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/filter.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/find.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/open.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/paste.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/redo.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/reload.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/repeat.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save_all.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save_as.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/undo.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/verify.gif
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/Converter.java
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBar.java
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBarItem.java
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/cmenuusage.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml
Log:
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/Converter.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/Converter.java 2007-12-11 16:42:26 UTC (rev 4723)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/Converter.java 2007-12-11 16:51:26 UTC (rev 4724)
@@ -17,7 +17,7 @@
Object value) {
ToolBarItem optionItem = (ToolBarItem) value;
- return optionItem.getLabel() + ":" + optionItem.getType();
+ return optionItem.getLabel() + ":" + optionItem.getIcon();
}
}
\ No newline at end of file
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBar.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBar.java 2007-12-11 16:42:26 UTC (rev 4723)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBar.java 2007-12-11 16:51:26 UTC (rev 4724)
@@ -8,25 +8,33 @@
private List<ToolBarItem> freeItems = new ArrayList<ToolBarItem>();
public ToolBar() {
ToolBarItem item = new ToolBarItem();
- item.setType("label");
- item.setLabel("New");
+ item.setIcon("create_folder");
+ item.setLabel("Create Folder");
items.add(item);
item = new ToolBarItem();
- item.setType("label");
- item.setLabel("Save");
+ item.setIcon("create_doc");
+ item.setLabel("Create Doc");
items.add(item);
item = new ToolBarItem();
- item.setType("label");
- item.setLabel("Close");
+ item.setIcon("find");
+ item.setLabel("Find");
items.add(item);
item = new ToolBarItem();
- item.setType("label");
- item.setLabel("Import");
+ item.setIcon("open");
+ item.setLabel("Open");
freeItems.add(item);
item = new ToolBarItem();
- item.setType("label");
- item.setLabel("Export");
+ item.setIcon("save");
+ item.setLabel("Save");
freeItems.add(item);
+ item = new ToolBarItem();
+ item.setIcon("save_all");
+ item.setLabel("Save All");
+ freeItems.add(item);
+ item = new ToolBarItem();
+ item.setIcon("delete");
+ item.setLabel("Delete");
+ freeItems.add(item);
}
public List<ToolBarItem> getItems() {
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBarItem.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBarItem.java 2007-12-11 16:42:26 UTC (rev 4723)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/listShuttle/ToolBarItem.java 2007-12-11 16:51:26 UTC (rev 4724)
@@ -1,24 +1,18 @@
package org.richfaces.demo.listShuttle;
public class ToolBarItem {
-private String type;
+private String icon;
private String label;
-
+private String iconURI;
public ToolBarItem() {
// TODO Auto-generated constructor stub
}
-public ToolBarItem(String label, String type) {
+public ToolBarItem(String label, String icon) {
setLabel(label);
- setType(type);
+ setIcon(icon);
}
-public String getType() {
- return type;
-}
-public void setType(String type) {
- this.type = type;
-}
public String getLabel() {
return label;
}
@@ -26,11 +20,21 @@
this.label = label;
}
+public String getIcon() {
+ return icon;
+}
+
+public void setIcon(String icon) {
+ this.icon = icon;
+}
+
+
+
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((icon == null) ? 0 : icon.hashCode());
result = prime * result + ((label == null) ? 0 : label.hashCode());
- result = prime * result + ((type == null) ? 0 : type.hashCode());
return result;
}
@@ -42,18 +46,22 @@
if (getClass() != obj.getClass())
return false;
final ToolBarItem other = (ToolBarItem) obj;
+ if (icon == null) {
+ if (other.icon != null)
+ return false;
+ } else if (!icon.equals(other.icon))
+ return false;
if (label == null) {
if (other.label != null)
return false;
} else if (!label.equals(other.label))
return false;
- if (type == null) {
- if (other.type != null)
- return false;
- } else if (!type.equals(other.type))
- return false;
return true;
}
+public String getIconURI() {
+ return "/images/icons/"+icon+".gif";
+}
+
}
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/copy.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/copy.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/create_doc.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/create_doc.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/create_folder.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/create_folder.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/cut.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/cut.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/delete.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/delete.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/edit.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/edit.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/filter.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/filter.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/find.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/find.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/open.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/open.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/paste.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/paste.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/redo.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/redo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/reload.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/reload.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/repeat.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/repeat.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save_all.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save_all.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save_as.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/save_as.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/undo.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/undo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/verify.gif
===================================================================
(Binary files differ)
Property changes on: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/icons/verify.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/cmenuusage.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/cmenuusage.xhtml 2007-12-11 16:42:26 UTC (rev 4723)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/componentControl/examples/cmenuusage.xhtml 2007-12-11 16:51:26 UTC (rev 4724)
@@ -11,21 +11,28 @@
</style>
<h:form id="form">
- <rich:contextMenu attached="false" id="menu" submitMode="none">
- <rich:menuItem>
+ <rich:contextMenu attached="false" id="menu" submitMode="ajax">
+ <rich:menuItem ajaxSingle="true">
<b>{car} {model}</b> details
+ <a4j:actionparam name="det" assignTo="#{ddmenu.current}" value="{car} {model} details"/>
</rich:menuItem>
<rich:menuGroup value="Actions">
- <rich:menuItem>
+ <rich:menuItem ajaxSingle="true">
Put <b>{car} {model}</b> To Basket
+ <a4j:actionparam name="bask" assignTo="#{ddmenu.current}" value="Put {car} {model} To Basket"/>
</rich:menuItem>
- <rich:menuItem value="Read Comments"/>
- <rich:menuItem>
+ <rich:menuItem value="Read Comments" ajaxSingle="true">
+ <a4j:actionparam name="bask" assignTo="#{ddmenu.current}" value="Read Comments"/>
+ </rich:menuItem>
+ <rich:menuItem ajaxSingle="true">
Go to <b>{car}</b> site
+ <a4j:actionparam name="bask" assignTo="#{ddmenu.current}" value="Go to {car} site"/>
</rich:menuItem>
</rich:menuGroup>
</rich:contextMenu>
+ <h:panelGrid columns="2">
+
<rich:dataTable value="#{dataTableScrollerBean.tenRandomCars}" var="car" id="table"
onRowMouseOver="this.style.backgroundColor='#F8F8F8'"
onRowMouseOut="this.style.backgroundColor='#{a4jSkin.tableBackgroundColor}'" rowClasses="cur">
@@ -48,11 +55,19 @@
<h:outputText value="#{car.price}" />
</rich:column>
- <rich:componentControl event="onRowClick" for=":subview:form:menu" operation="show">
+ <rich:componentControl event="onRowClick" for="menu" operation="show">
<f:param value="#{car.model}" name="model"/>
<f:param value="#{car.make}" name="car"/>
</rich:componentControl>
- </rich:dataTable>
+ </rich:dataTable>
+
+ <a4j:outputPanel ajaxRendered="true">
+ <rich:panel>
+ <f:facet name="header">Last Menu Action</f:facet>
+ <h:outputText value="#{ddmenu.current}"></h:outputText>
+ </rich:panel>
+ </a4j:outputPanel>
+ </h:panelGrid>
</h:form>
</f:subview>
\ No newline at end of file
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-11 16:42:26 UTC (rev 4723)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-11 16:51:26 UTC (rev 4724)
@@ -5,12 +5,26 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:rich="http://richfaces.org/rich"
xmlns:c="http://java.sun.com/jstl/core">
+
+<style>
+.pic{
+margin-bottom:-4px;
+margin-right:2px;
+}
+a{
+text-decoration:none;
+color:#{a4jSkin.headerTextColor};
+}
+</style>
<h:form>
- <rich:toolBar id="toolBar" itemSeparator="line">
+ <rich:toolBar id="toolBar" itemSeparator="line" height="40px">
<c:forEach items="#{toolBar.items}" var="item">
- <h:outputLink value="#">
- <h:outputText value="#{item.label}"></h:outputText>
- </h:outputLink>
+ <h:panelGroup>
+ <h:graphicImage value="#{item.iconURI}" styleClass="pic"/>
+ <h:outputLink value="#">
+ <h:outputText value="#{item.label}"></h:outputText>
+ </h:outputLink>
+ </h:panelGroup>
</c:forEach>
</rich:toolBar>
<rich:spacer height="20"></rich:spacer>
@@ -29,6 +43,5 @@
<rich:spacer height="20"></rich:spacer>
<h:commandButton value="Update Toolbar" reRender="toolBar" />
- <rich:messages></rich:messages>
</h:form>
</ui:composition>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml 2007-12-11 16:42:26 UTC (rev 4723)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/listShuttle.xhtml 2007-12-11 16:51:26 UTC (rev 4724)
@@ -14,7 +14,12 @@
List Shuttle could contain several columns in list representation. And it
also has strong keyboard support out of the box.
</p>
- <p><b>Example.</b>Customize simple application toolbar using List Shuttle </p>
+ <p><b>Example.</b>Customize simple application toolbar using List Shuttle.
+ In this example you may select items and their order within the toolBar.
+ <br/>
+ After you move some items between lists or reorder them in "Currently Active" list - you'll
+ see the changes on the toolbar
+ </p>
<div class="sample-container">
<ui:include src="/richfaces/listShuttle/examples/toolBarCustomization.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
@@ -22,9 +27,6 @@
</ui:include>
</div>
- <p>
- In this example you may select items and their order within the toolBar
- </p>
<p>
Content definition for this component - analogous to any Iteration component.
16 years, 10 months
JBoss Rich Faces SVN: r4723 - in branches/3.1.x/ui: orderingList/src/main/resources/org/richfaces/renderkit/html/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 11:42:26 -0500 (Tue, 11 Dec 2007)
New Revision: 4723
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
Log:
http://jira.jboss.com/jira/browse/RF-1601
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-11 16:23:01 UTC (rev 4722)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-11 16:42:26 UTC (rev 4723)
@@ -306,7 +306,7 @@
</u:selector>
<u:selector name=".rich-shuttle-source-row-selected, .rich-shuttle-target-row-selected">
- <u:style name="background-color" skin="headerGradientColor" />
+ <u:style name="background-color" skin="additionalBackgroundColor" />
</u:selector>
}
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 16:23:01 UTC (rev 4722)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 16:42:26 UTC (rev 4723)
@@ -145,12 +145,12 @@
.rich-ordering-list-table-header-cell {
background : none top left repeat-x;
- border-style: solid;
+ border-style: solid solid solid none;
padding : 2px;
}
.rich-ordering-list-table-header-cell-last {
- border-style:solid;
+ border-style: solid solid solid none;
border-right: 0;
white-space: nowrap;
}
@@ -237,8 +237,8 @@
<u:style name="font-weight" skin="headerWeightFont" />
<u:style name="border-width" skin="tableBorderWidth" />
<u:style name="border-top-color" skin="subBorderColor" />
- <u:style name="border-bottom-color" skin="tableBorderColor" />
- <u:style name="border-right-color" skin="tableBorderColor" />
+ <u:style name="border-bottom-color" skin="panelBorderColor" />
+ <u:style name="border-right-color" skin="panelBorderColor" />
<u:style name="border-left-color" skin="panelBorderColor" />
</u:selector>
@@ -253,7 +253,7 @@
<u:style name="font-weight" skin="headerWeightFont" />
<u:style name="border-width" skin="tableBorderWidth" />
<u:style name="border-top-color" skin="subBorderColor" />
- <u:style name="border-bottom-color" skin="tableBorderColor" />
+ <u:style name="border-bottom-color" skin="panelBorderColor" />
<u:style name="border-left-color" skin="panelBorderColor" />
</u:selector>
@@ -264,7 +264,7 @@
<u:selector name=".rich-ordering-list-output">
<u:style name="background-color" skin="generalBackgroundColor" />
- <u:style name="border-color" skin="tableBorderColor" />
+ <u:style name="border-color" skin="panelBorderColor" />
</u:selector>
<u:selector name=".rich-ordering-list-cell, .rich-ordering-list-cell *">
16 years, 10 months
JBoss Rich Faces SVN: r4722 - in branches/3.1.x/ui/listShuttle/src: main/templates/org/richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 11:23:01 -0500 (Tue, 11 Dec 2007)
New Revision: 4722
Modified:
branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java
Log:
http://jira.jboss.com/jira/browse/RF-1583
name for focus keepers removed
Modified: branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-12-11 16:22:51 UTC (rev 4721)
+++ branches/3.1.x/ui/listShuttle/src/main/java/org/richfaces/component/UIListShuttle.java 2007-12-11 16:23:01 UTC (rev 4722)
@@ -16,7 +16,6 @@
import javax.faces.FacesException;
import javax.faces.application.FacesMessage;
-import javax.faces.component.StateHolder;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
import javax.faces.convert.ConverterException;
@@ -28,7 +27,6 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.model.DataVisitor;
-import org.richfaces.component.UIOrderingList.ValueHolder;
import org.richfaces.component.util.MessageUtil;
import org.richfaces.model.ListShuttleDataModel;
import org.richfaces.model.ListShuttleRowKey;
@@ -563,9 +561,8 @@
final ArrayList sourceList = new ArrayList();
final ArrayList targetList = new ArrayList();
- final ListShuttleDataModel listShuttleDataModel = (ListShuttleDataModel) getExtendedDataModel();
try {
- listShuttleDataModel.walk(context, new DataVisitor() {
+ walk(context, new DataVisitor() {
public void process(FacesContext context, Object rowKey,
Object argument) throws IOException {
@@ -579,7 +576,7 @@
targetList.add(getRowData());
}
}
- }, null, null);
+ }, null);
} catch (IOException e) {
throw new ConverterException(e.getLocalizedMessage(), e);
}
@@ -593,7 +590,7 @@
setValid(false);
}
- //validateValue(context, newValue);
+ validateValue(context, newTargetValue);
// If our value is valid, store the new value, erase the
// "submitted" value, and emit a ValueChangeEvent if appropriate
Modified: branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-11 16:22:51 UTC (rev 4721)
+++ branches/3.1.x/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2007-12-11 16:23:01 UTC (rev 4722)
@@ -60,7 +60,7 @@
<tr>
<td>
<div class="rich-shuttle-source-items">
- <input id="#{clientId}focusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" name="focusKeeper"/>
+ <input id="#{clientId}focusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;"/>
<table id="#{clientId}table" cellpadding="0" cellspacing="0" class="rich-shuttle-body">
<tbody>
@@ -122,7 +122,7 @@
<div class="rich-shuttle-target-items" >
<input type="hidden" value=":" style="display: none;" name="#{clientId}" />
- <input id="#{clientId}tlFocusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" name="focusKeeper"/>
+ <input id="#{clientId}tlFocusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;"/>
<table id="#{clientId}tlTable" cellpadding="0" cellspacing="0" class="rich-shuttle-body">
<tbody>
Modified: branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java 2007-12-11 16:22:51 UTC (rev 4721)
+++ branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java 2007-12-11 16:23:01 UTC (rev 4722)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import javax.faces.application.FacesMessage;
import javax.faces.component.UICommand;
@@ -32,7 +31,6 @@
import javax.faces.component.html.HtmlCommandLink;
import javax.faces.component.html.HtmlForm;
import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
import javax.faces.el.EvaluationException;
import javax.faces.el.PropertyNotFoundException;
import javax.faces.el.ValueBinding;
@@ -187,8 +185,8 @@
});
externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "sa1:2");
- externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), ":");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
listShuttle.processDecodes(facesContext);
assertTrue(facesContext.getMessages().hasNext());
}
16 years, 10 months
JBoss Rich Faces SVN: r4721 - in branches/3.1.x/ui/orderingList/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 11:22:51 -0500 (Tue, 11 Dec 2007)
New Revision: 4721
Modified:
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java
branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1583
name for focus keepers removed
Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-12-11 16:20:22 UTC (rev 4720)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2007-12-11 16:22:51 UTC (rev 4721)
@@ -29,6 +29,7 @@
import javax.faces.model.DataModel;
import javax.faces.model.ListDataModel;
import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
import org.ajax4jsf.component.UIDataAdaptor;
import org.ajax4jsf.model.DataComponentState;
@@ -286,6 +287,95 @@
}
/**
+ *
+ * <p>Set the "valid" property according to the below algorithm.</p>
+ *
+ * <ul>
+ *
+ * <li>If the <code>valid</code> property on this component is still
+ * <code>true</code>, and the <code>required</code> property is also
+ * true, ensure that the local value is not empty (where "empty" is
+ * defined as <code>null</code> or a zero-length String. If the local
+ * value is empty:
+ * <ul>
+ * <li>Enqueue an appropriate error message by calling the
+ * <code>addMessage()</code> method on the <code>FacesContext</code>
+ * instance for the current request.</li>
+ * <li>Set the <code>valid</code> property on this component to
+ * <code>false</code>.</li>
+ * </ul></li>
+ * <li>If the <code>valid</code> property on this component is still
+ * <code>true</code>, and the local value is not empty, call the
+ * <code>validate()</code> method of each {@link Validator}
+ * registered for this {@link UIInput}, followed by the method
+ * pointed at by the <code>validatorBinding</code> property (if any).
+ * If any of these validators or the method throws a
+ * {@link ValidatorException}, catch the exception, add
+ * its message (if any) to the {@link FacesContext}, and set
+ * the <code>valid</code> property of this component to false.</li>
+ *
+ * </ul>
+ *
+ */
+ protected void validateValue(FacesContext context, Object newValue) {
+ // If our value is valid, enforce the required property if present
+ if (isValid() && isRequired() && isEmpty(newValue)) {
+ FacesMessage message =
+ MessageFactory.getMessage(context, UIInput.REQUIRED_MESSAGE_ID);
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(getClientId(context), message);
+ setValid(false);
+ }
+
+ // If our value is valid and not empty, call all validators
+ if (isValid() && !isEmpty(newValue)) {
+ Validator[] validators = getValidators();
+ for (int i = 0; i < validators.length; i++) {
+ Validator validator = (Validator) validators[i];
+ try {
+ validator.validate(context, this, newValue);
+ }
+ catch (ValidatorException ve) {
+ // If the validator throws an exception, we're
+ // invalid, and we need to add a message
+ setValid(false);
+ FacesMessage message = ve.getFacesMessage();
+ if (message != null) {
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(getClientId(context), message);
+ }
+ }
+ }
+
+ MethodBinding validator = getValidator();
+ if (validator != null) {
+ try {
+ validator.invoke(context,
+ new Object[] { context, this, newValue});
+ }
+ catch (EvaluationException ee) {
+ if (ee.getCause() instanceof ValidatorException) {
+ ValidatorException ve =
+ (ValidatorException) ee.getCause();
+
+ // If the validator throws an exception, we're
+ // invalid, and we need to add a message
+ setValid(false);
+ FacesMessage message = ve.getFacesMessage();
+ if (message != null) {
+ message.setSeverity(FacesMessage.SEVERITY_ERROR);
+ context.addMessage(getClientId(context), message);
+ }
+ } else {
+ // Otherwise, rethrow the EvaluationException
+ throw ee;
+ }
+ }
+ }
+ }
+ }
+
+ /**
* <p>In addition to the standard <code>processUpdates</code> behavior
* inherited from {@link UIComponentBase}, calls
* <code>updateModel()</code>.
Modified: branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-12-11 16:20:22 UTC (rev 4720)
+++ branches/3.1.x/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingList.java 2007-12-11 16:22:51 UTC (rev 4721)
@@ -13,7 +13,6 @@
import javax.faces.FacesException;
import javax.faces.application.FacesMessage;
-import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIInput;
@@ -546,10 +545,8 @@
previousValue = Collections.EMPTY_LIST;
}
- OrderingListDataModel dataModel = (OrderingListDataModel) getExtendedDataModel();
-
try {
- final ArrayList list = new ArrayList(dataModel.getRowCount());
+ final ArrayList list = new ArrayList(getRowCount());
walk(context, new DataVisitor() {
public void process(FacesContext context, Object rowKey,
@@ -599,96 +596,6 @@
}
}
- /**
- *
- * <p>Set the "valid" property according to the below algorithm.</p>
- *
- * <ul>
- *
- * <li>If the <code>valid</code> property on this component is still
- * <code>true</code>, and the <code>required</code> property is also
- * true, ensure that the local value is not empty (where "empty" is
- * defined as <code>null</code> or a zero-length String. If the local
- * value is empty:
- * <ul>
- * <li>Enqueue an appropriate error message by calling the
- * <code>addMessage()</code> method on the <code>FacesContext</code>
- * instance for the current request.</li>
- * <li>Set the <code>valid</code> property on this component to
- * <code>false</code>.</li>
- * </ul></li>
- * <li>If the <code>valid</code> property on this component is still
- * <code>true</code>, and the local value is not empty, call the
- * <code>validate()</code> method of each {@link Validator}
- * registered for this {@link UIInput}, followed by the method
- * pointed at by the <code>validatorBinding</code> property (if any).
- * If any of these validators or the method throws a
- * {@link ValidatorException}, catch the exception, add
- * its message (if any) to the {@link FacesContext}, and set
- * the <code>valid</code> property of this component to false.</li>
- *
- * </ul>
- *
- */
-
- protected void validateValue(FacesContext context, Object newValue) {
- // If our value is valid, enforce the required property if present
- if (isValid() && isRequired() && isEmpty(newValue)) {
- FacesMessage message =
- MessageFactory.getMessage(context, UIInput.REQUIRED_MESSAGE_ID);
- message.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(getClientId(context), message);
- setValid(false);
- }
-
- // If our value is valid and not empty, call all validators
- if (isValid() && !isEmpty(newValue)) {
- Validator[] validators = getValidators();
- for (int i = 0; i < validators.length; i++) {
- Validator validator = (Validator) validators[i];
- try {
- validator.validate(context, this, newValue);
- }
- catch (ValidatorException ve) {
- // If the validator throws an exception, we're
- // invalid, and we need to add a message
- setValid(false);
- FacesMessage message = ve.getFacesMessage();
- if (message != null) {
- message.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(getClientId(context), message);
- }
- }
- }
-
- MethodBinding validator = getValidator();
- if (validator != null) {
- try {
- validator.invoke(context,
- new Object[] { context, this, newValue});
- }
- catch (EvaluationException ee) {
- if (ee.getCause() instanceof ValidatorException) {
- ValidatorException ve =
- (ValidatorException) ee.getCause();
-
- // If the validator throws an exception, we're
- // invalid, and we need to add a message
- setValid(false);
- FacesMessage message = ve.getFacesMessage();
- if (message != null) {
- message.setSeverity(FacesMessage.SEVERITY_ERROR);
- context.addMessage(getClientId(context), message);
- }
- } else {
- // Otherwise, rethrow the EvaluationException
- throw ee;
- }
- }
- }
- }
- }
-
public ItemState getItemState() {
if (submittedValueHolder != null && !submittedValueHolder.isNull()) {
return new ModelItemState(submittedValueHolder.selection,
Modified: branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-12-11 16:20:22 UTC (rev 4720)
+++ branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-12-11 16:22:51 UTC (rev 4721)
@@ -28,8 +28,7 @@
<f:clientId var="clientId"/>
<div id="#{clientId}" class="rich-ordering-list-ds #{component.attributes['styleClass']}" x:passThruWithExclusions="id,class,styleClass">
- <input id="#{clientId}focusKeeper" type="button" value="" name="focusKeeper"
- style="width: 1px; position: absolute; left: -32767px;" />
+ <input id="#{clientId}focusKeeper" type="button" value="" style="width: 1px; position: absolute; left: -32767px;" />
<table id="#{clientId}table" cellpadding="0" cellspacing="0" class="rich-ordering-list-body">
<tbody>
@@ -89,14 +88,10 @@
<script type="text/javascript">
var clientId = '#{cId}';
Event.onReady(function() {
- try {
var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']];
var shuttle = new Richfaces.OrderingList('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', cotrolsIdPrefix, '#{cId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}, Richfaces.OrderingListSelectItem);
var layoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab');
layoutManager.widthSynchronization();
- } catch (e) {
- alert(e);
- }
});
//setTimeout(init, 0);
</script>
16 years, 10 months
JBoss Rich Faces SVN: r4720 - branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-11 11:20:22 -0500 (Tue, 11 Dec 2007)
New Revision: 4720
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
Log:
handling of "up,down" buttons was deleted
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-11 16:03:18 UTC (rev 4719)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-11 16:20:22 UTC (rev 4720)
@@ -163,8 +163,6 @@
onkeydownHandler : function(event) {
var action = null;
switch (event.keyCode) {
- case 34 : action = 'last'; this.moveSelectedItems(action ,event); break; //page down
- case 33 : action = 'first'; this.moveSelectedItems(action, event); break; //page up
case 38 : //up arrow
action = 'up';
this.moveActiveItem(action, event);
16 years, 10 months
JBoss Rich Faces SVN: r4719 - branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 11:03:18 -0500 (Tue, 11 Dec 2007)
New Revision: 4719
Modified:
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
Log:
Tests for list shuttle changed.
Modified: branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2007-12-11 15:55:55 UTC (rev 4718)
+++ branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2007-12-11 16:03:18 UTC (rev 4719)
@@ -191,9 +191,9 @@
assertEquals("button", hidden1.getAttributeValue("type"));
hidden1.getAttributeValue("style").contains("left: -32767px");
- List inputs = view.getDocumentElement().getHtmlElementsByAttribute("input", "name", listShuttle.getClientId(facesContext) + "focusKeeper");
+ List inputs = view.getDocumentElement().getHtmlElementsByAttribute("input", "id", listShuttle.getClientId(facesContext) + "focusKeeper");
assertNotNull(inputs);
- assertEquals(1, inputs.size());
+ assertEquals(2, inputs.size());
inputs = view.getDocumentElement().getHtmlElementsByAttribute("input", "name", listShuttle.getClientId(facesContext));
assertNotNull(inputs);
16 years, 10 months
JBoss Rich Faces SVN: r4718 - branches/3.1.x/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: vkorluzhenko
Date: 2007-12-11 10:55:55 -0500 (Tue, 11 Dec 2007)
New Revision: 4718
Modified:
branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
Log:
http://jira.jboss.com/jira/browse/RF-1174 - updated description for classes, added new classes and skins according to developer project.
Modified: branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml
===================================================================
--- branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-11 15:54:38 UTC (rev 4717)
+++ branches/3.1.x/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-12-11 15:55:55 UTC (rev 4718)
@@ -473,6 +473,298 @@
</tgroup>
</table>
+ <table>
+ <title>Skin parameters redefinition for a header cell</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>headerBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>headerTextColor</entry>
+ <entry>color</entry>
+ </row>
+ <row>
+ <entry>headerFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>headerSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ <row>
+ <entry>headerWeightFont</entry>
+ <entry>font-weight</entry>
+ </row>
+ <row>
+ <entry>tableBorderWidth</entry>
+ <entry>border-width</entry>
+ </row>
+ <row>
+ <entry>subBorderColor</entry>
+ <entry>border-top-color</entry>
+ </row>
+ <row>
+ <entry>panelBorderColor</entry>
+ <entry>border-bottom-color</entry>
+ </row>
+ <row>
+ <entry>panelBorderColor</entry>
+ <entry>border-right-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a selected cell</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>generalTextColor</entry>
+ <entry>color</entry>
+ </row>
+ <row>
+ <entry>generalFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>generalSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for an active cell</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>generalSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ <row>
+ <entry>generalFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for controls</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>panelBorderColor</entry>
+ <entry>border-color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a button</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>trimColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>generalTextColor</entry>
+ <entry>color</entry>
+ </row>
+ <row>
+ <entry>headerFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>headerSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a disabled button</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>trimColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>tabDisabledTextColor</entry>
+ <entry>color</entry>
+ </row>
+ <row>
+ <entry>headerFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>headerSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a button highlight</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>trimColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>selectControlColor</entry>
+ <entry>border-color</entry>
+ </row>
+ <row>
+ <entry>tableBorderWidth</entry>
+ <entry>border-width</entry>
+ </row>
+ <row>
+ <entry>headerFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>headerSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ <row>
+ <entry>generalTextColor</entry>
+ <entry>color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a pressed button</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>additionalBackgroundColor</entry>
+ <entry>background-color</entry>
+ </row>
+ <row>
+ <entry>tableBorderColor</entry>
+ <entry>border-color</entry>
+ </row>
+ <row>
+ <entry>tableBorderWidth</entry>
+ <entry>border-width</entry>
+ </row>
+ <row>
+ <entry>headerFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>headerSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ <row>
+ <entry>generalTextColor</entry>
+ <entry>color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a button content</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>headerFamilyFont</entry>
+ <entry>font-family</entry>
+ </row>
+ <row>
+ <entry>headerSizeFont</entry>
+ <entry>font-size</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Skin parameters redefinition for a button selection</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Skin parameters</entry>
+ <entry>CSS properties</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>generalTextColor</entry>
+ <entry>color</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
</section>
<section>
@@ -496,7 +788,7 @@
</figure>
<table>
- <title>Classes names that define a caption representations in the source and target lists</title>
+ <title>Classes names that define a list representation</title>
<tgroup cols="2">
<thead>
<row>
@@ -506,19 +798,65 @@
</thead>
<tbody>
<row>
+ <entry>rich-list-shuttle</entry>
+ <entry>Defines styles for a wrapper table element of a listShuttle</entry>
+ </row>
+ <row>
+ <entry>rich-list-shuttle-caption</entry>
+ <entry>Defines styles for a list caption</entry>
+ </row>
+ <row>
+ <entry>rich-shuttle-body</entry>
+ <entry>Defines styles for a list body</entry>
+ </row>
+ <row>
+ <entry>rich-shuttle-list-content</entry>
+ <entry>Defines styles for a list content</entry>
+ </row>
+ <row>
+ <entry>rich-shuttle-source-items</entry>
+ <entry>Defines styles for a wrapper <div> element for source list</entry>
+ </row>
+ <row>
+ <entry>rich-shuttle-target-items</entry>
+ <entry>Defines styles for a wrapper <div> element for target list</entry>
+ </row>
+ <row>
+ <entry>rich-shuttle-list-header</entry>
+ <entry>Defines styles for a lists header</entry>
+ </row>
+ <row>
+ <entry>rich-shuttle-header-tab-cell</entry>
+ <entry>Defines styles for a header cell</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Classes names that define a caption representations in a source and target lists</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
<entry>rich-shuttle-source-caption</entry>
- <entry>Defines a class for caption customization in the source list</entry>
+ <entry>Defines styles for a caption in a source list</entry>
</row>
<row>
<entry>rich-shuttle-target-caption</entry>
- <entry>Defines a class for caption customization in the target list</entry>
+ <entry>Defines styles for a caption in a target list</entry>
</row>
</tbody>
</tgroup>
</table>
<table>
- <title>Classes names that define a rows representations in the source list</title>
+ <title>Classes names that define a rows representations in a source list</title>
<tgroup cols="2">
<thead>
<row>
@@ -529,21 +867,21 @@
<tbody>
<row>
<entry>rich-shuttle-source-row</entry>
- <entry>Defines a default class for any item row</entry>
+ <entry>Defines styles for a row in a source list</entry>
</row>
<row>
<entry>rich-shuttle-row-source-selected</entry>
- <entry>Defines class to be additionally added to selected item rows</entry>
+ <entry>Defines styles for a selected row in a source list</entry>
</row>
<row>
<entry>rich-shuttle-row-source-active</entry>
- <entry>Defines class to be additionally added to active item rows</entry>
+ <entry>Defines styles for an active row in a source list</entry>
</row>
</tbody>
</tgroup>
</table>
<table>
- <title>Classes names that define a rows representations in the target list</title>
+ <title>Classes names that define a rows representations in a target list</title>
<tgroup cols="2">
<thead>
<row>
@@ -554,21 +892,21 @@
<tbody>
<row>
<entry>rich-shuttle-target-row</entry>
- <entry>Defines a default class for any item row</entry>
+ <entry>Defines styles for a row in a target list</entry>
</row>
<row>
<entry>rich-shuttle-row-target-selected</entry>
- <entry>Defines class to be additionally added to selected item rows</entry>
+ <entry>Defines styles for a selected row in a target list</entry>
</row>
<row>
<entry>rich-shuttle-row-target-active</entry>
- <entry>Defines class to be additionally added to active item rows</entry>
+ <entry>Defines styles for an active row in a target list</entry>
</row>
</tbody>
</tgroup>
</table>
<table>
- <title>Classes names that define a cells representations in the source list</title>
+ <title>Classes names that define a cells representations in a source list</title>
<tgroup cols="2">
<thead>
<row>
@@ -579,21 +917,21 @@
<tbody>
<row>
<entry>rich-shuttle-source-cell</entry>
- <entry>Defines a default class for any item cell</entry>
+ <entry>Defines styles for a cell in a source list</entry>
</row>
<row>
<entry>rich-shuttle-source-cell-selected</entry>
- <entry>Defines class to be additionally added to selected item cells</entry>
+ <entry>Defines styles for a selected cell in a source list</entry>
</row>
<row>
<entry>rich-shuttle-source-cell-active</entry>
- <entry>Defines class to be additionally added to active item cells</entry>
+ <entry>Defines styles for an active cell in a source list</entry>
</row>
</tbody>
</tgroup>
</table>
<table>
- <title>Classes names that define a cells representations in the target list</title>
+ <title>Classes names that define a cells representations in a target list</title>
<tgroup cols="2">
<thead>
<row>
@@ -604,15 +942,15 @@
<tbody>
<row>
<entry>rich-shuttle-target-cell</entry>
- <entry>Defines a default class for any item cell</entry>
+ <entry>Defines styles for a cell in a target list</entry>
</row>
<row>
<entry>rich-shuttle-target-cell-selected</entry>
- <entry>Defines class to be additionally added to selected item cells</entry>
+ <entry>Defines styles for a selected cell in a target list</entry>
</row>
<row>
<entry>rich-shuttle-target-cell-active</entry>
- <entry>Defines class to be additionally added to active item cells</entry>
+ <entry>Defines styles for an active cell in a target list</entry>
</row>
</tbody>
</tgroup>
@@ -629,50 +967,88 @@
<tbody>
<row>
<entry>rich-shuttle-controls</entry>
- <entry>Defines styles for a controls group.</entry>
+ <entry>Defines styles for a controls group</entry>
</row>
<row>
<entry>rich-shuttle-top</entry>
- <entry>Defines class for Top control</entry>
+ <entry>Defines styles for a "Top" control</entry>
</row>
<row>
<entry>rich-shuttle-bottom</entry>
- <entry>Defines class for Bottom control</entry>
+ <entry>Defines styles for a "Bottom" control</entry>
</row>
<row>
<entry>rich-shuttle-up</entry>
- <entry>Defines class for Up control</entry>
+ <entry>Defines styles for a "Up" control</entry>
</row>
<row>
<entry>rich-shuttle-down</entry>
- <entry>Defines class for Down control</entry>
+ <entry>Defines styles for a "Down" control</entry>
</row>
<row>
<entry>rich-shuttle-copy</entry>
- <entry>Defines class for Copy control</entry>
+ <entry>Defines styles for a "Copy" control</entry>
</row>
<row>
<entry>rich-shuttle-remove</entry>
- <entry>Defines class for Remove control</entry>
+ <entry>Defines styles for a "Remove" control</entry>
</row>
<row>
<entry>rich-shuttle-copyAll</entry>
- <entry>Defines class for copyAll control</entry>
+ <entry>Defines styles for a "copyAll" control</entry>
</row>
<row>
<entry>rich-shuttle-removeAll</entry>
- <entry>Defines class for removeAll control</entry>
+ <entry>Defines styles for a "removeAll" control</entry>
</row>
<row>
<entry>rich-shuttle-control-disabled</entry>
- <entry>Defines a class for any control in a disabled state</entry>
+ <entry>Defines styles for a control in a disabled state</entry>
</row>
</tbody>
</tgroup>
</table>
+
+ <table>
+ <title>Classes names that define a button representation</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>rich-list-shuttle-button</entry>
+ <entry>Defines styles for a button</entry>
+ </row>
+ <row>
+ <entry>rich-list-shuttle-button-disabled</entry>
+ <entry>Defines styles for a disabled button</entry>
+ </row>
+ <row>
+ <entry>rich-list-shuttle-button-light</entry>
+ <entry>Defines styles for a button highlight</entry>
+ </row>
+ <row>
+ <entry>rich-list-shuttle-button-press</entry>
+ <entry>Defines styles for a pressed button</entry>
+ </row>
+ <row>
+ <entry>rich-list-shuttle-button-content</entry>
+ <entry>Defines styles for a button content</entry>
+ </row>
+ <row>
+ <entry>rich-list-shuttle-button-selection</entry>
+ <entry>Defines styles for a button selection</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:listShuttle></property>
</emphasis> components on a page using CSS, it's enough to create classes with the same
16 years, 10 months
JBoss Rich Faces SVN: r4717 - in branches/3.1.x/ui/orderingList/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-11 10:54:38 -0500 (Tue, 11 Dec 2007)
New Revision: 4717
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
Log:
bug:RF-1593
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-12-11 15:54:38 UTC (rev 4717)
@@ -86,9 +86,11 @@
var tgtElemPaddingWidth = LayoutManager.getPaddingWidth(tgtElem, "lr");
var tgtElemMarginWidth = LayoutManager.getMarginWidth(tgtElem, "lr");
var srcWidth = srcElem.offsetWidth - srcElemBorderWidth - srcElemPaddingWidth - srcElemMarginWidth;
- return {srcWidth : srcWidth, colWidth : (srcWidth + (srcElemBorderWidth - tgtElemBorderWidth)
- + (srcElemPaddingWidth - tgtElemPaddingWidth)
- + (srcElemMarginWidth - tgtElemMarginWidth))};
+ var colWidth = srcWidth + (srcElemBorderWidth - tgtElemBorderWidth)
+ + (srcElemPaddingWidth - tgtElemPaddingWidth)
+ + (srcElemMarginWidth - tgtElemMarginWidth);
+ colWidth = (colWidth > 0) ? colWidth : 0;
+ return {srcWidth : srcWidth, colWidth : colWidth};
}
LayoutManager.getBorderWidth = function(el, side) {
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-11 15:54:38 UTC (rev 4717)
@@ -302,8 +302,10 @@
var rows = this.shuttleTbody.rows;
for (var i = startIndex; i <= endIndex; i++) {
rows[i].item.doSelect();
- this.selectedItems.push(rows[i]);
- //this.getSelectItemByNode(rows[i])._selected = true;
+ if (this.selectedItems.indexOf(rows[i]) == -1) {
+ this.selectedItems.push(rows[i]);
+ //this.getSelectItemByNode(rows[i])._selected = true;
+ }
}
this.saveState();
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-11 15:54:38 UTC (rev 4717)
@@ -161,7 +161,7 @@
this.selectAll();
Event.stop(event);
}
- Richfaces.SelectItems.doActive(this.activeItem, this.CLASSES);
+ this.activeItem.item.doActive();
this.saveState();
this.controlListManager();
break;
Modified: branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-12-11 15:27:08 UTC (rev 4716)
+++ branches/3.1.x/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2007-12-11 15:54:38 UTC (rev 4717)
@@ -89,10 +89,14 @@
<script type="text/javascript">
var clientId = '#{cId}';
Event.onReady(function() {
+ try {
var cotrolsIdPrefix = [['up', 'disup'], ['down', 'disdown'], ['last', 'dislast'], ['first','disfirst']];
var shuttle = new Richfaces.OrderingList('#{cId}', '#{cId}internal_tab', '#{cId}internal_header_tab', '#{cId}focusKeeper', cotrolsIdPrefix, '#{cId}sortLabel', #{this:getAsEventHandler(context, component, "onorderchanged")}, Richfaces.OrderingListSelectItem);
var layoutManager = new LayoutManager('#{clientId}internal_header_tab', '#{clientId}internal_tab');
layoutManager.widthSynchronization();
+ } catch (e) {
+ alert(e);
+ }
});
//setTimeout(init, 0);
</script>
16 years, 10 months
JBoss Rich Faces SVN: r4716 - branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 10:27:08 -0500 (Tue, 11 Dec 2007)
New Revision: 4716
Modified:
branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
Log:
Unimplemented methods in shale-tests added.
Modified: branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
===================================================================
--- branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java 2007-12-11 15:14:38 UTC (rev 4715)
+++ branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java 2007-12-11 15:27:08 UTC (rev 4716)
@@ -107,22 +107,7 @@
public Iterator getRequestParameterNames() {
if (null == requestParameterNamesIterator) {
- HttpServletRequest request = (HttpServletRequest)getRequest();
- final Enumeration enumer = request.getParameterNames();
-
- requestParameterNamesIterator = new Iterator() {
- public boolean hasNext() {
- return enumer.hasMoreElements();
- }
-
- public Object next() {
- return enumer.nextElement();
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
+ requestParameterNamesIterator = getRequestParameterValuesMap().keySet().iterator();
}
return requestParameterNamesIterator;
}
16 years, 10 months
JBoss Rich Faces SVN: r4715 - trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2007-12-11 10:14:38 -0500 (Tue, 11 Dec 2007)
New Revision: 4715
Modified:
trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
Log:
RF-1201
Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
===================================================================
--- trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-11 15:01:58 UTC (rev 4714)
+++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-11 15:14:38 UTC (rev 4715)
@@ -159,9 +159,12 @@
private void correctFirst(FaceletContext ctx) {
if (items != null) {
if (_begin > 0 && (_index < _begin)) {
- while ((_index < _begin) && hasNext()) {
+ while ((_index < _begin && hasNext())) {
next(ctx);
}
+ if (!hasNext()) {
+ _index = 0;
+ }
}
}
}
@@ -453,26 +456,6 @@
}
- /**
- * Sets attribute to column
- *
- * @param attr
- * @param column
- * @param ctx
- */
- private void setColumnAttribute(TagAttribute attr, UIComponent column,
- FaceletContext ctx) {
- if (attr != null) {
- if (attr.isLiteral()) {
- column.setValueExpression(attr.getLocalName(), attr
- .getValueExpression(ctx, String.class));
- } else {
- column.setValueExpression(attr.getLocalName(), attr
- .getValueExpression(ctx, ValueExpression.class));
- }
- }
- }
-
}
/**
16 years, 10 months