richfaces-svn-commits
December 2007
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 715 discussions
JBoss Rich Faces SVN: r4774 - branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2007-12-12 09:22:58 -0500 (Wed, 12 Dec 2007)
New Revision: 4774
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/usage.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-1496
language on demo page is checked
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/usage.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/usage.xhtml 2007-12-12 13:57:19 UTC (rev 4773)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/contextMenu/usage.xhtml 2007-12-12 14:22:58 UTC (rev 4774)
@@ -8,12 +8,10 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
-
-
- <p>RichFaces Context menu is a component that allows to organize the hierarchical cointext menus
+ <p>RichFaces Context menu is a component that allows to organize the hierarchical context menus
similar to one that almost every desktop application has.
</p>
- <p>Context Menu can contains a set of Menu Items, Menu Groups and Menu Separators.
+ <p>Context Menu can contain a set of Menu Items, Menu Groups and Menu Separators.
Usage of these components are similar to usage in RichFaces Drop Down Menu.
</p>
<p><b>Example:</b>To call the menu - perform the right click on the picture</p>
@@ -26,33 +24,33 @@
</div>
<p>
- In this example menu just defined as nested to <b>panelGroup</b> with "picture" Id.
- You should be carefull with such definitions, because on the client - menu component
+ In this example menu is just defined as nested to <b>panelGroup</b> with "picture" Id.
+ You should be careful with such definitions, because on the client menu component
searches for the DOM element with the client Id of the parent component on the server.
- If the component doesn't encodes id on the client - it will be not found by the menu and menu
- will be attached to its closest parent in DOM tree. For example you should not define the menu as a child
+ If the component doesn't encode id on the client, it will be not found by the menu and menu
+ will be attached to its closest parent in a DOM tree. For example you should not define the menu as a child
for images components.
</p>
<p>Context menu itself is an invisible panel
- that appears after a particular client side event (onmouseover, onclick etc) occured on parent component.
+ that appears after a particular client side event (onmouseover, onclick etc) occured on a parent component.
The event is defined with an <b>event</b> attribute.</p>
<p>
- <i><b>Note:</b> As you can see from first example the component could use "oncontextmenu" event to call the Menu on right click event.
- But in this case this component should be called through <b>componentControl</b> component(as it shown at second example) rather than using a4j:support style,
- because many of the components doesn't encodes this event and in case of support-like definition - the component will not work properly.
+ <i><b>Note:</b> As you can see from the first example the component could use "oncontextmenu" event to call the Menu on right click event.
+ But in this case the component should be called via <b>componentControl</b> component (as it is shown at the second example) rather than using a4j:support style.
+ If a4j:support style is used then many of the components don't encode this event and also in case of support-like definition the component will not work properly.
</i>
</p>
<p>
Other usefull attributes are:
<ul>
<li>
- <b>disableDefaultMenu</b> - if true the event which defined on the menu
+ <b>disableDefaultMenu</b> - if it is true, the event defined on the menu
will not be handled by other client handlers except context menu handler. You
- may see on the first example that standard browser menu isn't called
+ may see on the first example that a standard browser menu isn't called
after right click.
</li>
<li>
- <b>attached</b> if true - the menu attached to parent component. In other case
+ <b>attached</b> - if it is true, the menu is attached to parent component. In other case
it should be called via JS API (using componentControl)
</li>
</ul>
@@ -62,13 +60,13 @@
support.
</p>
<p>
- And the main difference from drop down menu - context menu could be defined once on the page
+ And the main difference from drop down menu is that a context menu could be defined once on the page
and used by different components. Single instance of the menu will be created and shared between the components.
</p>
<p>
- To customize shared menu for every component macrosubstitutions could be used.
+ To customize shared menu for every component, macrosubstitutions could be used.
<b>ComponentControl</b> component could be used to call the instance of the menu for
- the concrete component. <b>f:param</b> components could be used to add parameters to menu.
+ the particular component. <b>f:param</b> components could be used to add parameters to menu.
</p>
<p>
<b>Example:</b> To call the menu - click any car row.
@@ -79,7 +77,7 @@
</ui:include>
<p>
Pay your attention to the source code. Inside the table you may see component control that calls the menu.
- Menu recreated after every call on the client and new <b>{car}</b> and <b>{model}</b> values inserted to the menu.
+ Menu recreated after every call on the client and new <b>{car}</b> and <b>{model}</b> values are inserted into the menu.
</p>
<p>Look through componentControl demo page for more information.</p>
</ui:define>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4773 - branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-12-12 08:57:19 -0500 (Wed, 12 Dec 2007)
New Revision: 4773
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
Log:
fixed web.xml
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-12-12 13:42:03 UTC (rev 4772)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-12-12 13:57:19 UTC (rev 4773)
@@ -43,14 +43,14 @@
<param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
<param-value>NEKO</param-value>
</context-param>
- <context-param>
+ <!--context-param>
<param-name>org.richfaces.LoadStyleStrategy</param-name>
<param-value>ALL</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.LoadScriptStrategy</param-name>
<param-value>ALL</param-value>
- </context-param>
+ </context-param-->
<filter>
<display-name>Ajax4jsf Filter</display-name>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4772 - trunk/framework/api/src/main/java/org/richfaces/event.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-12-12 08:42:03 -0500 (Wed, 12 Dec 2007)
New Revision: 4772
Modified:
trunk/framework/api/src/main/java/org/richfaces/event/DataFilterSliderEvent.java
Log:
RF-1365
Modified: trunk/framework/api/src/main/java/org/richfaces/event/DataFilterSliderEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/DataFilterSliderEvent.java 2007-12-12 13:37:01 UTC (rev 4771)
+++ trunk/framework/api/src/main/java/org/richfaces/event/DataFilterSliderEvent.java 2007-12-12 13:42:03 UTC (rev 4772)
@@ -22,14 +22,15 @@
package org.richfaces.event;
import javax.faces.component.UIComponent;
+import javax.faces.event.FacesListener;
import javax.faces.event.PhaseId;
-import javax.faces.event.FacesListener;
-import javax.faces.event.FacesEvent;
+import org.ajax4jsf.event.AjaxEvent;
+
/**
* @author Wesley Hales
*/
-public class DataFilterSliderEvent extends FacesEvent {
+public class DataFilterSliderEvent extends AjaxEvent {
private Integer oldSliderVal;
private Integer newSliderVal;
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4771 - in trunk/ui/dataFilterSlider/src/main: java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-12-12 08:37:01 -0500 (Wed, 12 Dec 2007)
New Revision: 4771
Modified:
trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java
trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java
trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js
Log:
RF-1365
Modified: trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml
===================================================================
--- trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-12-12 13:32:47 UTC (rev 4770)
+++ trunk/ui/dataFilterSlider/src/main/config/component/dataFilterSlider.xml 2007-12-12 13:37:01 UTC (rev 4771)
@@ -31,8 +31,15 @@
</taghandler>
&ui_component_attributes;
+ &html_events;
&html_style_attributes;
+ &ui_command_attributes;
+ &ajax_component_attributes;
+ &html_event_handler_attributes;
+
+ &ui_component_attributes;
+
<property>
<name>handleValue</name>
<classname>java.lang.Integer</classname>
Modified: trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java
===================================================================
--- trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java 2007-12-12 13:32:47 UTC (rev 4770)
+++ trunk/ui/dataFilterSlider/src/main/java/org/richfaces/component/UIDataFltrSlider.java 2007-12-12 13:37:01 UTC (rev 4771)
@@ -33,8 +33,12 @@
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
+import javax.faces.event.PhaseId;
import javax.faces.model.ListDataModel;
+import org.ajax4jsf.component.AjaxComponent;
+import org.ajax4jsf.event.AjaxEvent;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.RendererUtils;
import org.richfaces.event.DataFilterSliderAdapter;
import org.richfaces.event.DataFilterSliderEvent;
@@ -44,7 +48,7 @@
/**
* JSF component class
*/
-public abstract class UIDataFltrSlider extends UIComponentBase implements DataFilterSliderSource {
+public abstract class UIDataFltrSlider extends UIComponentBase implements DataFilterSliderSource, AjaxComponent {
/**
* The component type for this component.
@@ -74,7 +78,13 @@
public void broadcast(FacesEvent event) throws AbortProcessingException {
super.broadcast(event);
if (event instanceof DataFilterSliderEvent){
-
+
+ FacesContext context = FacesContext.getCurrentInstance();
+ AjaxRendererUtils.addRegionByName(context, this, this.getId());
+ String forAttr = this.getFor();
+ RendererUtils rendUtil = RendererUtils.getInstance();
+ AjaxRendererUtils.addRegionByName(context, this, rendUtil.correctForIdReference(forAttr, this));
+
if(getSliderListeners().length < 1){
addSliderListener(new DataFilterSliderAdapter(getSliderListener()));
}
@@ -320,6 +330,6 @@
public void decode(FacesContext context) {
super.decode(context);
}
-
-
-}
+
+}
+
Modified: trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java
===================================================================
--- trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java 2007-12-12 13:32:47 UTC (rev 4770)
+++ trunk/ui/dataFilterSlider/src/main/java/org/richfaces/renderkit/DataFilterSliderRendererBase.java 2007-12-12 13:37:01 UTC (rev 4771)
@@ -22,8 +22,10 @@
package org.richfaces.renderkit;
import java.io.IOException;
+import java.nio.Buffer;
import java.util.Map;
+import javax.faces.FacesException;
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.component.UIInput;
@@ -34,6 +36,8 @@
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSFunctionDefinition;
import org.ajax4jsf.javascript.JSReference;
+import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.util.SelectUtils;
import org.richfaces.component.UIDataFltrSlider;
import org.richfaces.event.DataFilterSliderEvent;
@@ -95,7 +99,7 @@
}
if(slider.isOnSlideSubmit()){
- options.append(",onSlideSubmit: function(v) { updateSlider1(v);}");
+ options.append(",onSlideSubmit: function(event, v) { updateSlider1(event, v);}");
}
options.append("}");
@@ -122,12 +126,15 @@
String id = slider.getId();
- String sliderHandlerScript = "function updateSlider1(value) {\n" +
+ JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(slider,context);
+ ajaxFunction.addParameter(AjaxRendererUtils.buildEventOptions(
+ context, slider));
+ StringBuffer script= new StringBuffer();
+ ajaxFunction.appendScript(script);
+ script.append("; return false");
+ String sliderHandlerScript = "function updateSlider1(event, value) {\n" +
"$('"+ clientId +"slider_val').value = value;\n" +
- "try{\n" +
- "eval(document.forms['" + formClientId + "'].action);\n" +
- "}catch(exception){\n" +
- "}\n" +
+ script.toString() +
"}\n";
return sliderHandlerScript;
@@ -174,8 +181,9 @@
//ajaxSlider.setHandleValue(ajaxSlider.getStartRange());
} else {
dataFilterSlider.setHandleValue(newSliderVal);
+
DataFilterSliderEvent event = new DataFilterSliderEvent(dataFilterSlider, oldSliderVal, newSliderVal);
- //dataFilterSlider.queueEvent(event);
+// dataFilterSlider.queueEvent(event);
event.queue();
if (dataFilterSlider.isStoreResults()) {
dataFilterSlider.filterDataTable(newSliderVal.intValue());
@@ -209,6 +217,6 @@
}
return object != null && object.equals(Boolean.TRUE);
- }
+ }
}
Modified: trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js
===================================================================
--- trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js 2007-12-12 13:32:47 UTC (rev 4770)
+++ trunk/ui/dataFilterSlider/src/main/resources/org/richfaces/renderkit/html/scripts/scriptaculous-js-1.6.5/src/slider.js 2007-12-12 13:37:01 UTC (rev 4771)
@@ -17,7 +17,7 @@
Control.Slider.prototype = {
initialize: function(handle, track, options) {
var slider = this;
-
+
if(handle instanceof Array) {
this.handles = handle.collect( function(e) { return $(e) });
} else {
@@ -26,6 +26,7 @@
this.track = $(track);
this.options = options || {};
+ this.flag = false;
this.axis = this.options.axis || 'horizontal';
this.increment = this.options.increment || 1;
@@ -54,7 +55,7 @@
this.active = false;
this.dragging = false;
this.disabled = false;
-
+
if(this.options.disabled) this.setDisabled();
// Allowed values array
@@ -156,7 +157,8 @@
this.translateToPx(sliderValue);
this.drawSpans();
- if(!this.dragging || !this.event) this.updateFinished();
+ if((!this.dragging || !this.event)&&this.flag) this.updateFinished();
+ this.flag = true;
},
setValueBy: function(delta, handleIdx) {
this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
@@ -277,9 +279,10 @@
}
if(this.initialized) {
if (this.options.onSlideSubmit) {
- this.options.onSlideSubmit(this.values.length>1 ? this.values : this.values[0], this);
+ this.options.onSlideSubmit(event,this.values.length>1 ? this.values : this.values[0], this);
}
}
+
},
endDrag: function(event) {
if(this.active && this.dragging) {
@@ -295,11 +298,11 @@
this.updateFinished(event);
},
- updateFinished: function() {
+ updateFinished: function(event) {
if(this.initialized) {
var value = this.values.length>1 ? this.values : this.values[0];
if (this.options.onSlideSubmit) {
- this.options.onSlideSubmit(value, this);
+ this.options.onSlideSubmit(event, value, this);
}
}
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4770 - 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-12 08:32:47 -0500 (Wed, 12 Dec 2007)
New Revision: 4770
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
Log:
ctrl+a selection was corrected
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-12 13:05:14 UTC (rev 4769)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-12 13:32:47 UTC (rev 4770)
@@ -213,6 +213,7 @@
},
selectAll : function() {
+ this.resetMarked();
var startIndex = 0;
var endIndex = this.shuttleItems.length - 1;
this.selectItemRange(startIndex, endIndex);
@@ -306,10 +307,9 @@
var rows = this.shuttleTbody.rows;
for (var i = startIndex; i <= endIndex; i++) {
rows[i].item.doSelect();
- if (this.selectedItems.indexOf(rows[i]) == -1) {
+ //if (this.selectedItems.indexOf(rows[i]) == -1) {
this.selectedItems.push(rows[i]);
- //this.getSelectItemByNode(rows[i])._selected = true;
- }
+ //}
}
this.saveState();
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4769 - 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-12 08:05:14 -0500 (Wed, 12 Dec 2007)
New Revision: 4769
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
Log:
items selection by shift+click was changed.
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-12 12:05:40 UTC (rev 4768)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-12 13:05:14 UTC (rev 4769)
@@ -50,6 +50,7 @@
this.shuttleTbody = this.shuttleTable.tBodies[0];
this.activeItem = null;
+ this.pseudoActiveItem = null; //it services for items selection by Shift+click
this.items = null;
this.retrieveShuttleItems(containerId, controlClass);
@@ -60,6 +61,11 @@
this.shuttleTable.observe("click", this.clckHandler);
},
+ setActiveItem : function(newActiveItem) {
+ this.pseudoActiveItem = newActiveItem;
+ this.activeItem = newActiveItem;
+ },
+
retrieveShuttleItems : function(containerId, controlClass) {
var rows = this.shuttleTbody.rows;
this.shuttleItems = new Array();
@@ -73,7 +79,7 @@
this.selectedItems.push(row);
}
if (item.isActive()) {
- this.activeItem = row;
+ this.setActiveItem(row);
}
this.shuttleItems[i] = item;
}
@@ -126,8 +132,7 @@
onfocusHandler: function (event) {
if (!this.activeItem && this.shuttleItems.length != 0) {
- this.activeItem = this.shuttleItems[0]._node;
-
+ this.setActiveItem(this.shuttleItems[0]._node);
}
if (this.activeItem) {
@@ -144,12 +149,13 @@
if (event.ctrlKey) {
this.addSelectedItem(activeElem);
- this.activeItem = activeElem;
+ this.setActiveItem(activeElem);
} else if (event.shiftKey) {
this.selectItemGroup(activeElem);
+ this.activeItem = activeElem; //given event works with pseudoActiveItem
} else {
this.selectionItem(activeElem);
- this.activeItem = activeElem;
+ this.setActiveItem(activeElem);
}
@@ -202,7 +208,7 @@
newItem.item.doSelect();
newItem.item.doActive();
- this.activeItem = newItem;
+ this.setActiveItem(newItem);
this.selectedItems.push(newItem);
},
@@ -279,7 +285,7 @@
*/
selectItemGroup : function(currentItem) {
//FIXME
- var activeItemIndex = this.activeItem.rowIndex;
+ var activeItemIndex = this.pseudoActiveItem.rowIndex;
var startIndex;
var endIndex;
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4768 - branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-12 07:05:40 -0500 (Wed, 12 Dec 2007)
New Revision: 4768
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
Log:
firing onlistchanged was changed
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-12 11:42:57 UTC (rev 4767)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-12 12:05:40 UTC (rev 4768)
@@ -179,6 +179,8 @@
this.targetLayoutManager.widthSynchronization();
this.sourceLayoutManager.widthSynchronization();
+
+ $(this.containerId).fire("rich:onlistchanged", {});
}
}
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4767 - in branches/3.1.x/samples/richfaces-demo/src/main: java/org/richfaces/demo and 16 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: maksimkaszynski
Date: 2007-12-12 06:42:57 -0500 (Wed, 12 Dec 2007)
New Revision: 4767
Added:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif
Removed:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif
branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java
branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
Log:
Merged demo with trunk
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/datatablescroller/DataTableScrollerBean.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -4,13 +4,15 @@
package org.richfaces.datatablescroller;
import java.math.BigDecimal;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
import java.util.List;
import java.util.Random;
import org.richfaces.demo.datafilterslider.DemoInventoryItem;
+import org.richfaces.model.ScrollableTableDataModel.SimpleRowKey;
+import org.richfaces.model.selection.SimpleSelection;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
@@ -18,6 +20,8 @@
*
*/
public class DataTableScrollerBean {
+ private SimpleSelection selection = new SimpleSelection();
+ private ArrayList<DemoInventoryItem> selectedCars = new ArrayList<DemoInventoryItem>();
private static int DECIMALS = 1;
private static int ROUNDING_MODE = BigDecimal.ROUND_HALF_UP;
@@ -146,4 +150,32 @@
b[i] = (byte)rand('A', 'Z');
return new String(b);
}
+
+ public SimpleSelection getSelection() {
+ return selection;
+ }
+
+ public void setSelection(SimpleSelection selection) {
+ System.out.println("Setting Started");
+ this.selection = selection;
+ System.out.println("Setting Complete");
+ }
+
+ public String takeSelection() {
+ getSelectedCars().clear();
+ Iterator<SimpleRowKey> iterator = getSelection().getKeys();
+ while (iterator.hasNext()){
+ SimpleRowKey key = iterator.next();
+ getSelectedCars().add(getAllCars().get(key.intValue()));
+ }
+ return null;
+ }
+
+ public ArrayList<DemoInventoryItem> getSelectedCars() {
+ return selectedCars;
+ }
+
+ public void setSelectedCars(ArrayList<DemoInventoryItem> selectedCars) {
+ this.selectedCars = selectedCars;
+ }
}
Copied: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals (from rev 4766, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,51 +0,0 @@
-package org.richfaces.demo.capitals;
-
-import java.io.Serializable;
-
-public class Capital implements Serializable {
- /**
- *
- */
- private static final long serialVersionUID = -1042449580199397136L;
- private boolean checked=false;
- private String name;
- private String state;
- private String timeZone;
-
- private final static String FILE_EXT = ".gif";
- public Capital() {
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getState() {
- return state;
- }
- public void setState(String state) {
- this.state = state;
- }
-
- private String stateNameToFileName() {
- return state.replaceAll("\\s", "").toLowerCase();
- }
-
- public String getStateFlag() {
- return "/images/capitals/" + stateNameToFileName() + FILE_EXT;
- }
-
- public String getTimeZone() {
- return timeZone;
- }
- public void setTimeZone(String timeZone) {
- this.timeZone = timeZone;
- }
- public boolean isChecked() {
- return checked;
- }
- public void setChecked(boolean checked) {
- this.checked = checked;
- }
-}
Copied: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java (from rev 4766, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,51 @@
+package org.richfaces.demo.capitals;
+
+import java.io.Serializable;
+
+public class Capital implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1042449580199397136L;
+ private boolean checked=false;
+ private String name;
+ private String state;
+ private String timeZone;
+
+ private final static String FILE_EXT = ".gif";
+ public Capital() {
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getState() {
+ return state;
+ }
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ private String stateNameToFileName() {
+ return state.replaceAll("\\s", "").toLowerCase();
+ }
+
+ public String getStateFlag() {
+ return "/images/capitals/" + stateNameToFileName() + FILE_EXT;
+ }
+
+ public String getTimeZone() {
+ return timeZone;
+ }
+ public void setTimeZone(String timeZone) {
+ this.timeZone = timeZone;
+ }
+ public boolean isChecked() {
+ return checked;
+ }
+ public void setChecked(boolean checked) {
+ this.checked = checked;
+ }
+}
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java
===================================================================
--- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,65 +0,0 @@
-package org.richfaces.demo.capitals;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.faces.FacesException;
-
-import org.apache.commons.digester.Digester;
-import org.apache.commons.digester.xmlrules.DigesterLoader;
-import org.xml.sax.SAXException;
-
-public class CapitalsBean {
- private ArrayList<Capital> capitals = new ArrayList<Capital>();
- private String capital = "";
-
- public List<Capital> autocomplete(Object suggest) {
- String pref = (String)suggest;
- ArrayList<Capital> result = new ArrayList<Capital>();
-
- Iterator<Capital> iterator = getCapitals().iterator();
- while (iterator.hasNext()) {
- Capital elem = ((Capital) iterator.next());
- if ((elem.getName() != null && elem.getName().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref))
- {
- result.add(elem);
- }
- }
- return result;
- }
-
- public CapitalsBean() {
- URL rulesUrl = getClass().getResource("capitals-rules.xml");
- Digester digester = DigesterLoader.createDigester(rulesUrl);
- digester.push(this);
- try {
- digester.parse(getClass().getResourceAsStream("capitals.xml"));
- } catch (IOException e) {
- throw new FacesException(e);
- } catch (SAXException e) {
- throw new FacesException(e);
- }
-
- }
-
- public String addCapital(Capital capital) {
- capitals.add(capital);
- return null;
- }
-
- public ArrayList<Capital> getCapitals() {
- return capitals;
- }
-
- public String getCapital() {
- return capital;
- }
-
- public void setCapital(String capital) {
- this.capital = capital;
- }
-
-}
Copied: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java (from rev 4766, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,65 @@
+package org.richfaces.demo.capitals;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.faces.FacesException;
+
+import org.apache.commons.digester.Digester;
+import org.apache.commons.digester.xmlrules.DigesterLoader;
+import org.xml.sax.SAXException;
+
+public class CapitalsBean {
+ private ArrayList<Capital> capitals = new ArrayList<Capital>();
+ private String capital = "";
+
+ public List<Capital> autocomplete(Object suggest) {
+ String pref = (String)suggest;
+ ArrayList<Capital> result = new ArrayList<Capital>();
+
+ Iterator<Capital> iterator = getCapitals().iterator();
+ while (iterator.hasNext()) {
+ Capital elem = ((Capital) iterator.next());
+ if ((elem.getName() != null && elem.getName().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref))
+ {
+ result.add(elem);
+ }
+ }
+ return result;
+ }
+
+ public CapitalsBean() {
+ URL rulesUrl = getClass().getResource("capitals-rules.xml");
+ Digester digester = DigesterLoader.createDigester(rulesUrl);
+ digester.push(this);
+ try {
+ digester.parse(getClass().getResourceAsStream("capitals.xml"));
+ } catch (IOException e) {
+ throw new FacesException(e);
+ } catch (SAXException e) {
+ throw new FacesException(e);
+ }
+
+ }
+
+ public String addCapital(Capital capital) {
+ capitals.add(capital);
+ return null;
+ }
+
+ public ArrayList<Capital> getCapitals() {
+ return capitals;
+ }
+
+ public String getCapital() {
+ return capital;
+ }
+
+ public void setCapital(String capital) {
+ this.capital = capital;
+ }
+
+}
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -100,7 +100,7 @@
public String getTagInfoLocation() {
int pos = tldDocLocation.indexOf("tlddoc");
- if (pos >= 0) {
+ if (pos > 0) {
return tldDocLocation.substring(pos);
}
return tldDocLocation;
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -28,7 +28,7 @@
}
public String updateCurrent() {
FacesContext context=FacesContext.getCurrentInstance();
- setCurrent(context.getExternalContext().getRequestParameterMap().get("current"));
+ setCurrent((String)context.getExternalContext().getRequestParameterMap().get("current"));
System.out.println("fake called.");
return null;
}
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java 2007-12-12 11:42:57 UTC (rev 4767)
@@ -13,11 +13,6 @@
*/
private static final long serialVersionUID = 1L;
- private String property;
-
- private ArrayList cities;
-
- private ArrayList data;
private ArrayList tokens;
private String rows;
@@ -30,12 +25,10 @@
private boolean check;
private String shadowDepth = Integer.toString(SuggestionBoxRenderer.SHADOW_DEPTH);
private String border = "1";
- private String width = "200";
+ private String width = "250";
private String height = "150";
private String shadowOpacity = "4";
- private static final String [] cit = {"Abba", "Abbeville", "Acworth", "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha", "Albany", "Allenhurst", "Alma", "Alpharetta", "Alston", "Amboy", "Ambrose", "Americus", "Appling", "Arlington", "Ashburn", "Athens", "Athens-Clarke County", "Atkinson", "Atlanta", "Attapulgus", "Auburn", "Augusta", "Augusta-Richmond County", "Austell", "Avondale Estates", "Axson"};
-
public SuggestionBox() {
this.rows = "0";
this.first = "0";
@@ -45,57 +38,8 @@
this.frequency = "0";
this.rules = "none";
- setCities(getAllData());
}
- public List autocomplete(Object suggest) {
- String pref = (String)suggest;
- ArrayList result = new ArrayList();
-
- Iterator iterator = getAllData().iterator();
- while (iterator.hasNext()) {
- Data elem = (Data) iterator.next();
- if ((elem != null && elem.getText().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref))
- {
- result.add(elem);
- }
- }
- return result;
- }
-
- public ArrayList getCities() {
- return cities;
- }
-
- public void setCities(ArrayList cities) {
- this.cities = cities;
- }
-
- public ArrayList getAllData() {
- ArrayList result = new ArrayList();
- for (int i = 0; i < cit.length; i++) {
- Data data = new Data(cit[i], String.valueOf(i + 1));
- result.add(data);
- }
- return result;
- }
-
- public ArrayList getData() {
- return data;
- }
-
- public void setData(ArrayList data) {
- this.data = data;
- }
-
- public String getProperty() {
- return property;
- }
-
- public void setProperty(String property) {
- this.property = property;
- }
-
public String getCellpadding() {
return cellpadding;
}
Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- <!DOCTYPE digester-rules SYSTEM "digester-rules.dtd">
--->
-
-<digester-rules>
- <pattern value="*/capital">
- <object-create-rule classname="org.richfaces.demo.capitals.Capital" />
- <bean-property-setter-rule pattern="name" propertyname="name"/>
- <bean-property-setter-rule pattern="state" propertyname="state"/>
- <bean-property-setter-rule pattern="timeZone" propertyname="timeZone"/>
- <set-next-rule methodname="addCapital"/>
- </pattern>
-</digester-rules>
\ No newline at end of file
Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals-rules.xml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ <!DOCTYPE digester-rules SYSTEM "digester-rules.dtd">
+-->
+
+<digester-rules>
+ <pattern value="*/capital">
+ <object-create-rule classname="org.richfaces.demo.capitals.Capital" />
+ <bean-property-setter-rule pattern="name" propertyname="name"/>
+ <bean-property-setter-rule pattern="state" propertyname="state"/>
+ <bean-property-setter-rule pattern="timeZone" propertyname="timeZone"/>
+ <set-next-rule methodname="addCapital"/>
+ </pattern>
+</digester-rules>
\ No newline at end of file
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<capitals>
- <capital>
- <state>Alabama</state>
- <name>Montgomery</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Alaska</state>
- <name>Juneau</name>
- <timeZone>GMT-9</timeZone>
- </capital>
- <capital>
- <state>Arizona</state>
- <name>Phoenix</name>
- <timeZone>GMT-7</timeZone>
- </capital>
- <capital>
- <state>Arkansas</state>
- <name>Little Rock</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>California</state>
- <name>Sacramento</name>
- <timeZone>GMT-8</timeZone>
- </capital>
- <capital>
- <state>Colorado</state>
- <name>Denver</name>
- <timeZone>GMT-7</timeZone>
- </capital>
- <capital>
- <state>Connecticut</state>
- <name>Hartford</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Delaware</state>
- <name>Dover</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Florida</state>
- <name>Tallahassee</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Georgia</state>
- <name>Atlanta</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Hawaii</state>
- <name>Honolulu</name>
- <timeZone>GMT-10</timeZone>
- </capital>
- <capital>
- <state>Idaho</state>
- <name>Boise</name>
- <timeZone>GMT-8</timeZone>
- </capital>
- <capital>
- <state>Illinois</state>
- <name>Springfield</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Indiana</state>
- <name>Indianapolis</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Iowa</state>
- <name>Des Moines</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Kansas</state>
- <name>Topeka</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Kentucky</state>
- <name>Frankfort</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Louisiana</state>
- <name>Baton Rouge</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Maine</state>
- <name>Augusta</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Maryland</state>
- <name>Annapolis</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Massachusetts</state>
- <name>Boston</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Michigan</state>
- <name>Lansing</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Minnesota</state>
- <name>St. Paul</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Mississippi</state>
- <name>Jackson</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Missouri</state>
- <name>Jefferson City</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Montana</state>
- <name>Helena</name>
- <timeZone>GMT-7</timeZone>
- </capital>
- <capital>
- <state>Nebraska</state>
- <name>Lincoln</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Nevada</state>
- <name>Carson City</name>
- <timeZone>GMT-8</timeZone>
- </capital>
- <capital>
- <state>New Hampshire</state>
- <name>Concord</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>New Jersey</state>
- <name>Trenton</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>New Mexico</state>
- <name>Santa Fe</name>
- <timeZone>GMT-7</timeZone>
- </capital>
- <capital>
- <state>New York</state>
- <name>Albany</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>North Carolina</state>
- <name>Raleigh</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>North Dakota</state>
- <name>Bismarck</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Ohio</state>
- <name>Columbus</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Oklahoma</state>
- <name>Oklahoma City</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Oregon</state>
- <name>Salem</name>
- <timeZone>GMT-8</timeZone>
- </capital>
- <capital>
- <state>Pennsylvania</state>
- <name>Harrisburg</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Rhode Island</state>
- <name>Providence</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>South Carolina</state>
- <name>Columbia</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>South Dakota</state>
- <name>Pierre</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Tennessee</state>
- <name>Nashville</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Texas</state>
- <name>Austin</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Utah</state>
- <name>Salt Lake City</name>
- <timeZone>GMT-7</timeZone>
- </capital>
- <capital>
- <state>Vermont</state>
- <name>Montpelier</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Virginia</state>
- <name>Richmond</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Washington</state>
- <name>Olympia</name>
- <timeZone>GMT-8</timeZone>
- </capital>
- <capital>
- <state>West Virginia</state>
- <name>Charleston</name>
- <timeZone>GMT-5</timeZone>
- </capital>
- <capital>
- <state>Wisconsin</state>
- <name>Madison</name>
- <timeZone>GMT-6</timeZone>
- </capital>
- <capital>
- <state>Wyoming</state>
- <name>Cheyenne</name>
- <timeZone>GMT-7</timeZone>
- </capital>
-</capitals>
\ No newline at end of file
Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/capitals.xml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,253 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<capitals>
+ <capital>
+ <state>Alabama</state>
+ <name>Montgomery</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Alaska</state>
+ <name>Juneau</name>
+ <timeZone>GMT-9</timeZone>
+ </capital>
+ <capital>
+ <state>Arizona</state>
+ <name>Phoenix</name>
+ <timeZone>GMT-7</timeZone>
+ </capital>
+ <capital>
+ <state>Arkansas</state>
+ <name>Little Rock</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>California</state>
+ <name>Sacramento</name>
+ <timeZone>GMT-8</timeZone>
+ </capital>
+ <capital>
+ <state>Colorado</state>
+ <name>Denver</name>
+ <timeZone>GMT-7</timeZone>
+ </capital>
+ <capital>
+ <state>Connecticut</state>
+ <name>Hartford</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Delaware</state>
+ <name>Dover</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Florida</state>
+ <name>Tallahassee</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Georgia</state>
+ <name>Atlanta</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Hawaii</state>
+ <name>Honolulu</name>
+ <timeZone>GMT-10</timeZone>
+ </capital>
+ <capital>
+ <state>Idaho</state>
+ <name>Boise</name>
+ <timeZone>GMT-8</timeZone>
+ </capital>
+ <capital>
+ <state>Illinois</state>
+ <name>Springfield</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Indiana</state>
+ <name>Indianapolis</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Iowa</state>
+ <name>Des Moines</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Kansas</state>
+ <name>Topeka</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Kentucky</state>
+ <name>Frankfort</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Louisiana</state>
+ <name>Baton Rouge</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Maine</state>
+ <name>Augusta</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Maryland</state>
+ <name>Annapolis</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Massachusetts</state>
+ <name>Boston</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Michigan</state>
+ <name>Lansing</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Minnesota</state>
+ <name>St. Paul</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Mississippi</state>
+ <name>Jackson</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Missouri</state>
+ <name>Jefferson City</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Montana</state>
+ <name>Helena</name>
+ <timeZone>GMT-7</timeZone>
+ </capital>
+ <capital>
+ <state>Nebraska</state>
+ <name>Lincoln</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Nevada</state>
+ <name>Carson City</name>
+ <timeZone>GMT-8</timeZone>
+ </capital>
+ <capital>
+ <state>New Hampshire</state>
+ <name>Concord</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>New Jersey</state>
+ <name>Trenton</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>New Mexico</state>
+ <name>Santa Fe</name>
+ <timeZone>GMT-7</timeZone>
+ </capital>
+ <capital>
+ <state>New York</state>
+ <name>Albany</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>North Carolina</state>
+ <name>Raleigh</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>North Dakota</state>
+ <name>Bismarck</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Ohio</state>
+ <name>Columbus</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Oklahoma</state>
+ <name>Oklahoma City</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Oregon</state>
+ <name>Salem</name>
+ <timeZone>GMT-8</timeZone>
+ </capital>
+ <capital>
+ <state>Pennsylvania</state>
+ <name>Harrisburg</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Rhode Island</state>
+ <name>Providence</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>South Carolina</state>
+ <name>Columbia</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>South Dakota</state>
+ <name>Pierre</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Tennessee</state>
+ <name>Nashville</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Texas</state>
+ <name>Austin</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Utah</state>
+ <name>Salt Lake City</name>
+ <timeZone>GMT-7</timeZone>
+ </capital>
+ <capital>
+ <state>Vermont</state>
+ <name>Montpelier</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Virginia</state>
+ <name>Richmond</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Washington</state>
+ <name>Olympia</name>
+ <timeZone>GMT-8</timeZone>
+ </capital>
+ <capital>
+ <state>West Virginia</state>
+ <name>Charleston</name>
+ <timeZone>GMT-5</timeZone>
+ </capital>
+ <capital>
+ <state>Wisconsin</state>
+ <name>Madison</name>
+ <timeZone>GMT-6</timeZone>
+ </capital>
+ <capital>
+ <state>Wyoming</state>
+ <name>Cheyenne</name>
+ <timeZone>GMT-7</timeZone>
+ </capital>
+</capitals>
\ No newline at end of file
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd
===================================================================
--- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd 2007-12-12 11:42:57 UTC (rev 4767)
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
- "Digester" component of the Jakarta Commons Subproject
- DTD for the definition of Digester rules in XML.
- $Id: digester-rules.dtd,v 1.8 2003/03/27 18:54:45 rdonkin Exp $
--->
-
-<!-- This document type defines an XML format for defining Digester rules.
- Digester is a framework for pattern-matching-based parsing of XML into
- Java objects. See http://jakarta.apache.org/commons/digester.html. -->
-
-<!ENTITY % rule-elements "bean-property-setter-rule | call-method-rule | call-param-rule |
- factory-create-rule | object-create-rule |
- set-properties-rule | set-property-rule | set-top-rule |
- set-next-rule" >
-
-<!-- digester-rules is the root element. -->
-<!ELEMENT digester-rules (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule | factory-create-rule | object-create-rule | set-properties-rule | set-property-rule | set-top-rule | set-next-rule )*>
-
-
-<!-- <pattern> defines a matching pattern, or part of a matching pattern. Any
- rule nested in a pattern element prepends its parent's to its pattern.
- Patterns may be recursively nested.
- Example:
- <pattern value="foo">
- <pattern value="bar">
- <object-create-rule pattern="baz" classname="Fubar" />
- </pattern>
- </pattern>
-
- The above sample fragment defines an ObjectCreateRule associated
- with the pattern "foo/bar/baz".
-
- Note that the use of pattern elements is optional; an alternative is for
- each rule element to contain a 'pattern' attribute. -->
-<!ELEMENT pattern (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule |
- factory-create-rule | object-create-rule |
- set-properties-rule | set-property-rule | set-top-rule |
- set-next-rule )*>
-<!ATTLIST pattern
- value CDATA #REQUIRED>
-
-
-<!--
- <include> allows one set of digester rules to be included inside
- another. The 'path' attribute contains the URI of the document to
- include. Inclusion behaves as if the included rules document is
- 'macro-expanded' within the outer document.
- Programmatically initialized rules can be included as well, via the
- 'class' attribute. The 'class' attribute should contain the name
- of a class that implements
- org.apache.commons.digester.xmlrules.DigesterRulesSource.
--->
-<!ELEMENT include EMPTY>
-<!ATTLIST include
- path CDATA #IMPLIED
- class CDATA #IMPLIED>
-
-
-<!-- Each 'rule' element below corresponds to a concrete subclass
- of org.apache.framework.digester.Rule.
- Each 'rule' element has an optional 'pattern' attribute, which
- defines the pattern for that rule instance. If the rule element
- is nested inside one or more <pattern> elements, those patterns
- will be prepended to the pattern specified in the rule's 'pattern'
- attribute. -->
-
-<!-- Bean Property Setter Rule -->
-<!ELEMENT bean-property-setter-rule EMPTY>
-<!ATTLIST bean-property-setter-rule
- pattern CDATA #IMPLIED
- propertyname CDATA #IMPLIED>
-
-<!-- CallMethodRule -->
-<!ELEMENT call-method-rule EMPTY>
-<!ATTLIST call-method-rule
- pattern CDATA #IMPLIED
- methodname CDATA #REQUIRED
- paramcount CDATA #IMPLIED
- paramtypes CDATA #IMPLIED>
-
-<!--
- CallParamRule
- attrname - set param from attribute value (cannot be combined with from-stack)
- from-stack - set param from stack (cannot be combined with attrname)
- -->
-<!ELEMENT call-param-rule EMPTY>
-<!ATTLIST call-param-rule
- pattern CDATA #IMPLIED
- paramnumber CDATA #REQUIRED
- attrname CDATA #IMPLIED
- from-stack CDATA #IMPLIED>
-
-<!--
- FactoryCreateRule
-
- ignore-exceptions - if this attribute is (ignore case) 'true' then any exceptions
- thrown by the object create rule will be ignore.
- This will allow processing to continue.
- -->
-<!ELEMENT factory-create-rule EMPTY>
-<!ATTLIST factory-create-rule
- pattern CDATA #IMPLIED
- classname CDATA #REQUIRED
- attrname CDATA #IMPLIED
- ignore-exceptions CDATA #IMPLIED>
-
-<!-- ObjectCreateRule -->
-<!ELEMENT object-create-rule EMPTY>
-<!ATTLIST object-create-rule
- pattern CDATA #IMPLIED
- classname CDATA #REQUIRED
- attrname CDATA #IMPLIED>
-
-<!-- SetPropertiesRule -->
-<!ELEMENT set-properties-rule (alias)*>
-<!ATTLIST factory-create-rule
- pattern CDATA #IMPLIED>
-
-<!-- An alias is a custom attribute->property name mapping -->
-<!ELEMENT alias EMPTY>
-<!ATTLIST alias
- attr-name CDATA #REQUIRED
- prop-name CDATA #IMPLIED>
-
-<!-- SetPropertyRule -->
-<!ELEMENT set-property-rule EMPTY>
-<!ATTLIST set-property-rule
- pattern CDATA #IMPLIED
- name CDATA #IMPLIED
- value CDATA #IMPLIED>
-
-<!-- SetTopRule -->
-<!ELEMENT set-top-rule EMPTY>
-<!ATTLIST set-top-rule
- pattern CDATA #IMPLIED
- methodname CDATA #REQUIRED
- paramtype CDATA #IMPLIED>
-
-<!-- SetNextRule -->
-<!ELEMENT set-next-rule EMPTY>
-<!ATTLIST set-next-rule
- pattern CDATA #IMPLIED
- methodname CDATA #REQUIRED
- paramtype CDATA #IMPLIED>
Copied: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd (from rev 4766, trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd)
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd (rev 0)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/capitals/digester-rules.dtd 2007-12-12 11:42:57 UTC (rev 4767)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ "Digester" component of the Jakarta Commons Subproject
+ DTD for the definition of Digester rules in XML.
+ $Id: digester-rules.dtd,v 1.8 2003/03/27 18:54:45 rdonkin Exp $
+-->
+
+<!-- This document type defines an XML format for defining Digester rules.
+ Digester is a framework for pattern-matching-based parsing of XML into
+ Java objects. See http://jakarta.apache.org/commons/digester.html. -->
+
+<!ENTITY % rule-elements "bean-property-setter-rule | call-method-rule | call-param-rule |
+ factory-create-rule | object-create-rule |
+ set-properties-rule | set-property-rule | set-top-rule |
+ set-next-rule" >
+
+<!-- digester-rules is the root element. -->
+<!ELEMENT digester-rules (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule | factory-create-rule | object-create-rule | set-properties-rule | set-property-rule | set-top-rule | set-next-rule )*>
+
+
+<!-- <pattern> defines a matching pattern, or part of a matching pattern. Any
+ rule nested in a pattern element prepends its parent's to its pattern.
+ Patterns may be recursively nested.
+ Example:
+ <pattern value="foo">
+ <pattern value="bar">
+ <object-create-rule pattern="baz" classname="Fubar" />
+ </pattern>
+ </pattern>
+
+ The above sample fragment defines an ObjectCreateRule associated
+ with the pattern "foo/bar/baz".
+
+ Note that the use of pattern elements is optional; an alternative is for
+ each rule element to contain a 'pattern' attribute. -->
+<!ELEMENT pattern (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule |
+ factory-create-rule | object-create-rule |
+ set-properties-rule | set-property-rule | set-top-rule |
+ set-next-rule )*>
+<!ATTLIST pattern
+ value CDATA #REQUIRED>
+
+
+<!--
+ <include> allows one set of digester rules to be included inside
+ another. The 'path' attribute contains the URI of the document to
+ include. Inclusion behaves as if the included rules document is
+ 'macro-expanded' within the outer document.
+ Programmatically initialized rules can be included as well, via the
+ 'class' attribute. The 'class' attribute should contain the name
+ of a class that implements
+ org.apache.commons.digester.xmlrules.DigesterRulesSource.
+-->
+<!ELEMENT include EMPTY>
+<!ATTLIST include
+ path CDATA #IMPLIED
+ class CDATA #IMPLIED>
+
+
+<!-- Each 'rule' element below corresponds to a concrete subclass
+ of org.apache.framework.digester.Rule.
+ Each 'rule' element has an optional 'pattern' attribute, which
+ defines the pattern for that rule instance. If the rule element
+ is nested inside one or more <pattern> elements, those patterns
+ will be prepended to the pattern specified in the rule's 'pattern'
+ attribute. -->
+
+<!-- Bean Property Setter Rule -->
+<!ELEMENT bean-property-setter-rule EMPTY>
+<!ATTLIST bean-property-setter-rule
+ pattern CDATA #IMPLIED
+ propertyname CDATA #IMPLIED>
+
+<!-- CallMethodRule -->
+<!ELEMENT call-method-rule EMPTY>
+<!ATTLIST call-method-rule
+ pattern CDATA #IMPLIED
+ methodname CDATA #REQUIRED
+ paramcount CDATA #IMPLIED
+ paramtypes CDATA #IMPLIED>
+
+<!--
+ CallParamRule
+ attrname - set param from attribute value (cannot be combined with from-stack)
+ from-stack - set param from stack (cannot be combined with attrname)
+ -->
+<!ELEMENT call-param-rule EMPTY>
+<!ATTLIST call-param-rule
+ pattern CDATA #IMPLIED
+ paramnumber CDATA #REQUIRED
+ attrname CDATA #IMPLIED
+ from-stack CDATA #IMPLIED>
+
+<!--
+ FactoryCreateRule
+
+ ignore-exceptions - if this attribute is (ignore case) 'true' then any exceptions
+ thrown by the object create rule will be ignore.
+ This will allow processing to continue.
+ -->
+<!ELEMENT factory-create-rule EMPTY>
+<!ATTLIST factory-create-rule
+ pattern CDATA #IMPLIED
+ classname CDATA #REQUIRED
+ attrname CDATA #IMPLIED
+ ignore-exceptions CDATA #IMPLIED>
+
+<!-- ObjectCreateRule -->
+<!ELEMENT object-create-rule EMPTY>
+<!ATTLIST object-create-rule
+ pattern CDATA #IMPLIED
+ classname CDATA #REQUIRED
+ attrname CDATA #IMPLIED>
+
+<!-- SetPropertiesRule -->
+<!ELEMENT set-properties-rule (alias)*>
+<!ATTLIST factory-create-rule
+ pattern CDATA #IMPLIED>
+
+<!-- An alias is a custom attribute->property name mapping -->
+<!ELEMENT alias EMPTY>
+<!ATTLIST alias
+ attr-name CDATA #REQUIRED
+ prop-name CDATA #IMPLIED>
+
+<!-- SetPropertyRule -->
+<!ELEMENT set-property-rule EMPTY>
+<!ATTLIST set-property-rule
+ pattern CDATA #IMPLIED
+ name CDATA #IMPLIED
+ value CDATA #IMPLIED>
+
+<!-- SetTopRule -->
+<!ELEMENT set-top-rule EMPTY>
+<!ATTLIST set-top-rule
+ pattern CDATA #IMPLIED
+ methodname CDATA #REQUIRED
+ paramtype CDATA #IMPLIED>
+
+<!-- SetNextRule -->
+<!ELEMENT set-next-rule EMPTY>
+<!ATTLIST set-next-rule
+ pattern CDATA #IMPLIED
+ methodname CDATA #REQUIRED
+ paramtype CDATA #IMPLIED>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-12-12 11:42:57 UTC (rev 4767)
@@ -67,8 +67,11 @@
log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, RichFacesComponentsLibrary.html#log, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/log.jsf
page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, RichFacesComponentsLibrary.html#page, jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html, /richfaces/page.jsf
portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, RichFacesComponentsLibrary.html#portlet, jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html, /richfaces/portlet.jsf
+<<<<<<< .working
effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf
contextMenu= richMenu, Context Menu, /images/ico_dropDownMenu.gif, /images/cn_contextMenu.gif, RichFacesComponentsLibrary.html\#contextMenu, jbossrichfaces/freezone/docs/tlddoc/rich/contextMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIContextMenu.html, /richfaces/contextMenu.jsf
componentControl= richMisc, Component Control, /images/ico_common.gif, /images/cn_componentControl.gif, RichFacesComponentsLibrary.html\#componentControl, jbossrichfaces/freezone/docs/tlddoc/rich/componentControl.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIcomponentControl.html, /richfaces/componentControl.jsf
orderingList= richSelect, Ordering List, /images/ico_DataTable.gif, /images/cn_orderingList.gif, RichFacesComponentsLibrary.html\#orderingList, jbossrichfaces/freezone/docs/tlddoc/rich/orderingList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIorderingList.html, /richfaces/orderingList.jsf
-listShuttle= richSelect, List Shuttle, /images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#listShuttle, jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html, /richfaces/listShuttle.jsf
\ No newline at end of file
+listShuttle= richSelect, List Shuttle, /images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#listShuttle, jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html, /richfaces/listShuttle.jsf=======
+effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf
+>>>>>>> .merge-right.r4766
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -17,10 +17,15 @@
</managed-property>
</managed-bean>
<managed-bean>
+ <managed-bean-name>capitalsBean</managed-bean-name>
+ <managed-bean-class>org.richfaces.demo.capitals.CapitalsBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
<managed-bean-name>ddmenu</managed-bean-name>
<managed-bean-class>org.richfaces.demo.ddmenu.Menu</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
+ </managed-bean>
<managed-bean>
<managed-bean-name>calendarBean</managed-bean-name>
<managed-bean-class>org.richfaces.demo.calendar.CalendarBean</managed-bean-class>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -42,7 +42,16 @@
<context-param>
<param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
<param-value>NEKO</param-value>
- </context-param>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.LoadStyleStrategy</param-name>
+ <param-value>ALL</param-value>
+ </context-param>
+ <context-param>
+ <param-name>org.richfaces.LoadScriptStrategy</param-name>
+ <param-value>ALL</param-value>
+ </context-param>
+
<filter>
<display-name>Ajax4jsf Filter</display-name>
<filter-name>ajax4jsf</filter-name>
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif)
===================================================================
(Binary files differ)
Deleted: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif
===================================================================
(Binary files differ)
Copied: branches/3.1.x/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif (from rev 4766, trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif)
===================================================================
(Binary files differ)
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -2,7 +2,7 @@
<h:form id="form1">
....
<a4j:commandButton value="Usual Way" reRender="infoBlock, infoBlock2" />
- <a4j:commandButton value="Shortcut" reRender=":infoBlockl,:sv:infoBlock2" />
+ <a4j:commandButton value="Shortcut" reRender=":infoBlock,:sv:infoBlock2" />
.....
</h:form>
<h:panelGrid id="infoBlock">
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -82,7 +82,7 @@
</rich:panel>
<p>
<b>limitToList</b> attribute allows to dismiss the behavior of the a4j:outputPanel ajaxRendered
- attribute. limitToList = "false" means to update only the area(s) that mentioned in the
+ attribute. limitToList = "true" means to update only the area(s) that mentioned in the
reRender attribute explicitly. All output panels with ajaxRendered="true" will be ignored.
</p>
<h1 class="hsample">Queue and Traffic Flood Protection</h1>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/dataLists.xhtml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -12,7 +12,7 @@
<ui:include src="/richfaces/dataLists/usage.xhtml"/>
</rich:tab>
<ui:include src="/templates/include/tagInfo.xhtml">
- <ui:param name="path" value="rich/dataLists"/>
+ <ui:param name="path" value="rich/dataList"/>
</ui:include>
</rich:tabPanel>
</ui:define>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable.xhtml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -10,7 +10,8 @@
<rich:spacer height="30" />
<rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px"
width="700px" id="carList" rows="40" columnClasses="col"
- value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single">
+ value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single"
+ selection="#{dataTableScrollerBean.selection}">
<rich:column id="make">
<f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet>
@@ -36,10 +37,40 @@
<f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /></f:facet>
<h:outputText value="#{category.stock}" />
</rich:column>
-
-
-
- </rich:scrollableDataTable>
+ </rich:scrollableDataTable>
+ <rich:spacer height="20px"/>
+ <a4j:commandButton value="Show Current Selection" reRender="table"
+ action="#{dataTableScrollerBean.takeSelection}"
+ oncomplete="javascript:Richfaces.showModalPanel('panel');"/>
</h:form>
-
+ <rich:modalPanel id="panel" autosized="true">
+ <f:facet name="header">
+ <h:outputText value="Selected Rows"/>
+ </f:facet>
+ <f:facet name="controls">
+ <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span>
+ </f:facet>
+ <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table">
+ <rich:column>
+ <f:facet name="header"><h:outputText value="Make" /></f:facet>
+ <h:outputText value="#{sel.make}" />
+ </rich:column>
+ <rich:column id="model">
+ <f:facet name="header"><h:outputText value="Model" /></f:facet>
+ <h:outputText value="#{sel.model}" />
+ </rich:column>
+ <rich:column id="price">
+ <f:facet name="header"><h:outputText value="Price" /></f:facet>
+ <h:outputText value="#{sel.price}" />
+ </rich:column>
+ <rich:column id="mileage">
+ <f:facet name="header"><h:outputText value="Mileage" /></f:facet>
+ <h:outputText value="#{sel.mileage}" />
+ </rich:column>
+ <rich:column id="stock">
+ <f:facet name="header"><h:outputText value="Stock" /></f:facet>
+ <h:outputText value="#{sel.stock}" />
+ </rich:column>
+ </rich:dataTable>
+ </rich:modalPanel>
</ui:composition>
\ No newline at end of file
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -6,47 +6,41 @@
xmlns:rich="http://richfaces.org/rich">
<h:form id="suggestionbox_form">
-
- <h:outputText
- value="Simple richfaces Suggestion Box test web application."
- style="font: 18px;font-weight: bold;" />
- <br />
- <br />
-
- <h:panelGrid columns="3" border="0" style="border: 1px solid black;">
- <f:verbatim>Suggestion Box will suggest you town names if it's started with the "a" or
- "A" letter</f:verbatim>
-
- <f:facet name="header">
- <f:verbatim>Input With Suggestion Feature</f:verbatim>
- </f:facet>
-
-
- <f:verbatim> </f:verbatim>
-
- <h:inputText value="#{suggestionBox.property}" id="text" />
+
+ <p>
+ Suggestion Box will suggest you states capitals names. Comma and space could be used as suggestions separators."
+ </p>
+ <h:inputText value="#{capitalsBean.capital}" id="text" />
<rich:suggestionbox id="suggestionBoxId" for="text" tokens=",["
rules="#{suggestionBox.rules}"
- suggestionAction="#{suggestionBox.autocomplete}" var="result"
- fetchValue="#{result.text}" rows="#{suggestionBox.intRows}"
+ suggestionAction="#{capitalsBean.autocomplete}" var="result"
+ fetchValue="#{result.name}" rows="#{suggestionBox.intRows}"
first="#{suggestionBox.intFirst}"
minChars="#{suggestionBox.minchars}"
shadowOpacity="#{suggestionBox.shadowOpacity}"
border="#{suggestionBox.border}" width="#{suggestionBox.width}"
height="#{suggestionBox.height}"
shadowDepth="#{suggestionBox.shadowDepth}"
- cellpadding="#{suggestionBox.cellpadding}">
- <h:column>
- <h:outputText value="#{result.text}" />
+ cellpadding="#{suggestionBox.cellpadding}"
+ nothingLabel="No capitals found" columnClasses="center">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="123"></h:outputText>
+ </f:facet>
+ <h:graphicImage value="#{result.stateFlag}" />
</h:column>
+ <h:column>
+ <h:outputText value="#{result.name}" />
+ </h:column>
+ <h:column>
+ <h:outputText value="#{result.state}" style="font-style:italic"/>
+ </h:column>
</rich:suggestionbox>
- </h:panelGrid>
+
+ <rich:spacer height="30px"/>
- <br />
- <br />
-
- <h:panelGrid columns="2" border="0" style="border: 1px solid black;">
-
+ <h:panelGrid columns="2" border="0" >
+
<h:outputText value="Border" />
<rich:inputNumberSlider minValue="1" maxValue="5"
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox.xhtml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -12,7 +12,7 @@
<ui:include src="/richfaces/suggestionBox/usage.xhtml"/>
</rich:tab>
<ui:include src="/templates/include/tagInfo.xhtml">
- <ui:param name="path" value="rich/suggestionBox"/>
+ <ui:param name="path" value="rich/suggestionbox"/>
</ui:include>
</rich:tabPanel>
</ui:define>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/header.xhtml 2007-12-12 11:42:57 UTC (rev 4767)
@@ -114,6 +114,12 @@
<f:param value="DEFAULT" name="s"/>
</h:outputLink>
</td>
+ <td>
+ <h:outputLink value="#{componentNavigator.currentComponent.contextRelativeDemoLocation}">
+ Null
+ <f:param value="NULL" name="s"/>
+ </h:outputLink>
+ </td>
<td class="control">
<rich:toggleControl for="skin_chooser" value="« less" />
</td>
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4766 - in branches/3.1.x/samples/richfaces-demo/src/main: webapp/richfaces/calendar and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-12-12 06:15:23 -0500 (Wed, 12 Dec 2007)
New Revision: 4766
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml
Log:
calendar apply added
Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java 2007-12-12 11:01:23 UTC (rev 4765)
+++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/calendar/CalendarBean.java 2007-12-12 11:15:23 UTC (rev 4766)
@@ -12,7 +12,7 @@
private boolean popup;
private String pattern;
private Date selectedDate;
-
+ private boolean showApply=true;
private boolean useCustomDayLabels;
public Locale getLocale() {
@@ -72,4 +72,12 @@
this.selectedDate = selectedDate;
}
+ public boolean isShowApply() {
+ return showApply;
+ }
+
+ public void setShowApply(boolean showApply) {
+ this.showApply = showApply;
+ }
+
}
\ No newline at end of file
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/calSample.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
@@ -18,7 +18,7 @@
locale="#{calendarBean.locale}"
popup="#{calendarBean.popup}"
datePattern="#{calendarBean.pattern}"
- />
+ showApplyButton="true"/>
</a4j:outputPanel>
@@ -27,7 +27,10 @@
<h:selectBooleanCheckbox value="#{calendarBean.popup}">
<a4j:support event="onclick" reRender="calendar"/>
</h:selectBooleanCheckbox>
-
+ <h:outputText value="Apply Button:" />
+ <h:selectBooleanCheckbox value="#{calendarBean.showApply}">
+ <a4j:support event="onclick" reRender="calendar"/>
+ </h:selectBooleanCheckbox>
<h:outputText value="Select Locale" />
<h:selectOneRadio value="en/US" valueChangeListener="#{calendarBean.selectLocale}">
<a4j:support event="onclick" reRender="calendar"/>
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/calendar/usage.xhtml 2007-12-12 11:15:23 UTC (rev 4766)
@@ -32,6 +32,9 @@
After you choose some date - you'll be able to manage time for this date. Spinner will be called
after click on the time fields to edit them.
</p>
+ <p>
+ Calendar could be used without "Apply" button(will be closed after date selected)
+ </p>
<p>
<b>locale</b> attribute is defined as a Locale. The default value is set to the Locale of the current page.
The name of the month and week days names depend of the Locale.
16 years, 10 months
- 1
- 0
JBoss Rich Faces SVN: r4765 - in branches/3.1.x/test-applications/facelets/src/main/webapp: ContextMenu and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2007-12-12 06:01:23 -0500 (Wed, 12 Dec 2007)
New Revision: 4765
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml
branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml
Log:
-fix bug
-add time for calendar
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2007-12-12 11:00:23 UTC (rev 4764)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Calendar/CalendarProperty.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
@@ -42,13 +42,15 @@
</h:selectOneRadio>
<h:outputText value="Select Date Pattern:" />
- <h:selectOneMenu value="MMM d, yyyy" onchange="submit()">
+ <h:selectOneMenu value="#{calendarBean.pattern}" onchange="submit()">
<f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" />
<f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" />
<f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" />
<f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" />
<f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" />
<f:selectItem itemLabel="dd-MM-yyyy" itemValue="dd-MM-yyyy" />
+ <f:selectItem itemLabel="dd/M/yy HH:mm" itemValue="dd/M/yy HH:mm"/>
+ <f:selectItem itemLabel="MMM d, yyyy h:mm a" itemValue="MMM d, yyyy h:mm a"/>
</h:selectOneMenu>
<h:outputText value="Preload date range begin(d.m.y)" />
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2007-12-12 11:00:23 UTC (rev 4764)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ContextMenu/ContextMenuProperty.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
@@ -2,7 +2,6 @@
xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets">
<a4j:commandButton value="reRender" reRender="cmInfoID"></a4j:commandButton>
- <a4j:commandButton action="submit();" value="a4j submit();"></a4j:commandButton>
<a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton>
<h:commandButton action="submit();" value="submit();" />
<h:commandButton action="submit();" immediate="true" value="immediate submit();" />
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml 2007-12-12 11:00:23 UTC (rev 4764)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/Insert/InsertProperty.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
@@ -30,7 +30,7 @@
<f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="XHTML" />
<f:selectItem itemValue="/Insert/src/test.lzx" itemLabel="LZX" />
<f:selectItem itemValue="/Insert/src/test.cpp" itemLabel="CPP,CXX" />
- <a4j:support event="onclick" action="submit();" reRender="panelID,insertID"></a4j:support>
+ <a4j:support event="onclick" reRender="panelID,insertID"></a4j:support>
</h:selectOneMenu>
<h:outputText value="Rendered" />
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-12 11:00:23 UTC (rev 4764)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttle.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
@@ -59,7 +59,7 @@
<f:selectItem itemLabel="select2" itemValue="select2" />
<f:selectItem itemLabel="select3" itemValue="select3" />
<f:selectItem itemLabel="select4" itemValue="select4" />
- <a4j:support event="onclick" action="submit();"></a4j:support>
+ <a4j:support event="onclick" reRender="listShuttleID"></a4j:support>
</h:selectOneMenu>
</h:column>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2007-12-12 11:00:23 UTC (rev 4764)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/ListShuttle/ListShuttleProperty.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
@@ -4,7 +4,6 @@
<h:column></h:column>
<h:panelGroup>
<a4j:commandButton value="reRender" reRender="listShuttleID"></a4j:commandButton>
- <a4j:commandButton action="submit();" value="a4j submit();"></a4j:commandButton>
<a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton>
<h:commandButton action="submit();" value="submit();" />
<h:commandButton action="submit();" immediate="true" value="immediate submit();" />
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-12-12 11:00:23 UTC (rev 4764)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingList.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
@@ -55,7 +55,7 @@
<f:facet name="header">
<h:outputText value="Link" />
</f:facet>
- <a4j:commandLink action="#{orderingList.clAction}" onclick="submit()" value="#{item.str1} submit()" reRender="orderingListID"></a4j:commandLink>
+ <a4j:commandLink action="#{orderingList.clAction}" value="#{item.str1} submit()" reRender="orderingListID"></a4j:commandLink>
</h:column>
<h:column>
@@ -68,7 +68,7 @@
<f:selectItem itemLabel="select2" itemValue="select2" />
<f:selectItem itemLabel="select3" itemValue="select3" />
<f:selectItem itemLabel="select4" itemValue="select4" />
- <a4j:support event="onclick" action="submit();"></a4j:support>
+ <a4j:support event="onclick" reRender="orderingListID"></a4j:support>
</h:selectOneMenu>
</h:column>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-12-12 11:00:23 UTC (rev 4764)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/OrderingList/OrderingListStraightforward.xhtml 2007-12-12 11:01:23 UTC (rev 4765)
@@ -100,7 +100,6 @@
<h:panelGroup>
<a4j:commandButton value="reRender" reRender="orderingListID"></a4j:commandButton>
- <a4j:commandButton action="submit();" value="a4j submit();"></a4j:commandButton>
<a4j:commandButton action="submit();" immediate="true" value="immediate submit(); (a4j)"></a4j:commandButton>
<h:commandButton action="submit();" value="submit();" />
<h:commandButton action="submit();" immediate="true" value="immediate submit();" />
16 years, 10 months
- 1
- 0