JBoss Rich Faces SVN: r5876 - in trunk/test-applications: facelets/src/main/java and 11 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-02-06 11:13:17 -0500 (Wed, 06 Feb 2008)
New Revision: 5876
Added:
trunk/test-applications/facelets/src/main/java/pickList/
trunk/test-applications/facelets/src/main/java/pickList/PickList.java
trunk/test-applications/facelets/src/main/webapp/PickList/
trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml
trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PickList.xml
trunk/test-applications/jsp/src/main/java/pickList/
trunk/test-applications/jsp/src/main/java/pickList/PickList.java
trunk/test-applications/jsp/src/main/webapp/PickList/
trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-PickList.xml
Modified:
trunk/test-applications/facelets/src/main/java/rich/RichBean.java
trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/jsp/src/main/java/rich/RichBean.java
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
trunk/test-applications/pom.xml
Log:
add pickList in test-application
Added: trunk/test-applications/facelets/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/pickList/PickList.java (rev 0)
+++ trunk/test-applications/facelets/src/main/java/pickList/PickList.java 2008-02-06 16:13:17 UTC (rev 5876)
@@ -0,0 +1,225 @@
+package pickList;
+
+import java.util.ArrayList;
+
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.SelectItem;
+
+public class PickList {
+ public String copyAllControlLabel;
+ public String copyControlLabel;
+ public String dir;
+ public boolean disabled;
+ public boolean displayValueOnly;
+ public boolean fastOrderControlsVisible;
+ public boolean immediate;
+ public String listsHeight;
+ public String localValueSet;
+ public String moveControlsVerticalAlign;
+ public String removeAllControlLabel;
+ public String removeControlLabel;
+ public boolean rendered;
+ public String showButtonLabels;
+ public int size;
+ public String sourceListWidth;
+ public boolean switchByClick;
+ public String targetListWidth;
+ public String title;
+ public String [] value;
+ private ArrayList<SelectItem> data;
+
+ public PickList() {
+ this.copyAllControlLabel = "copyAllControlLabel";
+ this.copyControlLabel = "copyControlLabel";
+ this.dir = "LTR";
+ this.disabled = false;
+ this.displayValueOnly = false;
+ this.fastOrderControlsVisible = true;
+ this.immediate = false;
+ this.listsHeight = "400";
+ //this.localValueSet = ;
+ this.moveControlsVerticalAlign = "30";
+ this.removeAllControlLabel = "removeAllControlLabel";
+ this.removeControlLabel = "removeControlLabel";
+ this.rendered = true;
+ this.showButtonLabels = "showButtonLabels";
+ this.size = 10;
+ this.sourceListWidth = "300";
+ this.switchByClick = false;
+ this.targetListWidth = "400";
+ this.title = "title";
+ data = new ArrayList<SelectItem>();
+ for(int i=0; i < 10; i++)
+ data.add(new SelectItem("selectItems " + i));
+
+ }
+
+ public void valueChangeListener(ValueChangeEvent event) {
+
+ }
+
+ public String getCopyAllControlLabel() {
+ return copyAllControlLabel;
+ }
+
+ public void setCopyAllControlLabel(String copyAllControlLabel) {
+ this.copyAllControlLabel = copyAllControlLabel;
+ }
+
+ public String getCopyControlLabel() {
+ return copyControlLabel;
+ }
+
+ public void setCopyControlLabel(String copyControlLabel) {
+ this.copyControlLabel = copyControlLabel;
+ }
+
+ public String getDir() {
+ return dir;
+ }
+
+ public void setDir(String dir) {
+ this.dir = dir;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public boolean isDisplayValueOnly() {
+ return displayValueOnly;
+ }
+
+ public void setDisplayValueOnly(boolean displayValueOnly) {
+ this.displayValueOnly = displayValueOnly;
+ }
+
+ public boolean isFastOrderControlsVisible() {
+ return fastOrderControlsVisible;
+ }
+
+ public void setFastOrderControlsVisible(boolean fastOrderControlsVisible) {
+ this.fastOrderControlsVisible = fastOrderControlsVisible;
+ }
+
+ public boolean isImmediate() {
+ return immediate;
+ }
+
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
+
+ public String getListsHeight() {
+ return listsHeight;
+ }
+
+ public void setListsHeight(String listsHeight) {
+ this.listsHeight = listsHeight;
+ }
+
+ public String getLocalValueSet() {
+ return localValueSet;
+ }
+
+ public void setLocalValueSet(String localValueSet) {
+ this.localValueSet = localValueSet;
+ }
+
+ public String getMoveControlsVerticalAlign() {
+ return moveControlsVerticalAlign;
+ }
+
+ public void setMoveControlsVerticalAlign(String moveControlsVerticalAlign) {
+ this.moveControlsVerticalAlign = moveControlsVerticalAlign;
+ }
+
+ public String getRemoveAllControlLabel() {
+ return removeAllControlLabel;
+ }
+
+ public void setRemoveAllControlLabel(String removeAllControlLabel) {
+ this.removeAllControlLabel = removeAllControlLabel;
+ }
+
+ public String getRemoveControlLabel() {
+ return removeControlLabel;
+ }
+
+ public void setRemoveControlLabel(String removeControlLabel) {
+ this.removeControlLabel = removeControlLabel;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ public String getSourceListWidth() {
+ return sourceListWidth;
+ }
+
+ public void setSourceListWidth(String sourceListWidth) {
+ this.sourceListWidth = sourceListWidth;
+ }
+
+ public boolean isSwitchByClick() {
+ return switchByClick;
+ }
+
+ public void setSwitchByClick(boolean switchByClick) {
+ this.switchByClick = switchByClick;
+ }
+
+ public String getTargetListWidth() {
+ return targetListWidth;
+ }
+
+ public void setTargetListWidth(String targetListWidth) {
+ this.targetListWidth = targetListWidth;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String [] getValue() {
+ return value;
+ }
+
+ public void setValue(String [] value) {
+ this.value = value;
+ }
+
+ public String getShowButtonLabels() {
+ return showButtonLabels;
+ }
+ public ArrayList<SelectItem> getData() {
+ return data;
+ }
+ public void setData(ArrayList<SelectItem> data) {
+ this.data = data;
+ }
+ public void setShowButtonLabels(String showButtonLabels) {
+ this.showButtonLabels = showButtonLabels;
+ }
+}
Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-02-06 16:05:07 UTC (rev 5875)
+++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2008-02-06 16:13:17 UTC (rev 5876)
@@ -64,6 +64,7 @@
map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true}));
map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false}));
map.add("Columns", add("/Columns/Columns", new boolean [] {true, false}));
+ map.add("A_PickList", add("/PickList/PickList", new boolean [] {false, false}));
}
public String getSrc() {
Added: trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/PickList/PickList.xhtml 2008-02-06 16:13:17 UTC (rev 5876)
@@ -0,0 +1,78 @@
+
+<f:subview xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="pickListSubviewID">
+ <rich:pickList id="pickListID" valueChangeListener="#{pickList.valueChangeListener}"
+ copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}"
+ disabled="#{pickList.copyControlLabel}" displayValueOnly="#{pickList.displayValueOnly}" dir="#{pickList.dir}"
+ fastOrderControlsVisible="#{pickList.fastOrderControlsVisible}" immediate="#{pickList.immediate}"
+ listsHeight="#{pickList.listsHeight}" moveControlsVerticalAlign="#{pickList.removeAllControlLabel}"
+ removeAllControlLabel="#{pickList.removeAllControlLabel}" removeControlLabel="#{pickList.removeControlLabel}"
+ rendered="#{pickList.rendered}" showButtonLabels="#{pickList.showButtonLabels}" sourceListWidth="#{pickList.sourceListWidth}"
+ title="#{pickList.title}" switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}"
+ size="#{pickList.size}" >
+ <f:selectItem itemValue="selectItem" itemLabel="selectItem" />
+ <f:selectItem itemValue="selectItem 1" itemLabel="selectItem 1" />
+ <f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" />
+ <f:selectItems value="#{pickList.data}" />
+ </rich:pickList>
+
+ <h:commandButton value="submit"></h:commandButton>
+
+ <h:panelGrid columns="2">
+ <h:outputText value="title:"></h:outputText>
+ <h:inputText value="#{pickList.title}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="moveControlsVerticalAlign:"></h:outputText>
+ <h:inputText value="#{pickList.moveControlsVerticalAlign}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="showButtonLabels:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.showButtonLabels}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="copyAllControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.copyAllControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="copyControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.copyControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="removeControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.removeControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="removeAllControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.removeAllControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="switchByClick:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.switchByClick}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="listsHeight:"></h:outputText>
+ <h:inputText value="#{pickList.listsHeight}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="sourceListWidth:"></h:outputText>
+ <h:inputText value="#{pickList.sourceListWidth}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="targetListWidth:"></h:outputText>
+ <h:inputText value="#{pickList.targetListWidth}" onchange="sumbmit();"></h:inputText>
+
+ <h:outputText value="fastOrderControlsVisible:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.fastOrderControlsVisible}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="dir:"></h:outputText>
+ <h:selectOneMenu value="#{pickList.dir}" onchange="submit();">
+ <f:selectItem itemValue="LTR" itemLabel="LTR" />
+ <f:selectItem itemValue="RTL" itemLabel="RTL" />
+ </h:selectOneMenu>
+
+ <h:outputText value="size:"></h:outputText>
+ <h:inputText value="#{pickList.size}" onchange="sumbit();"></h:inputText>
+
+ <h:outputText value="displayValueOnly:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.displayValueOnly}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="rendered:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.rendered}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="immediate:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.immediate}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="disabled:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox>
+ </h:panelGrid>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PickList.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PickList.xml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-PickList.xml 2008-02-06 16:13:17 UTC (rev 5876)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>pickList</managed-bean-name>
+ <managed-bean-class>pickList.PickList</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-02-06 16:05:07 UTC (rev 5875)
+++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2008-02-06 16:13:17 UTC (rev 5876)
@@ -47,7 +47,7 @@
/WEB-INF/faces-config-RichTest.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,
/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,
/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,
- /WEB-INF/faces-config-ComponentControl.xml, /WEB-INF/faces-config-Columns.xml</param-value>
+ /WEB-INF/faces-config-ComponentControl.xml, /WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml</param-value>
</context-param>
<context-param>
<param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
Added: trunk/test-applications/jsp/src/main/java/pickList/PickList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/pickList/PickList.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/pickList/PickList.java 2008-02-06 16:13:17 UTC (rev 5876)
@@ -0,0 +1,225 @@
+package pickList;
+
+import java.util.ArrayList;
+
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.model.SelectItem;
+
+public class PickList {
+ public String copyAllControlLabel;
+ public String copyControlLabel;
+ public String dir;
+ public boolean disabled;
+ public boolean displayValueOnly;
+ public boolean fastOrderControlsVisible;
+ public boolean immediate;
+ public String listsHeight;
+ public String localValueSet;
+ public String moveControlsVerticalAlign;
+ public String removeAllControlLabel;
+ public String removeControlLabel;
+ public boolean rendered;
+ public String showButtonLabels;
+ public int size;
+ public String sourceListWidth;
+ public boolean switchByClick;
+ public String targetListWidth;
+ public String title;
+ public String [] value;
+ private ArrayList<SelectItem> data;
+
+ public PickList() {
+ this.copyAllControlLabel = "copyAllControlLabel";
+ this.copyControlLabel = "copyControlLabel";
+ this.dir = "LTR";
+ this.disabled = false;
+ this.displayValueOnly = false;
+ this.fastOrderControlsVisible = true;
+ this.immediate = false;
+ this.listsHeight = "400";
+ //this.localValueSet = ;
+ this.moveControlsVerticalAlign = "30";
+ this.removeAllControlLabel = "removeAllControlLabel";
+ this.removeControlLabel = "removeControlLabel";
+ this.rendered = true;
+ this.showButtonLabels = "showButtonLabels";
+ this.size = 10;
+ this.sourceListWidth = "300";
+ this.switchByClick = false;
+ this.targetListWidth = "400";
+ this.title = "title";
+ data = new ArrayList<SelectItem>();
+ for(int i=0; i < 10; i++)
+ data.add(new SelectItem("selectItems " + i));
+
+ }
+
+ public void valueChangeListener(ValueChangeEvent event) {
+
+ }
+
+ public String getCopyAllControlLabel() {
+ return copyAllControlLabel;
+ }
+
+ public void setCopyAllControlLabel(String copyAllControlLabel) {
+ this.copyAllControlLabel = copyAllControlLabel;
+ }
+
+ public String getCopyControlLabel() {
+ return copyControlLabel;
+ }
+
+ public void setCopyControlLabel(String copyControlLabel) {
+ this.copyControlLabel = copyControlLabel;
+ }
+
+ public String getDir() {
+ return dir;
+ }
+
+ public void setDir(String dir) {
+ this.dir = dir;
+ }
+
+ public boolean isDisabled() {
+ return disabled;
+ }
+
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
+
+ public boolean isDisplayValueOnly() {
+ return displayValueOnly;
+ }
+
+ public void setDisplayValueOnly(boolean displayValueOnly) {
+ this.displayValueOnly = displayValueOnly;
+ }
+
+ public boolean isFastOrderControlsVisible() {
+ return fastOrderControlsVisible;
+ }
+
+ public void setFastOrderControlsVisible(boolean fastOrderControlsVisible) {
+ this.fastOrderControlsVisible = fastOrderControlsVisible;
+ }
+
+ public boolean isImmediate() {
+ return immediate;
+ }
+
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
+
+ public String getListsHeight() {
+ return listsHeight;
+ }
+
+ public void setListsHeight(String listsHeight) {
+ this.listsHeight = listsHeight;
+ }
+
+ public String getLocalValueSet() {
+ return localValueSet;
+ }
+
+ public void setLocalValueSet(String localValueSet) {
+ this.localValueSet = localValueSet;
+ }
+
+ public String getMoveControlsVerticalAlign() {
+ return moveControlsVerticalAlign;
+ }
+
+ public void setMoveControlsVerticalAlign(String moveControlsVerticalAlign) {
+ this.moveControlsVerticalAlign = moveControlsVerticalAlign;
+ }
+
+ public String getRemoveAllControlLabel() {
+ return removeAllControlLabel;
+ }
+
+ public void setRemoveAllControlLabel(String removeAllControlLabel) {
+ this.removeAllControlLabel = removeAllControlLabel;
+ }
+
+ public String getRemoveControlLabel() {
+ return removeControlLabel;
+ }
+
+ public void setRemoveControlLabel(String removeControlLabel) {
+ this.removeControlLabel = removeControlLabel;
+ }
+
+ public boolean isRendered() {
+ return rendered;
+ }
+
+ public void setRendered(boolean rendered) {
+ this.rendered = rendered;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ public String getSourceListWidth() {
+ return sourceListWidth;
+ }
+
+ public void setSourceListWidth(String sourceListWidth) {
+ this.sourceListWidth = sourceListWidth;
+ }
+
+ public boolean isSwitchByClick() {
+ return switchByClick;
+ }
+
+ public void setSwitchByClick(boolean switchByClick) {
+ this.switchByClick = switchByClick;
+ }
+
+ public String getTargetListWidth() {
+ return targetListWidth;
+ }
+
+ public void setTargetListWidth(String targetListWidth) {
+ this.targetListWidth = targetListWidth;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String [] getValue() {
+ return value;
+ }
+
+ public void setValue(String [] value) {
+ this.value = value;
+ }
+
+ public String getShowButtonLabels() {
+ return showButtonLabels;
+ }
+ public ArrayList<SelectItem> getData() {
+ return data;
+ }
+ public void setData(ArrayList<SelectItem> data) {
+ this.data = data;
+ }
+ public void setShowButtonLabels(String showButtonLabels) {
+ this.showButtonLabels = showButtonLabels;
+ }
+}
Modified: trunk/test-applications/jsp/src/main/java/rich/RichBean.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-02-06 16:05:07 UTC (rev 5875)
+++ trunk/test-applications/jsp/src/main/java/rich/RichBean.java 2008-02-06 16:13:17 UTC (rev 5876)
@@ -64,6 +64,7 @@
map.add("ListShuttle", add("/ListShuttle/ListShuttle", new boolean [] {true, true}));
map.add("ComponentControl", add("/ComponentControl/ComponentControl", new boolean [] {false, false}));
map.add("Columns", add("/Columns/Columns", new boolean [] {true, false}));
+ map.add("A_PickList", add("/PickList/PickList", new boolean [] {false, false}));
}
public String getSrc() {
@@ -134,6 +135,7 @@
this.log = log;
}
+ @SuppressWarnings("unchecked")
public List<SelectItem> getList(){
Iterator<String> iterator = map.getSet().iterator();
List<SelectItem> list = new ArrayList<SelectItem>();
Added: trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/PickList/PickList.jsp 2008-02-06 16:13:17 UTC (rev 5876)
@@ -0,0 +1,81 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<f:subview id="pickListSubviewID">
+ <rich:pickList id="pickListID" valueChangeListener="#{pickList.valueChangeListener}"
+ copyAllControlLabel="#{pickList.copyAllControlLabel}" copyControlLabel="#{pickList.copyControlLabel}"
+ disabled="#{pickList.copyControlLabel}" displayValueOnly="#{pickList.displayValueOnly}" dir="#{pickList.dir}"
+ fastOrderControlsVisible="#{pickList.fastOrderControlsVisible}" immediate="#{pickList.immediate}"
+ listsHeight="#{pickList.listsHeight}" moveControlsVerticalAlign="#{pickList.removeAllControlLabel}"
+ removeAllControlLabel="#{pickList.removeAllControlLabel}" removeControlLabel="#{pickList.removeControlLabel}"
+ rendered="#{pickList.rendered}" showButtonLabels="#{pickList.showButtonLabels}" sourceListWidth="#{pickList.sourceListWidth}"
+ title="#{pickList.title}" switchByClick="#{pickList.switchByClick}" targetListWidth="#{pickList.targetListWidth}"
+ size="#{pickList.size}" >
+ <f:selectItem itemValue="selectItem" itemLabel="selectItem" />
+ <f:selectItem itemValue="selectItem 1" itemLabel="selectItem 1" />
+ <f:selectItem itemValue="selectItem 2" itemLabel="selectItem 2" />
+ <f:selectItems value="#{pickList.data}" />
+ </rich:pickList>
+
+ <h:commandButton value="submit"></h:commandButton>
+
+ <h:panelGrid columns="2">
+ <h:outputText value="title:"></h:outputText>
+ <h:inputText value="#{pickList.title}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="moveControlsVerticalAlign:"></h:outputText>
+ <h:inputText value="#{pickList.moveControlsVerticalAlign}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="showButtonLabels:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.showButtonLabels}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="copyAllControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.copyAllControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="copyControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.copyControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="removeControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.removeControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="removeAllControlLabel:"></h:outputText>
+ <h:inputText value="#{pickList.removeAllControlLabel}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="switchByClick:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.switchByClick}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="listsHeight:"></h:outputText>
+ <h:inputText value="#{pickList.listsHeight}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="sourceListWidth:"></h:outputText>
+ <h:inputText value="#{pickList.sourceListWidth}" onchange="submit();"></h:inputText>
+
+ <h:outputText value="targetListWidth:"></h:outputText>
+ <h:inputText value="#{pickList.targetListWidth}" onchange="sumbmit();"></h:inputText>
+
+ <h:outputText value="fastOrderControlsVisible:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.fastOrderControlsVisible}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="dir:"></h:outputText>
+ <h:selectOneMenu value="#{pickList.dir}" onchange="submit();">
+ <f:selectItem itemValue="LTR" itemLabel="LTR" />
+ <f:selectItem itemValue="RTL" itemLabel="RTL" />
+ </h:selectOneMenu>
+
+ <h:outputText value="size:"></h:outputText>
+ <h:inputText value="#{pickList.size}" onchange="sumbit();"></h:inputText>
+
+ <h:outputText value="displayValueOnly:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.displayValueOnly}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="rendered:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.rendered}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="immediate:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.immediate}" onchange="submit();"></h:selectBooleanCheckbox>
+
+ <h:outputText value="disabled:"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickList.disabled}" onchange="submit();"></h:selectBooleanCheckbox>
+ </h:panelGrid>
+</f:subview>
\ No newline at end of file
Added: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-PickList.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-PickList.xml (rev 0)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-PickList.xml 2008-02-06 16:13:17 UTC (rev 5876)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>pickList</managed-bean-name>
+ <managed-bean-class>pickList.PickList</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-02-06 16:05:07 UTC (rev 5875)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-02-06 16:13:17 UTC (rev 5876)
@@ -12,21 +12,21 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,
- /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,
- /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,
- /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,
- /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,
- /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,
- /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,
- /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,
- /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,
- /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,
- /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,
- /WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,
- /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,
- /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,
- /WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml</param-value>
+ <param-value>/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,
+ /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,
+ /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,
+ /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,
+ /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,
+ /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,
+ /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,
+ /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,
+ /WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,
+ /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,
+ /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,
+ /WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,
+ /WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,
+ /WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,
+ /WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml</param-value>
</context-param>
<context-param>
<param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
Modified: trunk/test-applications/pom.xml
===================================================================
--- trunk/test-applications/pom.xml 2008-02-06 16:05:07 UTC (rev 5875)
+++ trunk/test-applications/pom.xml 2008-02-06 16:13:17 UTC (rev 5876)
@@ -7,7 +7,7 @@
</parent>
<repositories>
- <repository>
+ <!--repository>
<releases>
<enabled>true</enabled>
</releases>
@@ -21,7 +21,7 @@
<name>Exadel Repository for Maven Snapshots</name>
<url>http://maven.exadel.com/</url>
<layout>default</layout>
- </repository>
+ </repository-->
<repository>
<releases>
<enabled>true</enabled>
16 years, 4 months
JBoss Rich Faces SVN: r5875 - in trunk/sandbox/ui/progressBAR/src: main/java/org/richfaces/renderkit and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-06 11:05:07 -0500 (Wed, 06 Feb 2008)
New Revision: 5875
Modified:
trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml
trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js
trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java
Log:
refactoring according to changes made in component markup
Modified: trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml
===================================================================
--- trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml 2008-02-06 16:04:55 UTC (rev 5874)
+++ trunk/sandbox/ui/progressBAR/src/main/config/component/progressBar.xml 2008-02-06 16:05:07 UTC (rev 5875)
@@ -65,13 +65,11 @@
<name>completeClass</name>
<classname>java.lang.String</classname>
<description>CSS class that defines style for progress line rendering</description>
- <defaultvalue>"rich-progress-bar-completed"</defaultvalue>
</property>
<property>
<name>remainClass</name>
<classname>java.lang.String</classname>
<description>CSS class that defines style for remained part of progress bar</description>
- <defaultvalue>"rich-progress-bar-remained"</defaultvalue>
</property>
<property>
<name>initialClass</name>
Modified: trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
===================================================================
--- trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-06 16:04:55 UTC (rev 5874)
+++ trunk/sandbox/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2008-02-06 16:05:07 UTC (rev 5875)
@@ -354,7 +354,7 @@
getUtils().writeAttribute(
writer,
"class",
- "rich-progress-bar "
+ "rich-progress-bar-block rich-progress-bar-width rich-progress-bar-shell"
+ (styleClass != null ? styleClass : ""));
getUtils().writeAttribute(writer, "id", clientId);
getUtils().writeAttribute(writer, "style",
@@ -394,7 +394,7 @@
// <div class='remainClass' id='clientId:remain' style='style'></div>
writer.startElement("div", component);
getUtils().writeAttribute(writer, "class",
- remainClass + " rich-progress-bar-base");
+ "rich-progress-bar-width rich-progress-bar-remained rich-progress-bar-padding " + remainClass);
getUtils().writeAttribute(writer, "id", clientId + ":remain");
getUtils().writeAttribute(writer, "style", style);
writer.endElement("div");
@@ -410,7 +410,7 @@
// <div class='completeClass' id='clientId:complete' style='style'></div>
writer.startElement("div", component);
getUtils().writeAttribute(writer, "class",
- completeClass + " rich-progress-bar-base");
+ "rich-progress-bar-height rich-progress-bar-width rich-progress-bar-completed rich-progress-bar-padding " + completeClass);
getUtils().writeAttribute(writer, "id", clientId + ":complete");
getUtils().writeAttribute(writer, "style", style);
writer.endElement("div");
Modified: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss
===================================================================
--- trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2008-02-06 16:04:55 UTC (rev 5874)
+++ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/css/progressBar.xcss 2008-02-06 16:05:07 UTC (rev 5875)
@@ -6,19 +6,27 @@
component="org.richfaces.component.UIProgressBar">
<f:verbatim>
+
+body{margin : 20px}
+*{font-family : verdana; font-size : 11px}
+
+.rich-progress-bar-height{height : 13px;}
+.rich-progress-bar-width{width : 200px}
+.rich-progress-bar-block{white-space : nowrap;}
+.rich-progress-bar-uploaded{overflow : hidden; position : absolute; top : 0px; left : 0px;}
+.rich-progress-bar-shell{position : relative; margin-bottom : 2px; border : 1px solid;}
+.rich-progress-bar-remained{text-align : center; font-weight : bold; position : relative;}
+.rich-progress-bar-completed{text-align : center; font-weight : bold; background-repeat : repeat-x;}
+.rich-progress-bar-padding{padding: 0px}
-
-.rich-progress-bar-uploaded{overflow : hidden; position : absolute; border-style: solid; border-width: 1px 0px 1px 1px; height : 16px;}
-.rich-progress-bar{position : relative; margin-bottom : 2px; height : 16px; width : 200px; white-space: nowrap;}
-.rich-progress-bar-base{text-align : center; position : absolute; height : 16px; width : 200px; font-weight : bold;}
-.rich-progress-bar-remained{border : 1px solid; color : #000000;}
-.rich-progress-bar-completed{background-repeat : repeat-x; repeat-y;}
-
</f:verbatim>
+ <u:selector name=".rich-progress-bar-shell">
+ <u:style name="border-color" skin="panelBorderColor" />
+ </u:selector>
+
<u:selector name=".rich-progress-bar-remained">
<u:style name="background-color" skin="controlBackgroundColor" />
- <u:style name="border-color" skin="panelBorderColor" />
<u:style name="text-color" skin="controlTextColor" />
</u:selector>
Modified: trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js
===================================================================
--- trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2008-02-06 16:04:55 UTC (rev 5874)
+++ trunk/sandbox/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2008-02-06 16:05:07 UTC (rev 5875)
@@ -57,9 +57,9 @@
this.updateStyle(data['style']);
this.setValue(data['percent']);
if (!data['enabled']) { this.disable(); }
- this.updateClassName($(this.id + ":complete"), data['completeClass'], "rich-progress-bar-base");
- this.updateClassName($(this.id + ":remain"), data['remainClass'], "rich-progress-bar-base");
- this.updateClassName($(this.id), data['styleClass'], "rich-progress-bar");
+ this.updateClassName($(this.id + ":complete"), data['completeClass']);
+ this.updateClassName($(this.id + ":remain"), data['remainClass']);
+ this.updateClassName($(this.id), data['styleClass']);
if (this.options.pollinterval != data['interval']) {
this.options.pollinterval = data['interval'];
@@ -79,10 +79,11 @@
if (d) d.style.cssText = style;
}
},
- updateClassName: function (o, newName, defaultClass) {
+ updateClassName: function (o, newName) {
+ if (!newName) return;
if (o && o.className) {
if (o.className.indexOf(newName) < 0){
- o.className = newName + " "+ defaultClass;
+ o.className = o.className + " " + newName;
}
}
},
Modified: trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java
===================================================================
--- trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java 2008-02-06 16:04:55 UTC (rev 5874)
+++ trunk/sandbox/ui/progressBAR/src/test/java/org/richfaces/sandbox/ProgressBarComponentTest.java 2008-02-06 16:05:07 UTC (rev 5875)
@@ -96,7 +96,7 @@
assertTrue(classAttr.contains("rich-progress-bar"));
HtmlElement node = (HtmlElement)progress.getHtmlElementById(clientId + ":remain");
- assertTrue(node.getAttributeValue("class").contains("rich-progress-bar-base"));
+ assertTrue(node.getAttributeValue("class").indexOf("rich-progress-bar-remained") != -1);
node = (HtmlElement) progress.getLastChild();
assertTrue("span".equalsIgnoreCase(node.getTagName()));
16 years, 4 months
JBoss Rich Faces SVN: r5874 - trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-02-06 11:04:55 -0500 (Wed, 06 Feb 2008)
New Revision: 5874
Modified:
trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp
Log:
refactoring according to changes made in component markup
Modified: trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp 2008-02-06 15:41:21 UTC (rev 5873)
+++ trunk/sandbox/samples/progressBarDemo/src/main/webapp/pages/index.jsp 2008-02-06 16:04:55 UTC (rev 5874)
@@ -42,13 +42,12 @@
<progressBar:progressBar value="#{bean.incValue}" enabled="#{bean.enabled}" id="progrs"
interval="700"
- styleClass="main"
reRender="per1"
reRenderAfterComplete="per2"
mode="#{bean.modeString}"
progressVar="percent"
parameters="text:'crack'"
- style="width: 300px; height: 18px"
+ style="width: 300px; height: 15px;"
>
<f:facet name="initial">
<h:outputText value="Process not started"></h:outputText>
@@ -56,7 +55,7 @@
<f:facet name="complete">
<h:outputText value="Process completed"></h:outputText>
</f:facet>
- <h:outputText style="color: green" value="{value}%"></h:outputText>
+ <h:outputText value="{value}%"></h:outputText>
</progressBar:progressBar>
<br clear="all"/>
<table><tr>
16 years, 4 months
JBoss Rich Faces SVN: r5873 - trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-02-06 10:41:21 -0500 (Wed, 06 Feb 2008)
New Revision: 5873
Modified:
trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java
Log:
http://jira.jboss.com/jira/browse/RF-2183
Modified: trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java
===================================================================
--- trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java 2008-02-06 15:41:16 UTC (rev 5872)
+++ trunk/ui/listShuttle/src/main/java/org/richfaces/renderkit/ListShuttleControlsHelper.java 2008-02-06 15:41:21 UTC (rev 5873)
@@ -72,8 +72,17 @@
public final static String DISABLED_STYLE_PREF = "-disabled";
+ public final static String NAME_COPYALL = "copyAll";
+ public final static String NAME_COPYALL_DIS = "disabledCopy";
+ public final static String NAME_COPY = "copy";
+ public final static String NAME_COPY_DIS = "disabledCopy";
+ public final static String NAME_REMOVEALL = "removeAll";
+ public final static String NAME_REMOVEALL_DIS = "disabledCopyAll";
+ public final static String NAME_REMOVE_DIS = "disabledRemove";
+ public final static String NAME_REMOVE = "remove";
+
protected static final OrderingComponentRendererBase.ControlsHelper[] HELPERS = new OrderingComponentRendererBase.ControlsHelper[] {
- new OrderingComponentRendererBase.ControlsHelper("copyAll", "COPY_ALL_LABEL", DEFAULT_LABEL_COPY_ALL, ListShuttleIconCopyAll.class.getName(), FACET_COPY_ALL,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_COPYALL, "COPY_ALL_LABEL", DEFAULT_LABEL_COPY_ALL, ListShuttleIconCopyAll.class.getName(), FACET_COPY_ALL,
"-copyall", ATTRIBUTE_CLASS_COPY_ALL_CONTROL, "",
CONTROL_ID_COPY_ALL, ATTRIBUTE_CE_ONCOPYALLCLICK, true, "copyAll".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -82,7 +91,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledCopyAll", "COPY_ALL_LABEL", DEFAULT_LABEL_COPY_ALL, ListShuttleIconCopyAllDisabled.class.getName(), FACET_DIS_COPY_ALL,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_COPYALL_DIS, "COPY_ALL_LABEL", DEFAULT_LABEL_COPY_ALL, ListShuttleIconCopyAllDisabled.class.getName(), FACET_DIS_COPY_ALL,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_COPY_ALL), null, false, "copyAll".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -91,7 +100,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("copy", "COPY_LABEL", DEFAULT_LABEL_COPY, ListShuttleIconCopy.class.getName(), FACET_COPY,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_COPY, "COPY_LABEL", DEFAULT_LABEL_COPY, ListShuttleIconCopy.class.getName(), FACET_COPY,
"-copy", ATTRIBUTE_CLASS_COPY_CONTROL, "",
CONTROL_ID_COPY, ATTRIBUTE_CE_ONCOPYCLICK ,true, "copy".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -100,7 +109,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledCopy", "COPY_LABEL", DEFAULT_LABEL_COPY, ListShuttleIconCopyDisabled.class.getName(), FACET_DIS_COPY,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_COPY_DIS, "COPY_LABEL", DEFAULT_LABEL_COPY, ListShuttleIconCopyDisabled.class.getName(), FACET_DIS_COPY,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_COPY), null, false, "copy".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -109,7 +118,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("remove", "REMOVE_LABEL", DEFAULT_LABEL_REMOVE, ListShuttleIconRemove.class.getName(), FACET_REMOVE,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_REMOVE, "REMOVE_LABEL", DEFAULT_LABEL_REMOVE, ListShuttleIconRemove.class.getName(), FACET_REMOVE,
"-remove", ATTRIBUTE_CLASS_REMOVE_CONTROL, "",
CONTROL_ID_REMOVE, ATTRIBUTE_CE_ONREMOVECLICK, true, "remove".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -118,7 +127,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledRemove", "REMOVE_LABEL", DEFAULT_LABEL_REMOVE, ListShuttleIconRemoveDisabled.class.getName(), FACET_DIS_REMOVE,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_REMOVE_DIS, "REMOVE_LABEL", DEFAULT_LABEL_REMOVE, ListShuttleIconRemoveDisabled.class.getName(), FACET_DIS_REMOVE,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_REMOVE), null, false, "remove".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -127,7 +136,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("removeAll", "REMOVE_ALL_LABEL", DEFAULT_LABEL_REMOVE_ALL, ListShuttleIconRemoveAll.class.getName(), FACET_REMOVE_ALL,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_REMOVEALL, "REMOVE_ALL_LABEL", DEFAULT_LABEL_REMOVE_ALL, ListShuttleIconRemoveAll.class.getName(), FACET_REMOVE_ALL,
"-removeall", ATTRIBUTE_CLASS_REMOVE_ALL_CONTROL, "",
CONTROL_ID_REMOVE_ALL, ATTRIBUTE_CE_ONREMOVEALLCLICK, true, "removeAll".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
@@ -136,7 +145,7 @@
}
},
- new OrderingComponentRendererBase.ControlsHelper("disabledRemoveAll", "REMOVE_ALL_LABEL", DEFAULT_LABEL_REMOVE_ALL, ListShuttleIconRemoveAllDisabled.class.getName(), FACET_DIS_REMOVE_ALL,
+ new OrderingComponentRendererBase.ControlsHelper(NAME_REMOVEALL_DIS, "REMOVE_ALL_LABEL", DEFAULT_LABEL_REMOVE_ALL, ListShuttleIconRemoveAllDisabled.class.getName(), FACET_DIS_REMOVE_ALL,
"-disabled", ATTRIBUTE_CLASS_DISABLED_CONTROL, DISABLED_STYLE_PREF,
DIS_CONTROL_ID_PREFIX.concat(CONTROL_ID_REMOVE_ALL), null, false, "removeAll".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX)) {
16 years, 4 months
JBoss Rich Faces SVN: r5872 - trunk/ui/pickList/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-02-06 10:41:16 -0500 (Wed, 06 Feb 2008)
New Revision: 5872
Modified:
trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-2183
Modified: trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java
===================================================================
--- trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-02-06 15:40:59 UTC (rev 5871)
+++ trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListRenderer.java 2008-02-06 15:41:16 UTC (rev 5872)
@@ -134,7 +134,8 @@
Set lookupSet = PickListUtils.getSubmittedOrSelectedValuesAsSet(true, component, context, converter);
List selectItemsForSelectedValues = selectItemsForSelectedList(context, component, selectItemsList, converter, lookupSet); //TODO: optimaze
List selectItemsForAvailableList = selectItemsForAvailableList(context, component, selectItemsList, selectItemsForSelectedValues, converter);
-
+ isSelectedList = !selectItemsForSelectedValues.isEmpty();
+ isAvailableList = !selectItemsForAvailableList.isEmpty();
List selectItemList = null;
if (source) {
selectItemList = selectItemsForAvailableList;
@@ -297,9 +298,9 @@
boolean enable;
for (int i = 0; i < SHUTTLE_HELPERS.length; i++) {
OrderingComponentRendererBase.ControlsHelper helper = SHUTTLE_HELPERS[i];
- if (helper.getDefaultText().equals(ListShuttleControlsHelper.DEFAULT_LABEL_REMOVE_ALL)) {
+ if (helper.getName().equals(ListShuttleControlsHelper.NAME_REMOVEALL)) {
enable = isSelectedList;
- } else if (helper.getDefaultText().equals(ListShuttleControlsHelper.DEFAULT_LABEL_COPY_ALL)) {
+ } else if (helper.getName().equals(ListShuttleControlsHelper.NAME_COPYALL)) {
enable = isAvailableList;
} else {
if (helper.getButtonStyleClass().equals(ListShuttleControlsHelper.DISABLED_STYLE_PREF)) {
16 years, 4 months
JBoss Rich Faces SVN: r5871 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-02-06 10:40:59 -0500 (Wed, 06 Feb 2008)
New Revision: 5871
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
Log:
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2008-02-06 15:40:13 UTC (rev 5870)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2008-02-06 15:40:59 UTC (rev 5871)
@@ -123,7 +123,7 @@
<property><a4j:repeat></property>
</emphasis> component and as a result it could be partially updated with Ajax. <emphasis>
<property>"ajaxKeys"</property>
- </emphasis> attribute allows to define rows that are updated after an Ajax request.</para>
+ </emphasis> attribute allows to define row keys that are updated after an Ajax request.</para>
<para>Here is an example:</para>
<para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2008-02-06 15:40:13 UTC (rev 5870)
+++ trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2008-02-06 15:40:59 UTC (rev 5871)
@@ -59,7 +59,7 @@
<title>Key attributes and ways of usage</title>
<para>The main difference of this component from iterative components of other libraries is a special <emphasis >
<property>"ajaxKeys"</property>
- </emphasis> attribute. This attribute defines strings that are updated after an Ajax request. As a result it becomes easier to update several child components separately without updating the whole page.</para>
+ </emphasis> attribute. This attribute defines row keys that are updated after an Ajax request. As a result it becomes easier to update several child components separately without updating the whole page.</para>
<programlisting role="XML"><![CDATA[...
<a4j:poll intervall="1000" action="#{repeater.action}" reRender="text">
@@ -93,7 +93,7 @@
<title>Note:</title>
<para>The <emphasis role="bold">
<property><a4j:repeater></property>
- </emphasis> component is defined as fully updated, but really updated there are only the strings which rowKeys includes into the set <emphasis >
+ </emphasis> component is defined as fully updated, but really updated there are only the row keys which rowKeys includes into the set <emphasis >
<property>"ajaxRowSet"</property>
</emphasis> defined in the <emphasis >
<property>"ajaxKeys"</property>
16 years, 4 months
JBoss Rich Faces SVN: r5870 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-02-06 10:40:13 -0500 (Wed, 06 Feb 2008)
New Revision: 5870
Modified:
trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
Log:
http://jira.jboss.com/jira/browse/RF-2168 ajaxKeys attribute description changed in components description
Modified: trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2008-02-06 15:39:45 UTC (rev 5869)
+++ trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2008-02-06 15:40:13 UTC (rev 5870)
@@ -91,7 +91,7 @@
<property><a4j:repeat></property>
</emphasis> component and as a result it could be partially updated with Ajax. <emphasis>
<property>"ajaxKeys"</property>
- </emphasis> attribute allows to define rows that is updated after an Ajax request.</para>
+ </emphasis> attribute allows to define row keys that is updated after an Ajax request.</para>
<para>Here is an example:</para>
16 years, 4 months
JBoss Rich Faces SVN: r5869 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2008-02-06 10:39:45 -0500 (Wed, 06 Feb 2008)
New Revision: 5869
Modified:
trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
Log:
http://jira.jboss.com/jira/browse/RF-2168 ajaxKeys attribute description changed in components description
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2008-02-06 14:57:49 UTC (rev 5868)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataOrderedList.xml 2008-02-06 15:39:45 UTC (rev 5869)
@@ -125,7 +125,7 @@
<property><a4j:repeat></property>
</emphasis> component and as a result it could be partially updated with Ajax. <emphasis>
<property>"ajaxKeys"</property>
- </emphasis> attribute allows to define rows that are updated after an Ajax request.</para>
+ </emphasis> attribute allows to define row keys that are updated after an Ajax request.</para>
<para>Here is an example:</para>
<para>
16 years, 4 months
JBoss Rich Faces SVN: r5868 - management/design/calendar/markup.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-02-06 09:57:49 -0500 (Wed, 06 Feb 2008)
New Revision: 5868
Modified:
management/design/calendar/markup/calendar_div_time_chooser.html
management/design/calendar/markup/calendar_div_year_chooser.html
Log:
http://jira.jboss.com/jira/browse/RF-2172
Modified: management/design/calendar/markup/calendar_div_time_chooser.html
===================================================================
--- management/design/calendar/markup/calendar_div_time_chooser.html 2008-02-06 14:56:26 UTC (rev 5867)
+++ management/design/calendar/markup/calendar_div_time_chooser.html 2008-02-06 14:57:49 UTC (rev 5868)
@@ -3,7 +3,7 @@
<html>
<head>
<title>calendar</title>
-<style>
+<style>
*{
font-size : 11px; /*generalSizeFont*/
font-family : verdana; /*generalFamilyFont*/
Modified: management/design/calendar/markup/calendar_div_year_chooser.html
===================================================================
--- management/design/calendar/markup/calendar_div_year_chooser.html 2008-02-06 14:56:26 UTC (rev 5867)
+++ management/design/calendar/markup/calendar_div_year_chooser.html 2008-02-06 14:57:49 UTC (rev 5868)
@@ -3,7 +3,7 @@
<html>
<head>
<title>calendar</title>
-<style>
+<style>
*{
font-size : 11px; /*generalSizeFont*/
font-family : verdana; /*generalFamilyFont*/
16 years, 4 months
JBoss Rich Faces SVN: r5867 - management/design/calendar/markup.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-02-06 09:56:26 -0500 (Wed, 06 Feb 2008)
New Revision: 5867
Modified:
management/design/calendar/markup/calendar_div_time_chooser.html
management/design/calendar/markup/calendar_div_year_chooser.html
Log:
Modified: management/design/calendar/markup/calendar_div_time_chooser.html
===================================================================
--- management/design/calendar/markup/calendar_div_time_chooser.html 2008-02-06 14:26:27 UTC (rev 5866)
+++ management/design/calendar/markup/calendar_div_time_chooser.html 2008-02-06 14:56:26 UTC (rev 5867)
@@ -202,7 +202,7 @@
border-left : 1px solid #FFFFFF; /*tableBackgroundColor*/
border-right : 1px solid #C0C0C0; /*panelBorderColor*/
border-bottom : 1px solid #C0C0C0; /*panelBorderColor*/
- padding : 2px;
+ padding : 2px 7px 2px 7px;
white-space : nowrap;
cursor : hand;
}
@@ -213,20 +213,12 @@
border-right : 1px solid #FFFFFF; /*tableBackgroundColor*/
border-left : 1px solid #C0C0C0; /*panelBorderColor*/
border-top : 1px solid #C0C0C0; /*panelBorderColor*/
- padding : 2px;
+ padding : 2px 7px 2px 7px;
white-space : nowrap;
text-align : center;
cursor : hand;
}
-.time_btn_cancel{
- width : 45;
- float : right
-}
-.time_btn_ok{
- width : 45;
-}
-
.calendar_time_shadow{
position : absolute;
background : #FFFFFF; /*tableBackgroundColor*/
@@ -249,11 +241,11 @@
text-align : center;
white-space : nowrap;
}
-.calendar_time_layout_cancel{
+.calendar_time_layout_ok{
padding : 0px 1px 7px 7px;
text-align : right
}
-.calendar_time_layout_ok{
+.calendar_time_layout_cancel{
padding : 0px 7px 7px 1px;
text-align : left
}
@@ -519,14 +511,14 @@
</td>
</tr>
<tr>
- <td class="calendar_time_layout_cancel">
- <div class="time_btn time_btn_cancel" onmouseover="this.className='time_btn time_btn_cancel'" onmouseout="this.className='time_btn time_btn_cancel'" onmousedown="this.className='time_btn_press time_btn_cancel'" onmouseup="this.className='time_btn time_btn_cancel'">
- Cancel
+ <td class="calendar_time_layout_ok">
+ <div class="time_btn" onmouseover="this.className='time_btn'" onmouseout="this.className='time_btn'" onmousedown="this.className='time_btn_press'" onmouseup="this.className='time_btn'">
+ Ok
</div>
</td>
- <td class="calendar_time_layout_ok">
- <div class="time_btn time_btn_ok" onmouseover="this.className='time_btn time_btn_ok'" onmouseout="this.className='time_btn time_btn_ok'" onmousedown="this.className='time_btn_press time_btn_ok'" onmouseup="this.className='time_btn time_btn_ok'">
- Ok
+ <td class="calendar_time_layout_cancel">
+ <div class="time_btn" onmouseover="this.className='time_btn'" onmouseout="this.className='time_btn'" onmousedown="this.className='time_btn_press'" onmouseup="this.className='time_btn'">
+ Cancel
</div>
</td>
</tr>
Modified: management/design/calendar/markup/calendar_div_year_chooser.html
===================================================================
--- management/design/calendar/markup/calendar_div_year_chooser.html 2008-02-06 14:26:27 UTC (rev 5866)
+++ management/design/calendar/markup/calendar_div_year_chooser.html 2008-02-06 14:56:26 UTC (rev 5867)
@@ -283,16 +283,14 @@
}
.calendar_yc_btn{
- width : 40px;
- padding: 2px;
+ padding: 2px 8px 2px 8px;
text-align : center;
border : 0px solid #c0c0c0; /*panelBorderColor*/
}
.calendar_yc_btn_over{
background : #C7D7EC; /*from generalBackgroundColor to tabBackgroundColor*/
- width : 40px;
- padding: 1px;
+ padding: 1px 7px 1px 7px;
text-align : center;
border-top : 1px solid #FFFFFF; /*tableBackgroundColor*/
border-left : 1px solid #FFFFFF; /*tableBackgroundColor*/
@@ -302,8 +300,7 @@
}
.calendar_yc_btn_press{
background : #C7D7EC; /*from tabBackgroundColor to generalBackgroundColor*/
- width : 40px;
- padding: 1px;
+ padding: 1px 7px 1px 7px;
text-align : center;
border-bottom : 1px solid #FFFFFF; /*tableBackgroundColor*/
border-right : 1px solid #FFFFFF; /*tableBackgroundColor*/
@@ -680,12 +677,12 @@
</tr>
<tr>
<td class="calendar_yc_footer" colspan="4">
- <table border="0" cellpadding="2" cellspacing="0" align="center">
+ <table border="0" cellpadding="2" cellspacing="0" align="center" width="100%">
<tr>
- <td>
+ <td width="50%">
<div class="calendar_yc_btn_over" onmouseover="this.className='calendar_yc_btn_over'" onmouseout="this.className='calendar_yc_btn_over'" onmousedown="this.className='calendar_yc_btn_press'">Ok</div>
</td>
- <td>
+ <td width="50%">
<div class="calendar_yc_btn_over" onmouseover="this.className='calendar_yc_btn_over'" onmouseout="this.className='calendar_yc_btn_over'" onmousedown="this.className='calendar_yc_btn_press'">Close</div>
</td>
</tr>
16 years, 4 months