JBoss Rich Faces SVN: r16549 - in root/ui-sandbox/trunk: components/tables/impl/src/main/java/org/richfaces/model and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: konstantin.mishin
Date: 2010-03-10 10:27:39 -0500 (Wed, 10 Mar 2010)
New Revision: 16549
Modified:
root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java
root/ui-sandbox/trunk/pom.xml
Log:
RF-8118 RF-8119
Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java 2010-03-10 15:27:39 UTC (rev 16549)
@@ -49,15 +49,15 @@
*/
public class ArrangeableModel extends ExtendedDataModel<Object> implements Arrangeable {
- protected ArrangeableState state;
+ private ArrangeableState state;
- protected List<Object> rowKeys;
+ private List<Object> rowKeys;
- protected ExtendedDataModel<?> originalModel;
+ private ExtendedDataModel<?> originalModel;
- protected String var;
+ private String var;
- protected String filterVar;
+ private String filterVar;
private Comparator<? super String> stringComparator;
@@ -212,22 +212,22 @@
initializeRowKeys(context);
if (state != null) {
this.state = state;
- Map<Object, Object> attributes = context.getAttributes();
+ Map<String, Object> map = context.getExternalContext().getRequestMap();
Object value = null;
Object filterValue = null;
if (var != null && var.length() > 0) {
- value = attributes.get(var);
+ value = map.get(var);
}
if (filterVar != null && filterVar.length() > 0) {
- filterValue = attributes.get(filterVar);
+ filterValue = map.get(filterVar);
}
filter(context);
sort(context);
if (var != null && var.length() > 0) {
- attributes.put(var, value);
+ map.put(var, value);
}
if (filterVar != null && filterVar.length() > 0) {
- attributes.put(filterVar, filterValue);
+ map.put(filterVar, filterValue);
}
}
}
@@ -252,7 +252,7 @@
originalModel.setRowKey(rowKey);
}
- protected void filter(FacesContext context) {
+ private void filter(FacesContext context) {
List<FilterField> filterFields = state.getFilterFields();
if (filterFields != null && !filterFields.isEmpty()) {
List<Object> filteredCollection = new ArrayList<Object>();
@@ -265,7 +265,7 @@
}
}
- protected void sort(final FacesContext context) {
+ private void sort(final FacesContext context) {
List<SortField> sortFields = state.getSortFields();
if (sortFields != null && !sortFields.isEmpty()) {
Collections.sort(rowKeys, new Comparator<Object>() {
@@ -277,7 +277,7 @@
}
@SuppressWarnings("unchecked")
- protected boolean accept(FacesContext context, Object rowKey) {
+ private boolean accept(FacesContext context, Object rowKey) {
originalModel.setRowKey(rowKey);
Object object = originalModel.getRowData();
updateVar(context, var, object);
@@ -299,7 +299,7 @@
}
@SuppressWarnings("unchecked")
- protected int compare(FacesContext context, Object rowKey1, Object rowKey2) {
+ private int compare(FacesContext context, Object rowKey1, Object rowKey2) {
originalModel.setRowKey(rowKey1);
Object object1 = originalModel.getRowData();
originalModel.setRowKey(rowKey2);
@@ -365,7 +365,7 @@
private void updateVar(FacesContext context, String var, Object value) {
if (var != null && var.length() > 0) {
- context.getAttributes().put(var, value);
+ context.getExternalContext().getRequestMap().put(var, value);
}
}
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-03-10 15:27:39 UTC (rev 16549)
@@ -17,7 +17,7 @@
*/
-public abstract class UIDataTable extends UIDataTableBase {
+public class UIDataTable extends UIDataTableBase {
enum PropertyKeys {
sortingExpression
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-03-10 15:27:39 UTC (rev 16549)
@@ -41,10 +41,10 @@
import org.richfaces.model.SortField;
import org.richfaces.model.SortMode;
-public abstract class UIDataTableBase extends UISequence implements Row {
+public class UIDataTableBase extends UISequence implements Row {
protected enum PropertyKeys {
- filterVar
+ filterVar, sortPriority, sortMode
}
public Iterator<UIComponent> columns() {
@@ -74,14 +74,6 @@
return true;
}
- public abstract SortMode getSortMode();
-
- public abstract void setSortMode(SortMode sortMode);
-
- public abstract Collection<Object> getSortPriority();
-
- public abstract void setSortPriority(Collection<Object> sortPriority);
-
@Override
protected ExtendedDataModel<?> createExtendedDataModel() {
ExtendedDataModel<?> dataModel = super.createExtendedDataModel();
@@ -121,7 +113,7 @@
}
}
List<SortField> sortFields = new LinkedList<SortField>();
- Collection<Object> sortPriority = getSortPriority();
+ Collection<?> sortPriority = getSortPriority();
if (sortPriority != null) {
for (Object object : sortPriority) {
SortField sortField = sortFieldsMap.get(object);
@@ -146,4 +138,20 @@
public void setFilterVar(String filterVar) {
getStateHelper().put(PropertyKeys.filterVar, filterVar);
}
+
+ public Collection<?> getSortPriority() {
+ return (Collection<?>) getStateHelper().get(PropertyKeys.sortPriority);
+ }
+
+ public void setSortPriority(Collection<?> sortPriority) {
+ getStateHelper().put(PropertyKeys.sortPriority, sortPriority);
+ }
+
+ public SortMode getSortMode() {
+ return (SortMode) getStateHelper().get(PropertyKeys.sortMode);
+ }
+
+ public void setSortMode(SortMode sortMode) {
+ getStateHelper().put(PropertyKeys.sortMode, sortMode);
+ }
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java 2010-03-10 15:27:39 UTC (rev 16549)
@@ -1,40 +1,12 @@
package org.richfaces.component.html;
-import java.util.Collection;
-
import org.richfaces.component.UIDataTable;
-import org.richfaces.model.SortMode;
public class HtmlDataTable extends UIDataTable {
public static final String COMPONENT_TYPE = "org.richfaces.DataTable";
-
- protected enum PropertyKeys {
- sortMode, sortPriority,
- }
-
public HtmlDataTable() {
setRendererType("org.richfaces.DataTableRenderer");
}
-
- @Override
- public SortMode getSortMode() {
- return (SortMode)getStateHelper().eval(PropertyKeys.sortMode, SortMode.single);
- }
-
- @Override
- public Collection<Object> getSortPriority() {
- return (Collection)getStateHelper().eval(PropertyKeys.sortPriority);
- }
-
- @Override
- public void setSortMode(SortMode sortMode) {
- getStateHelper().put(PropertyKeys.sortMode, sortMode);
- }
-
- @Override
- public void setSortPriority(Collection<Object> sortPriority) {
- getStateHelper().put(PropertyKeys.sortPriority, sortPriority);
- }
- }
+}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java 2010-03-10 15:27:39 UTC (rev 16549)
@@ -21,10 +21,7 @@
*/
package org.richfaces.component.html;
-import java.util.Collection;
-
import org.richfaces.component.UIExtendedDataTable;
-import org.richfaces.model.SortMode;
public class HtmlExtendedDataTable extends UIExtendedDataTable {
@@ -61,23 +58,4 @@
public void setFrozenColumns(Integer frozenColumns) {
getStateHelper().put(PropertyKeys.frozenColumns, frozenColumns);
}
-
- @Override
- public SortMode getSortMode() {
- return null;
- }
-
- @Override
- public Collection<Object> getSortPriority() {
- return null;
- }
-
- @Override
- public void setSortMode(SortMode sortMode) {
- }
-
- @Override
- public void setSortPriority(Collection<Object> sortPriority) {
- }
-
}
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-03-10 15:27:39 UTC (rev 16549)
@@ -1,9 +1,6 @@
package org.richfaces.component.html;
-import java.util.Collection;
-
import org.richfaces.component.UISubTable;
-import org.richfaces.model.SortMode;
public class HtmlSubTable extends UISubTable {
@@ -12,7 +9,7 @@
protected enum PropertyKeys {
- expand, sortMode, sortPriority
+ expand
}
@Override
@@ -24,24 +21,4 @@
public void setExpanded(boolean expanded) {
getStateHelper().put(PropertyKeys.expand, expanded);
}
-
- @Override
- public SortMode getSortMode() {
- return (SortMode)getStateHelper().eval(PropertyKeys.sortMode, SortMode.single);
- }
-
- @Override
- public Collection<Object> getSortPriority() {
- return (Collection)getStateHelper().eval(PropertyKeys.sortPriority);
- }
-
- @Override
- public void setSortMode(SortMode sortMode) {
- getStateHelper().put(PropertyKeys.sortMode, sortMode);
- }
-
- @Override
- public void setSortPriority(Collection<Object> sortPriority) {
- getStateHelper().put(PropertyKeys.sortPriority, sortPriority);
- }
}
Modified: root/ui-sandbox/trunk/pom.xml
===================================================================
--- root/ui-sandbox/trunk/pom.xml 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/pom.xml 2010-03-10 15:27:39 UTC (rev 16549)
@@ -81,6 +81,16 @@
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
15 years, 9 months
JBoss Rich Faces SVN: r16548 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-03-10 09:56:45 -0500 (Wed, 10 Mar 2010)
New Revision: 16548
Added:
root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js
Log:
client side library: unified api (BaseComponent)
Added: root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js (rev 0)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/richfaces-base-component.js 2010-03-10 14:56:45 UTC (rev 16548)
@@ -0,0 +1,46 @@
+(function (jQuery, richfaces, params) {
+
+ richfaces.blankFunction = function (){}; //TODO: add it to global library
+
+ richfaces.BaseComponent = function(componentId) {
+ this.id = componentId;
+ };
+
+ richfaces.BaseComponent.extend = function (Parent, Child) {
+ var F = richfaces.blankFunction;
+ F.prototype = Parent.prototype;
+ Child.prototype = new F();
+ Child.prototype.constructor = Child;
+ Child.$super = Parent.prototype;
+ return Parent.prototype;
+ }
+
+ jQuery.extend(richfaces.BaseComponent.prototype, (function (params) {
+ return {
+ name: "BaseComponent",
+ toString: function() {
+ var result = [];
+ if (this.constructor.$super) {
+ result[result.length] = this.constructor.$super.toString();
+ }
+ result[result.length] = this.name;
+ return result.join(', ');
+ }
+ };
+ })(params));
+
+})(jQuery, window.RichFaces || (window.RichFaces={}));
+/*
+(function (jQuery, richfaces, params) {
+
+ richfaces.MyComponent = function(componentId) {
+ $super.constructor.call(this);
+ };
+
+ var $super = richfaces.BaseComponent.extend(richfaces.BaseComponent, richfaces.MyComponent);
+
+ jQuery.extend(richfaces.MyComponent.prototype, (function (params) {
+ return {name:"MyComponent", f:function (){alert("hello");}};
+ })(params));
+})(jQuery, RichFaces);
+*/
\ No newline at end of file
15 years, 9 months
JBoss Rich Faces SVN: r16547 - root/framework/trunk/impl/src/main/resources/META-INF/resources.
by richfaces-svn-commits@lists.jboss.org
Author: pyaschenko
Date: 2010-03-10 09:54:16 -0500 (Wed, 10 Mar 2010)
New Revision: 16547
Modified:
root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
Log:
RF-8504
Modified: root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js
===================================================================
--- root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-03-10 14:53:13 UTC (rev 16546)
+++ root/framework/trunk/impl/src/main/resources/META-INF/resources/jquery.position.js 2010-03-10 14:54:16 UTC (rev 16547)
@@ -58,8 +58,8 @@
// horisontal constants: L-left, R-right, C-center, A-auto
// vertical constants: T-top, B-bottom, M-middle, A-auto
// for auto: list of joinPoint-Direction pairs
- TOOLTIP: {from:"RB", to:"AA", auto:["RBRT", "RBLT", "RBLB", "RBRB"]},
- DROPDOWN:{from:"RB", to:"AA", auto:["RBLB", "RTLT", "LBRB", "LTRT"]}
+ TOOLTIP: {from:"AA", to:"AA", auto:["RTRT", "RBRT", "LTRT", "RTLT", "LTLT", "LBLT", "RTRB", "RBRB", "LBRB", "RBLB"]},
+ DROPDOWN:{from:"AA", to:"AA", auto:["LBRB", "LTRT", "RBLB", "RTLT"]}
};
$.addPositionType = function (type, options) {
@@ -178,11 +178,12 @@
if (p.indexOf('A')<0) {
return getPositionRect(baseRect, rectOffset, elementDim, p);
} else {
+ var flag = p=="AAAA";
var pos;
for (var i = 0; i<options.auto.length; i++) {
// TODO: draft functional
- pos = __mergePos(p, options.auto[i]);
+ pos = flag ? options.auto[i] : __mergePos(p, options.auto[i]);
rect = getPositionRect(baseRect, rectOffset, elementDim, pos);
ox = rect.left; oy = rect.top;
s = checkCollision(rect, windowRect);
@@ -195,36 +196,6 @@
}
}
- /*
- // jointPoint: bottom-right, direction: bottom-left
- var basex = baseRect.left - rectOffset.left;
- var basey = baseRect.top + rectOffset.top;
- var rect = {right: basex + baseRect.width, top: basey + baseRect.height};
- rect.left = rect.right - elementDim.width;
- rect.bottom = rect.top + elementDim.height;
-
- // jointPoint: top-right, direction: top-left
- basex = baseRect.left - rectOffset.left;
- basey = baseRect.top - rectOffset.top;
- rect = {right: basex + baseRect.width, bottom: basey};
- rect.left = rect.right - elementDim.width;
- rect.top = rect.bottom - elementDim.height;
-
- // jointPoint: bottom-left, direction: bottom-right
- basex = baseRect.left + rectOffset.left;
- basey = baseRect.top + rectOffset.top;
- rect = {left: basex, top: basey + baseRect.height};
- rect.right = rect.left + elementDim.width;
- rect.bottom = rect.top + elementDim.height;
-
- // jointPoint: top-left, direction: top-right
- basex = baseRect.left + rectOffset.left;
- basey = baseRect.top + rectOffset.top;
- rect = {left: basex, bottom: basey};
- rect.right = rect.left + elementDim.width;
- rect.top = rect.bottom - elementDim.height;
- }*/
-
return {left:ox, top:oy};
}
15 years, 9 months
JBoss Rich Faces SVN: r16546 - root/ui-sandbox/trunk/components/datascroller/ui.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-03-10 09:53:13 -0500 (Wed, 10 Mar 2010)
New Revision: 16546
Modified:
root/ui-sandbox/trunk/components/datascroller/ui/pom.xml
Log:
remove impl dependency
Modified: root/ui-sandbox/trunk/components/datascroller/ui/pom.xml
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/pom.xml 2010-03-10 06:10:36 UTC (rev 16545)
+++ root/ui-sandbox/trunk/components/datascroller/ui/pom.xml 2010-03-10 14:53:13 UTC (rev 16546)
@@ -21,11 +21,6 @@
<artifactId>${parent.artifactId}-api</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <artifactId>${parent.artifactId}-impl</artifactId>
- </dependency>
- <dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
</dependency>
15 years, 9 months
JBoss Rich Faces SVN: r16545 - in root/docs/trunk: Component_Reference/en-US/extras and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: SeanRogers
Date: 2010-03-10 01:10:36 -0500 (Wed, 10 Mar 2010)
New Revision: 16545
Added:
root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessage-richmessage_example.xml_sample
root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessages-richmessages_example.xml_sample
root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richmessage-richmessage_component.png
root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richmessages-richmessages_component.png
Modified:
root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Output_and_messages.xml
root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-RichFaces_overview.xml
Log:
Worked on rich:message and rich:messages, fixed image resizing in Developer Guide
Modified: root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Output_and_messages.xml
===================================================================
--- root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Output_and_messages.xml 2010-03-09 23:46:13 UTC (rev 16544)
+++ root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Output_and_messages.xml 2010-03-10 06:10:36 UTC (rev 16545)
@@ -4,20 +4,210 @@
<chapter id="chap-Component_Reference-Output_and_messages">
<title>Output and messages</title>
<para>
- Incomplete
+ Read this chapter for details on components that display messages and other feedback to the user.
</para>
<section id="sect-Component_Reference-Output_and_messages-richmessage">
<title><sgmltag><rich:message></sgmltag></title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ component-type: <classname>org.richfaces.RichMessage</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-class: <classname>org.richfaces.component.html.HtmlRichMessage</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-family: <classname>org.richfaces.component.RichMessage</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ renderer-type: <classname>org.richfaces.RichMessageRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ tag-class: <classname>org.richfaces.taglib.RichMessageTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- Incomplete
+ The <sgmltag><rich:message></sgmltag> component renders a single for message relating to another specific component. The message consists of two parts, both of which are optional: the marker icon and the textual label. The appearance of the message can be customized, and tool-tips can be used for further information about the message.
</para>
+ <figure id="figu-Component_Reference-richmessage-richmessage_component">
+ <title>rich:message component</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richmessage-richmessage_component.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ The <sgmltag><rich:message></sgmltag> component displaying a message warning that a minimum of five characters is required for an associated text input field. It features both a marker icon in the form of a red and white cross, and a red textual label.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <varname>passedLabel</varname> attribute contains a message to display when there are no errors; that is, when validation passes successfully. The <varname>showSummary</varname> attribute specifies whether to display only a summary of the full message. The full message can be displayed in a tool-tip when hovering the mouse over the summary.
+ </para>
+ <para>
+ The <sgmltag><a4j:message></sgmltag> component is automatically rendered after an Ajax request, even without the use of an <sgmltag><a4j:outputPanel></sgmltag> component.
+ </para>
+ <para>
+ Facets are used to define the marker icons for different message states:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>errorMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>error</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>fatalMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>fatal</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>infoMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>info</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>passedMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages that are not of the <literal>error</literal>, <literal>fatal</literal>, <literal>info</literal>, or <literal>warn</literal> severity classes.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>warnMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>warn</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <example id="exam-Component_Reference-richmessage-richmessage_example">
+ <title>rich:message example</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richmessage-richmessage_example.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ </example>
</section>
<section id="sect-Component_Reference-Output_and_messages-richmessages">
<title><sgmltag><rich:messages></sgmltag></title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ component-type: <classname>org.richfaces.component.RichMessages</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-class: <classname>org.richfaces.component.html.HtmlRichMessages</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-family: <classname>org.richfaces.component.RichMessages</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ renderer-type: <classname>org.richfaces.RichMessagesRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ tag-class: <classname>org.richfaces.taglib.RichMessagesTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- Incomplete
+ The <sgmltag><rich:messages></sgmltag> components works similarly to the <sgmltag><rich:message></sgmltag> component, but can display validation messages for a group of components instead of just a single component. Refer to <xref linkend="sect-Component_Reference-Output_and_messages-richmessage" /> for details on the <sgmltag><rich:message></sgmltag> component.
</para>
+ <figure id="figu-Component_Reference-richmessages-richmessages_component">
+ <title>rich:messages component</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richmessages-richmessages_component.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ The <sgmltag><rich:messages></sgmltag> component displaying two messages both warning of insufficient characters in two different input controls. Both messages feature a marker icon in the form of a red and white cross.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <sgmltag><rich:messages></sgmltag> component displays error messages for each validating component in the same container. The <varname>passedLabel</varname> attribute contains a message to display when there are no errors; that is, when validation for all components passes successfully. The <varname>layout</varname> attribute defines how the messages are presented: either using <literal>list</literal> for a list layout, or <literal>table</literal> for a tabular layout.
+ </para>
+ <para>
+ The <sgmltag><a4j:message></sgmltag> component is automatically rendered after an Ajax request, even without the use of an <sgmltag><a4j:outputPanel></sgmltag> component.
+ </para>
+ <para>
+ All messages use the same state icons, specified by using facets in the same way as for the <sgmltag><rich:message></sgmltag> component:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><literal>errorMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>error</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>fatalMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>fatal</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>infoMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>info</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>passedMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages that are not of the <literal>error</literal>, <literal>fatal</literal>, <literal>info</literal>, or <literal>warn</literal> severity classes.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><literal>warnMarker</literal></term>
+ <listitem>
+ <para>
+ Defines the icon for messages with the <literal>warn</literal> severity class.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <example id="exam-Component_Reference-richmessages-richmessages_example">
+ <title>rich:messages example</title>
+ <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richmessages-richmessages_example.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+ </example>
</section>
<section id="sect-Component_Reference-Output_and_messages-richpaint2D">
Added: root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessage-richmessage_example.xml_sample
===================================================================
--- root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessage-richmessage_example.xml_sample (rev 0)
+++ root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessage-richmessage_example.xml_sample 2010-03-10 06:10:36 UTC (rev 16545)
@@ -0,0 +1,8 @@
+<rich:message for="id" passedLabel="No errors" showSummary="true">
+ <f:facet name="errorMarker">
+ <h:graphicImage url="/image/error.png"/>
+ </f:facet>
+ <f:facet name="passedMarker">
+ <h:graphicImage url="/image/passed.png"/>
+ </f:facet>
+</rich:message>
Added: root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessages-richmessages_example.xml_sample
===================================================================
--- root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessages-richmessages_example.xml_sample (rev 0)
+++ root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richmessages-richmessages_example.xml_sample 2010-03-10 06:10:36 UTC (rev 16545)
@@ -0,0 +1,35 @@
+<h:form>
+ <rich:messages passedLabel="Data validated." layout="list">
+ <f:facet name="header">
+ <h:outputText value="Entered Data Status:"></h:outputText>
+ </f:facet>
+ <f:facet name="passedMarker">
+ <h:graphicImage value="/images/ajax/passed.gif" />
+ </f:facet>
+ <f:facet name="errorMarker">
+ <h:graphicImage value="/images/ajax/error.gif" />
+ </f:facet>
+ </rich:messages>
+
+ <h:panelGrid columns="2">
+ <h:outputText value="Name:" />
+ <h:inputText label="Name" id="name" required="true" value="#{userBean.name}">
+ <f:validateLength minimum="3" />
+ </h:inputText>
+ <h:outputText value="Job:" />
+ <h:inputText label="Job" id="job" required="true" value="#{userBean.job}">
+ <f:validateLength minimum="3" maximum="50" />
+ </h:inputText>
+ <h:outputText value="Address:" />
+ <h:inputText label="Address" id="address" required="true" value="#{userBean.address}">
+ <f:validateLength minimum="10" />
+ </h:inputText>
+ <h:outputText value="Zip:" />
+ <h:inputText label="Zip" id="zip" required="true" value="#{userBean.zip}">
+ <f:validateLength minimum="4" maximum="9" />
+ </h:inputText>
+ <f:facet name="footer">
+ <a4j:commandButton value="Validate" />
+ </f:facet>
+ </h:panelGrid>
+</h:form>
Added: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richmessage-richmessage_component.png
===================================================================
(Binary files differ)
Property changes on: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richmessage-richmessage_component.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richmessages-richmessages_component.png
===================================================================
(Binary files differ)
Property changes on: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richmessages-richmessages_component.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-RichFaces_overview.xml
===================================================================
--- root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-RichFaces_overview.xml 2010-03-09 23:46:13 UTC (rev 16544)
+++ root/docs/trunk/Developer_Guide/en-US/chap-Developer_Guide-RichFaces_overview.xml 2010-03-10 06:10:36 UTC (rev 16545)
@@ -12,9 +12,12 @@
<figure id="figu-Developer_Guide-RichFaces_overview-Request_processing_flow">
<title>Request processing flow</title>
<mediaobject>
- <imageobject>
- <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Request_processing_flow.png" format="PNG" width="450" contentwidth="150mm" />
+ <imageobject role="html">
+ <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Request_processing_flow.png" format="PNG" contentwidth="660px" />
</imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Request_processing_flow.png" format="PNG" contentwidth="150mm" />
+ </imageobject>
<textobject>
<para>
The RichFaces request processing flow.
@@ -66,9 +69,12 @@
<figure id="figu-Developer_Guide-Ajax_Filter-Request_processing_sequences">
<title>Request processing sequences</title>
<mediaobject>
- <imageobject>
- <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Request_processing_sequences.png" format="PNG" width="450" contentwidth="150mm" />
+ <imageobject role="html">
+ <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Request_processing_sequences.png" format="PNG" contentwidth="660px" />
</imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Request_processing_sequences.png" format="PNG" contentwidth="150mm" />
+ </imageobject>
<textobject>
<para>
The difference between processing a regular JSF request and an Ajax request with a filter.
@@ -82,9 +88,12 @@
<figure id="figu-Developer_Guide-Ajax_Filter-Resource_request_sequence">
<title>Resource request sequence</title>
<mediaobject>
- <imageobject>
- <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Resource_request_sequence.png" format="PNG" width="450" contentwidth="150mm" />
+ <imageobject role="html">
+ <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Resource_request_sequence.png" format="PNG" contentwidth="660px" />
</imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/figu-Developer_Guide-RichFaces_overview-Resource_request_sequence.png" format="PNG" contentwidth="150mm" />
+ </imageobject>
<textobject>
<para>
The difference between resource requests for a regular JSF request and an Ajax request with a filter.
15 years, 9 months
JBoss Rich Faces SVN: r16544 - in root/cdk/trunk/plugins/generator: src/main/java/org/richfaces/cdk/model and 5 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2010-03-09 18:46:13 -0500 (Tue, 09 Mar 2010)
New Revision: 16544
Added:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java
Removed:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java
Modified:
root/cdk/trunk/plugins/generator/pom.xml
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml
root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml
Log:
CODING IN PROGRESS - issue RF-7736: Library model verifier.
https://jira.jboss.org/jira/browse/RF-7736
XML-related tests fixed.
Modified: root/cdk/trunk/plugins/generator/pom.xml
===================================================================
--- root/cdk/trunk/plugins/generator/pom.xml 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/pom.xml 2010-03-09 23:46:13 UTC (rev 16544)
@@ -116,7 +116,7 @@
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
- <version>1.2</version>
+ <version>1.3</version>
</dependency>
<dependency>
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -91,6 +91,8 @@
private final ModelCollection<BehaviorModel> behaviors = ModelCollection.<BehaviorModel>create();
private ConfigExtension extension;
+
+ private boolean metadataComplete;
/**
* <p class="changed_added_4_0">
@@ -139,6 +141,7 @@
}
}
+ @SuppressWarnings("unchecked")
private void visitCollection(Visitor visitor, ModelCollection<?> models) {
for (ModelElement component : models) {
component.accept(visitor);
@@ -261,6 +264,22 @@
this.extension = extension;
}
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @return the metadataComplete
+ */
+ public boolean isMetadataComplete() {
+ return this.metadataComplete;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ * @param metadataComplete the metadataComplete to set
+ */
+ public void setMetadataComplete(boolean metadataComplete) {
+ this.metadataComplete = metadataComplete;
+ }
+
@Override
public long lastModified() {
return lastModified;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/util/JavaUtils.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -21,14 +21,29 @@
*/
package org.richfaces.cdk.util;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
import java.util.Locale;
+import org.richfaces.cdk.CdkException;
+import org.richfaces.cdk.xmlconfig.JAXBBinding;
+
+import com.google.common.collect.ImmutableMap;
+
/**
* @author Nick Belaevski
*
*/
public final class JavaUtils {
+ public static final ImmutableMap<Class<?>, Class<?>> BOXING_CLASSES =
+ ImmutableMap.<Class<?>, Class<?>> builder().put(Boolean.TYPE, Boolean.class).put(Character.TYPE,
+ Character.class).put(Byte.TYPE, Byte.class).put(Short.TYPE, Short.class).put(Integer.TYPE, Integer.class)
+ .put(Long.TYPE, Long.class).put(Float.TYPE, Float.class).put(Double.TYPE, Double.class).build();
+
private JavaUtils() {
// private constructor
}
@@ -166,4 +181,65 @@
public static boolean isdigit(char c) {
return (c >= '0') && (c <= '9');
}
+
+ public static Class<?> toBoxingClass(Class<?> targetType) {
+ if (targetType.isPrimitive()) {
+ return BOXING_CLASSES.get(targetType);
+ }
+ return targetType;
+ }
+
+ public static void copyProperties(Object source, Object destination) throws CdkException {
+ try {
+ PropertyDescriptor[] targetProperties =
+ Introspector.getBeanInfo(destination.getClass()).getPropertyDescriptors();
+ PropertyDescriptor[] sourceProperties =
+ Introspector.getBeanInfo(source.getClass()).getPropertyDescriptors();
+
+ for (PropertyDescriptor targetProperty : targetProperties) {
+ String name = targetProperty.getName();
+
+ for (PropertyDescriptor sourceProperty : sourceProperties) {
+ if (!JAXBBinding.IGNORE_PROPERTIES.contains(name) && name.equals(sourceProperty.getName())) {
+
+ writeProperty(source, destination, targetProperty, sourceProperty);
+ }
+ }
+ }
+ } catch (Exception e) {
+ throw new CdkException("Properties copiing error", e);
+ }
+ }
+
+ public static void writeProperty(Object source, Object destination, PropertyDescriptor targetProperty,
+ PropertyDescriptor sourceProperty) throws IllegalAccessException, InvocationTargetException {
+ Method readMethod = sourceProperty.getReadMethod();
+ if (readMethod == null) {
+ return;
+ }
+
+ Object propertyValue = readMethod.invoke(source);
+ if (propertyValue != null) {
+ Class<?> targetType = targetProperty.getPropertyType();
+ targetType = toBoxingClass(targetType);
+ Class<?> sourceType = sourceProperty.getPropertyType();
+ sourceType = toBoxingClass(sourceType);
+ Method writeMethod = targetProperty.getWriteMethod();
+ if (JAXBBinding.isCollections(targetType, propertyValue)) {
+ Collection targetCollection = (Collection) targetProperty.getReadMethod().invoke(destination);
+
+ if (null != targetCollection) {
+ targetCollection.addAll((Collection) propertyValue);
+ } else if (writeMethod != null) {
+ writeMethod.invoke(destination, propertyValue);
+ }
+ } else if (writeMethod != null) {
+ if (targetType.equals(sourceType)) {
+ writeMethod.invoke(destination, propertyValue);
+ } else if (targetType.equals(String.class)) {
+ writeMethod.invoke(destination, propertyValue.toString());
+ }
+ }
+ }
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AdapterBase.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -23,24 +23,20 @@
package org.richfaces.cdk.xmlconfig.model;
+import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.model.ModelElement;
-import org.richfaces.cdk.model.Extensible;
import org.richfaces.cdk.model.ConfigExtension;
-import org.richfaces.cdk.xmlconfig.JAXBBinding;
+import org.richfaces.cdk.model.Extensible;
+import org.richfaces.cdk.model.ModelElement;
+import org.richfaces.cdk.util.JavaUtils;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import java.util.Collection;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.beans.PropertyDescriptor;
-import java.beans.Introspector;
/**
* <p class="changed_added_4_0"></p>
@@ -48,7 +44,7 @@
* @author asmirnov(a)exadel.com
*/
public abstract class AdapterBase<Bean, Model> extends XmlAdapter<Bean, Model> {
-
+
@Override
public Bean marshal(Model model) throws CdkException {
Bean bean = createBean(getBeanClass(model), model);
@@ -75,7 +71,7 @@
Bean adapter = beanClass.newInstance();
// Copy properties from model to adapter.
- copyProperties(model, adapter);
+ JavaUtils.copyProperties(model, adapter);
if (model instanceof Extensible && adapter instanceof Extensible) {
copyExtensions((Extensible) model, (Extensible) adapter, true);
}
@@ -108,7 +104,7 @@
return ((Class<E>) method.getReturnType()).newInstance();
}
- private void copyExtensions(Extensible source, Extensible<ConfigExtension> destination, boolean fromModel) {
+ private void copyExtensions(Extensible source, Extensible<ConfigExtension> destination, Boolean fromModel) {
try {
ConfigExtension sourceExtension = source.getExtension();
@@ -118,16 +114,16 @@
destinationExtension.setExtensions(sourceExtension.getExtensions());
if (fromModel) {
- copyProperties(source, destinationExtension);
+ JavaUtils.copyProperties(source, destinationExtension);
} else {
- copyProperties(sourceExtension, destination);
+ JavaUtils.copyProperties(sourceExtension, destination);
}
destination.setExtension(destinationExtension);
} else if (fromModel) {
ConfigExtension destinationExtension = createExtension(destination);
- copyProperties(source, destinationExtension);
+ JavaUtils.copyProperties(source, destinationExtension);
destination.setExtension(destinationExtension);
}
} catch (Exception e) {
@@ -135,66 +131,12 @@
}
}
- protected static void copyProperties(Object source, Object destination) throws CdkException {
- try {
- PropertyDescriptor[] targetProperties =
- Introspector.getBeanInfo(destination.getClass()).getPropertyDescriptors();
- PropertyDescriptor[] sourceProperties =
- Introspector.getBeanInfo(source.getClass()).getPropertyDescriptors();
-
- for (PropertyDescriptor targetProperty : targetProperties) {
- String name = targetProperty.getName();
-
- for (PropertyDescriptor sourceProperty : sourceProperties) {
- if (!JAXBBinding.IGNORE_PROPERTIES.contains(name)
- && name.equals(sourceProperty.getName())) {
-
- writeProperty(source, destination, targetProperty, sourceProperty);
- }
- }
- }
- } catch (Exception e) {
- throw new CdkException("Properties copiing error", e);
- }
- }
-
- private static void writeProperty(Object source, Object destination, PropertyDescriptor targetProperty, PropertyDescriptor sourceProperty) throws IllegalAccessException, InvocationTargetException {
- Method readMethod = sourceProperty.getReadMethod();
- if (readMethod == null) {
- return;
- }
-
- Object propertyValue = readMethod.invoke(source);
- if (propertyValue != null) {
- Class<?> targetType = targetProperty.getPropertyType();
- Class<?> sourceType = sourceProperty.getPropertyType();
-
- Method writeMethod = targetProperty.getWriteMethod();
- if (JAXBBinding.isCollections(targetType, propertyValue)) {
- Collection targetCollection =
- (Collection) targetProperty.getReadMethod().invoke(destination);
-
- if (null != targetCollection) {
- targetCollection.addAll((Collection) propertyValue);
- } else if (writeMethod != null) {
- writeMethod.invoke(destination, propertyValue);
- }
- } else if (writeMethod != null) {
- if (targetType.equals(sourceType)) {
- writeMethod.invoke(destination, propertyValue);
- } else if (targetType.equals(String.class)) {
- writeMethod.invoke(destination, propertyValue.toString());
- }
- }
- }
- }
-
protected Model createModelElement(Class<? extends Model> modelClass, Bean adapter) {
try {
Model modelBean = modelClass.newInstance();
- copyProperties(adapter, modelBean);
+ JavaUtils.copyProperties(adapter, modelBean);
if (adapter instanceof Extensible && modelBean instanceof Extensible) {
copyExtensions((Extensible) adapter, (Extensible) modelBean, false);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/BehaviorBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -29,8 +29,8 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.ConfigExtension;
import org.richfaces.cdk.model.FacesId;
import com.google.common.collect.Lists;
@@ -40,12 +40,12 @@
* @since Jan 21, 2010
*/
@XmlType(name = "faces-config-behaviorType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE,
- propOrder={"id", "behaviorClass", "attributes", "extension"})
+ propOrder={"id", "targetClass", "attributes", "extension"})
@XmlJavaTypeAdapter(BehaviorAdapter.class)
public class BehaviorBean extends ExtensibleBean<BehaviorBean.BehaviorExtension> {
- private String behaviorClass;
+ private ClassName targetClass;
private List<PropertyBase> attributes = Lists.newArrayList();
@@ -61,12 +61,12 @@
}
@XmlElement(name = "behavior-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
- public String getBehaviorClass() {
- return behaviorClass;
+ public ClassName getTargetClass() {
+ return targetClass;
}
- public void setBehaviorClass(String behaviorClass) {
- this.behaviorClass = behaviorClass;
+ public void setTargetClass(ClassName behaviorClass) {
+ this.targetClass = behaviorClass;
}
@@ -93,5 +93,6 @@
super.setExtension(extension);
}
- public static class BehaviorExtension extends ConfigExtension { }
+ public static class BehaviorExtension extends ExtensionBeanBase {
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassAdapter.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -32,18 +32,14 @@
*
* @author asmirnov(a)exadel.com
*/
-public class ClassAdapter extends XmlAdapter<ClassBean, ClassName> {
+public class ClassAdapter extends XmlAdapter<String, ClassName> {
@Override
- public ClassBean marshal(ClassName v) throws Exception {
- ClassBean bean = new ClassBean();
-
- bean.setName(v.getName());
-
- return bean;
+ public String marshal(ClassName v) throws Exception {
+ return v.getName();
}
@Override
- public ClassName unmarshal(ClassBean v) throws Exception {
- return new ClassName(v.getName());
+ public ClassName unmarshal(String v) throws Exception {
+ return new ClassName(v);
}
}
Deleted: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ClassBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -1,58 +0,0 @@
-/*
- * $Id$
- *
- * License Agreement.
- *
- * Rich Faces - Natural Ajax for Java Server Faces (JSF)
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.cdk.xmlconfig.model;
-
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-import org.richfaces.cdk.model.ComponentLibrary;
-
-/**
- * <p class="changed_added_4_0"></p>
- *
- * @author asmirnov(a)exadel.com
- */
-@XmlType(name = "fully-qualified-classType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
-public class ClassBean {
- private String name;
-
- /**
- * <p class="changed_added_4_0"></p>
- *
- * @return the name
- */
- @XmlValue
- public String getName() {
- return name;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
- *
- * @param name the name to set
- */
- public void setName(String name) {
- this.name = name;
- }
-}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -32,7 +32,6 @@
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.ConfigExtension;
import org.richfaces.cdk.model.EventModel;
import org.richfaces.cdk.model.FacesId;
import org.richfaces.cdk.model.FacetModel;
@@ -46,15 +45,14 @@
* @author asmirnov(a)exadel.com
*/
@XmlType(name = "faces-config-componentType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE,
- propOrder={"type", "componentClass", "facets",
+ propOrder={"type", "targetClass", "facets",
"attributes", "extension"})
@XmlJavaTypeAdapter(ComponentAdapter.class)
public class ComponentBean extends ExtensibleBean<ComponentBean.ComponentExtension> {
- private boolean generate = false;
-
+
private List<Property> attributes = Lists.newArrayList();
private List<FacetModel> facets = Lists.newArrayList();
- private ClassName componentClass;
+ private ClassName targetClass;
private FacesId type;
/**
@@ -79,21 +77,21 @@
/**
* <p class="changed_added_4_0"></p>
*
- * @return the componentClass
+ * @return the targetClass
*/
@XmlElement(name = "component-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
@XmlJavaTypeAdapter(ClassAdapter.class)
- public ClassName getComponentClass() {
- return componentClass;
+ public ClassName getTargetClass() {
+ return targetClass;
}
/**
* <p class="changed_added_4_0"></p>
*
- * @param className the componentClass to set
+ * @param className the targetClass to set
*/
- public void setComponentClass(ClassName className) {
- this.componentClass = className;
+ public void setTargetClass(ClassName className) {
+ this.targetClass = className;
}
/**
@@ -161,13 +159,10 @@
super.setExtension(extension);
}
- public static class ComponentExtension extends ConfigExtension {
+ public static class ComponentExtension extends ExtensionBeanBase {
private List<String> rendererTypes = Lists.newArrayList();
private List<EventModel> events = Lists.newArrayList();
- private ClassName baseClass;
private String family;
- private boolean generate;
-
/**
* <p class="changed_added_4_0"></p>
*
@@ -190,45 +185,6 @@
/**
* <p class="changed_added_4_0"></p>
*
- * @return the baseClass
- */
- @XmlElement(name = "base-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- @XmlJavaTypeAdapter(ClassAdapter.class)
- public ClassName getBaseClass() {
- return baseClass;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
- *
- * @param baseClass the baseClass to set
- */
- public void setBaseClass(ClassName baseClass) {
- this.baseClass = baseClass;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
- *
- * @return the generate
- */
- @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isGenerate() {
- return generate;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
- *
- * @param generate the generate to set
- */
- public void setGenerate(boolean generate) {
- this.generate = generate;
- }
-
- /**
- * <p class="changed_added_4_0"></p>
- *
* @param rendererTypes the rendererTypes to set
*/
@XmlElement(name = "renderer-type", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
@@ -266,11 +222,4 @@
}
}
- public boolean isGenerate() {
- return generate;
- }
-
- public void setGenerate(boolean generate) {
- this.generate = generate;
- }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ConverterBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -28,8 +28,8 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.ConfigExtension;
import org.richfaces.cdk.model.FacesId;
import com.google.common.collect.Lists;
@@ -39,15 +39,15 @@
* @since Jan 6, 2010
*/
@XmlType(name = "faces-config-converterType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE,
- propOrder={"id", "converterForClass", "converterClass",
+ propOrder={"id", "converterForClass", "targetClass",
"attributes", "extension"})
@XmlJavaTypeAdapter(ConverterAdapter.class)
public class ConverterBean extends ExtensibleBean<ConverterBean.ConverterExtension> {
- private String converterForClass;
+ private ClassName converterForClass;
- private String converterClass;
+ private ClassName targetClass;
private List<PropertyBase> attributes = Lists.newArrayList();
@@ -63,21 +63,21 @@
}
@XmlElement(name = "converter-for-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
- public String getConverterForClass() {
+ public ClassName getConverterForClass() {
return converterForClass;
}
- public void setConverterForClass(String converterForClass) {
+ public void setConverterForClass(ClassName converterForClass) {
this.converterForClass = converterForClass;
}
@XmlElement(name = "converter-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
- public String getConverterClass() {
- return converterClass;
+ public ClassName getTargetClass() {
+ return targetClass;
}
- public void setConverterClass(String converterClass) {
- this.converterClass = converterClass;
+ public void setTargetClass(ClassName converterClass) {
+ this.targetClass = converterClass;
}
/**
@@ -118,5 +118,7 @@
return super.getExtension();
}
- public static class ConverterExtension extends ConfigExtension { }
+ public static class ConverterExtension extends ExtensionBeanBase {
+
+ }
}
Added: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java (rev 0)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -0,0 +1,58 @@
+package org.richfaces.cdk.xmlconfig.model;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.richfaces.cdk.model.ClassName;
+import org.richfaces.cdk.model.ComponentLibrary;
+import org.richfaces.cdk.model.ConfigExtension;
+
+public class ExtensionBeanBase extends ConfigExtension {
+
+ private ClassName baseClass;
+ private Boolean generate;
+
+ public ExtensionBeanBase() {
+ super();
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ *
+ * @return the baseClass
+ */
+ @XmlElement(name = "base-class", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ @XmlJavaTypeAdapter(ClassAdapter.class)
+ public ClassName getBaseClass() {
+ return baseClass;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ *
+ * @param baseClass the baseClass to set
+ */
+ public void setBaseClass(ClassName baseClass) {
+ this.baseClass = baseClass;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ *
+ * @return the generate
+ */
+ @XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
+ public Boolean getGenerate() {
+ return generate;
+ }
+
+ /**
+ * <p class="changed_added_4_0"></p>
+ *
+ * @param generate the generate to set
+ */
+ public void setGenerate(Boolean generate) {
+ this.generate = generate;
+ }
+
+}
\ No newline at end of file
Property changes on: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ExtensionBeanBase.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -73,7 +73,7 @@
private String version = "2.0";
@XmlAttribute(name = "metadata-complete")
- private boolean metadataComplete;
+ private Boolean metadataComplete;
@XmlElement(name = "faces-config-extension", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
private FacesConfigExtension extension;
@@ -100,7 +100,7 @@
* <p class="changed_added_4_0"></p>
* @return the metadataComplete
*/
- public boolean isMetadataComplete() {
+ public Boolean getMetadataComplete() {
return this.metadataComplete;
}
@@ -108,7 +108,7 @@
* <p class="changed_added_4_0"></p>
* @param metadataComplete the metadataComplete to set
*/
- public void setMetadataComplete(boolean metadataComplete) {
+ public void setMetadataComplete(Boolean metadataComplete) {
this.metadataComplete = metadataComplete;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -78,7 +78,7 @@
* @author asmirnov(a)exadel.com
*/
public static final class FacetExtension extends ConfigExtension {
- private boolean generate;
+ private Boolean generate;
/**
* <p class="changed_added_4_0"></p>
@@ -86,7 +86,7 @@
* @return the generate
*/
@XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isGenerate() {
+ public Boolean getGenerate() {
return generate;
}
@@ -95,7 +95,7 @@
*
* @param generate the generate to set
*/
- public void setGenerate(boolean generate) {
+ public void setGenerate(Boolean generate) {
this.generate = generate;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBase.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -137,15 +137,15 @@
* @author asmirnov(a)exadel.com
*/
public static class PropertyExtension extends ConfigExtension {
- private boolean passThrough = false;
+ private Boolean passThrough;
private Set<EventName> eventNames = Sets.newLinkedHashSet();
private List<ClassName> signature = Lists.newArrayList();
private Set<String> aliases = Sets.newHashSet();
- private boolean generate;
- private boolean hidden;
- private boolean literal;
- private boolean readOnly;
- private boolean required;
+ private Boolean generate;
+ private Boolean hidden;
+ private Boolean literal;
+ private Boolean readOnly;
+ private Boolean required;
/**
* <p class="changed_added_4_0"></p>
@@ -153,7 +153,7 @@
* @return the generate
*/
@XmlElement(name = "generate", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isGenerate() {
+ public Boolean getGenerate() {
return generate;
}
@@ -162,7 +162,7 @@
*
* @param generate the generate to set
*/
- public void setGenerate(boolean generate) {
+ public void setGenerate(Boolean generate) {
this.generate = generate;
}
@@ -172,7 +172,7 @@
* @return the hidden
*/
@XmlElement(name = "hidden", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isHidden() {
+ public Boolean getHidden() {
return hidden;
}
@@ -181,7 +181,7 @@
*
* @param hidden the hidden to set
*/
- public void setHidden(boolean hidden) {
+ public void setHidden(Boolean hidden) {
this.hidden = hidden;
}
@@ -191,7 +191,7 @@
* @return the literal
*/
@XmlElement(name = "literal", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isLiteral() {
+ public Boolean getLiteral() {
return literal;
}
@@ -200,7 +200,7 @@
*
* @param literal the literal to set
*/
- public void setLiteral(boolean literal) {
+ public void setLiteral(Boolean literal) {
this.literal = literal;
}
@@ -210,7 +210,7 @@
* @return the required
*/
@XmlElement(name = "required", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isRequired() {
+ public Boolean getRequired() {
return required;
}
@@ -219,7 +219,7 @@
*
* @param required the required to set
*/
- public void setRequired(boolean required) {
+ public void setRequired(Boolean required) {
this.required = required;
}
@@ -229,7 +229,7 @@
* @return the readOnly
*/
@XmlElement(name = "read-only", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isReadOnly() {
+ public Boolean getReadOnly() {
return readOnly;
}
@@ -238,7 +238,7 @@
*
* @param readOnly the readOnly to set
*/
- public void setReadOnly(boolean readOnly) {
+ public void setReadOnly(Boolean readOnly) {
this.readOnly = readOnly;
}
@@ -248,7 +248,7 @@
* @return the passThrough
*/
@XmlElement(name = "pass-through", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isPassThrough() {
+ public Boolean getPassThrough() {
return passThrough;
}
@@ -257,7 +257,7 @@
*
* @param passThrough the passThrough to set
*/
- public void setPassThrough(boolean passThrough) {
+ public void setPassThrough(Boolean passThrough) {
this.passThrough = passThrough;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/PropertyBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -23,13 +23,13 @@
package org.richfaces.cdk.xmlconfig.model;
-import org.richfaces.cdk.model.ClassName;
-import org.richfaces.cdk.model.ComponentLibrary;
-
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.richfaces.cdk.model.ClassName;
+import org.richfaces.cdk.model.ComponentLibrary;
+
/**
* <p class="changed_added_4_0"></p>
*
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -23,16 +23,23 @@
package org.richfaces.cdk.xmlconfig.model;
-import com.google.common.collect.Lists;
-import org.richfaces.cdk.model.*;
-import org.richfaces.cdk.model.RenderKitModel.Id;
+import java.util.List;
import javax.faces.render.RenderKitFactory;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.List;
+import org.richfaces.cdk.model.BehaviorRenderer;
+import org.richfaces.cdk.model.ClassName;
+import org.richfaces.cdk.model.ComponentLibrary;
+import org.richfaces.cdk.model.ConfigExtension;
+import org.richfaces.cdk.model.RenderKitModel;
+import org.richfaces.cdk.model.RendererModel;
+import org.richfaces.cdk.model.RenderKitModel.Id;
+
+import com.google.common.collect.Lists;
+
/**
* <p class="changed_added_4_0"></p>
*
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -163,7 +163,7 @@
public static class RendererExtension extends ConfigExtension {
private TagModel tag;
- private boolean rendersChildren;
+ private Boolean rendersChildren;
/**
* <p class="changed_added_4_0">
@@ -195,7 +195,7 @@
* @return the rendersChildren
*/
@XmlElement(name = "renders-children", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
- public boolean isRendersChildren() {
+ public Boolean getRendersChildren() {
return this.rendersChildren;
}
@@ -205,7 +205,7 @@
*
* @param rendersChildren the rendersChildren to set
*/
- public void setRendersChildren(boolean rendersChildren) {
+ public void setRendersChildren(Boolean rendersChildren) {
this.rendersChildren = rendersChildren;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ValidatorBean.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -28,8 +28,8 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.ConfigExtension;
import org.richfaces.cdk.model.FacesId;
import com.google.common.collect.Lists;
@@ -39,12 +39,12 @@
* @since Jan 13, 2010
*/
@XmlType(name = "faces-config-validatorType", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE,
- propOrder={"id", "validatorClass", "attributes", "extension"})
+ propOrder={"id", "targetClass", "attributes", "extension"})
@XmlJavaTypeAdapter(ValidatorAdapter.class)
public class ValidatorBean extends ExtensibleBean<ValidatorBean.ValidatorExtension> {
- private String validatorClass;
+ private ClassName targetClass;
private List<PropertyBase> attributes = Lists.newArrayList();
@@ -60,12 +60,12 @@
}
@XmlElement(name = "validator-class", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
- public String getValidatorClass() {
- return validatorClass;
+ public ClassName getTargetClass() {
+ return targetClass;
}
- public void setValidatorClass(String validatorClass) {
- this.validatorClass = validatorClass;
+ public void setTargetClass(ClassName validatorClass) {
+ this.targetClass = validatorClass;
}
@@ -92,5 +92,7 @@
super.setExtension(extension);
}
- public static class ValidatorExtension extends ConfigExtension { }
+ public static class ValidatorExtension extends ExtensionBeanBase {
+
+ }
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/package-info.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -27,8 +27,9 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters;
+import org.richfaces.cdk.model.AttributeModel;
import org.richfaces.cdk.model.ClassName;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.FacesId;
-import org.richfaces.cdk.model.AttributeModel;
import org.richfaces.cdk.model.Property;
+
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/BehaviorClassGeneratorTest.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -56,6 +56,7 @@
replay(output);
BehaviorModel behavior = new BehaviorModel(FacesId.parseId("foo.bar"));
+ behavior.setGenerate(true);
behavior.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedBehavior"));
behavior.setBaseClass(ClassName.parseName("Object"));
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ConverterClassGeneratorTest.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -59,7 +59,7 @@
converter.setId(FacesId.parseId("foo.bar"));
converter.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedConverter"));
converter.setBaseClass(ClassName.parseName("Object"));
-
+ converter.setGenerate(true);
addAttribute(converter, "myClass", PropertyModel.class, true);
addAttribute(converter, "testObject", Object.class, true);
addAttribute(converter, "testBoolean", Boolean.class, true);
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ValidatorClassGeneratorTest.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -59,7 +59,7 @@
validator.setId(FacesId.parseId("foo.bar"));
validator.setTargetClass(ClassName.parseName("org.richfaces.cdk.generate.java.GeneratedValidator"));
validator.setBaseClass(ClassName.parseName("Object"));
-
+ validator.setGenerate(true);
addAttribute(validator, "testValue", Object.class, true);
// TODO test with primitiv type 'boolean'
addAttribute(validator, "testFlag", Boolean.class, true);
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -104,7 +104,7 @@
assertEquals("panel-large.gif", component.getIcon().getLargeIcon());
assertEquals("Panel component", component.getDescription());
assertEquals("Panel", component.getDisplayname());
- assertFalse(component.isGenerate());
+ assertTrue(component.isGenerate());
FacetModel facet = Iterables.getOnlyElement(component.getFacets());
assertEquals("header", facet.getName());
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/XmlTest.java 2010-03-09 23:46:13 UTC (rev 16544)
@@ -23,6 +23,7 @@
import org.custommonkey.xmlunit.Diff;
import org.custommonkey.xmlunit.Validator;
+import org.custommonkey.xmlunit.XMLUnit;
import org.junit.Assert;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter;
@@ -63,12 +64,12 @@
if (expectedFacesConfigFile == null) {
return;
}
-
+ XMLUnit.setNormalizeWhitespace(true);
Diff xmlDiff = new Diff(
new StringReader(writer.toString()),
new InputStreamReader(expectedFacesConfigFile));
- Assert.assertTrue("XML was not similar", xmlDiff.similar());
+ Assert.assertTrue("XML was not similar:"+xmlDiff.toString(), xmlDiff.similar());
}
protected StringWriter generateFacesConfig(ComponentLibrary library) throws Exception {
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/BehaviorBeanTest.xml 2010-03-09 23:46:13 UTC (rev 16544)
@@ -3,7 +3,9 @@
<behavior>
<behavior-id>my_behavior</behavior-id>
<behavior-class>java.lang.Object</behavior-class>
- <behavior-extension/>
+ <behavior-extension>
+ <cdk:generate>false</cdk:generate>
+ </behavior-extension>
</behavior>
<faces-config-extension/>
</faces-config>
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ConverterBeanTest.xml 2010-03-09 23:46:13 UTC (rev 16544)
@@ -3,7 +3,9 @@
<converter>
<converter-id>my_converter</converter-id>
<converter-class>java.lang.Object</converter-class>
- <converter-extension/>
+ <converter-extension>
+ <cdk:generate>false</cdk:generate>
+ </converter-extension>
</converter>
<faces-config-extension/>
</faces-config>
\ No newline at end of file
Modified: root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml 2010-03-09 16:53:15 UTC (rev 16543)
+++ root/cdk/trunk/plugins/generator/src/test/resources/org/richfaces/cdk/xmlconfig/testmodel/ValidatorBeanTest.xml 2010-03-09 23:46:13 UTC (rev 16544)
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<faces-config metadata-complete="false" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <faces-config-extension/>
+<faces-config version="2.0" metadata-complete="false" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:cdk="http://richfaces.org/cdk/extensions" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<validator>
<validator-id>my_validator</validator-id>
<validator-class>java.lang.Object</validator-class>
- <validator-extension/>
+ <validator-extension>
+ <cdk:generate>false</cdk:generate>
+ </validator-extension>
</validator>
+ <faces-config-extension/>
</faces-config>
\ No newline at end of file
15 years, 9 months
JBoss Rich Faces SVN: r16543 - in root/ui-sandbox/trunk/components/datascroller/ui/src/main: java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-03-09 11:53:15 -0500 (Tue, 09 Mar 2010)
New Revision: 16543
Modified:
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java
root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml
Log:
add onclick script encoding
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-03-09 15:17:13 UTC (rev 16542)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-03-09 16:53:15 UTC (rev 16543)
@@ -335,7 +335,7 @@
return 1;
}
}
-
+
private void updateModel(int newPage) {
UIComponent dataTable = getDataTable();
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-03-09 15:17:13 UTC (rev 16542)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-03-09 16:53:15 UTC (rev 16543)
@@ -215,7 +215,7 @@
out.writeAttribute(HTML.ONMOUSEUP_ATTRIBUTE, "this.className='ds_digital ds_over'", null);
out.writeAttribute(HTML.ONMOUSEDOWN_ATTRIBUTE, "this.className='ds_digital ds_press'", null);
- out.writeAttribute(HTML.ONCLICK_ATTRIBUTE, getOnClick(Integer.toString(i + 1)), null);
+ out.writeAttribute(HTML.ONCLICK_ATTRIBUTE, getOnClick(context, component, Integer.toString(i + 1)), null);
}
if (null != style) {
@@ -228,8 +228,9 @@
- public Object getOnClick(String string) {
- return "Event.fire(this, 'rich:datascroller:onscroll', {'page': '" + string + "'});";
+ public Object getOnClick(FacesContext facesContext, UIComponent component, String string) {
+ String id = component.getClientId(facesContext);
+ return "RichFaces.Event.callHandlerById('" + id + "', 'rich:datascroller:onscroll', {'page': '" + string + "'});";
}
public void renderPages(FacesContext context, UIComponent component, int pageIndex, int count) throws IOException {
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml 2010-03-09 15:17:13 UTC (rev 16542)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/templates/datascroller.template.xml 2010-03-09 16:53:15 UTC (rev 16543)
@@ -20,7 +20,7 @@
<c:if test="#{controlsState.firstRendered}">
<c:choose>
<c:when test="#{controlsState.firstEnabled}">
- <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick('first')}">
+ <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick(facesContext, component, 'first')}">
««
</span>
</c:when>
@@ -36,7 +36,7 @@
<c:if test="#{controlsState.fastRewindRendered}">
<c:choose>
<c:when test="#{controlsState.fastRewindEnabled}">
- <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick('fastRewind')}">
+ <span class="ds_button ds_left" onmousedown="this.className='ds_button ds_left ds_over'" onmouseup="this.className='ds_button ds_left'" onmouseout="this.className='ds_button ds_left'" onclick="#{getOnClick(facesContext, component, 'fastRewind')}">
«
</span>
</c:when>
@@ -53,7 +53,7 @@
<c:if test="#{controlsState.fastForwardRendered}">
<c:choose>
<c:when test="#{controlsState.fastForwardEnabled}">
- <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick('fastForward')}">
+ <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick(facesContext, component, 'fastForward')}">
»
</span>
</c:when>
@@ -68,7 +68,7 @@
<c:if test="#{controlsState.lastRendered}">
<c:choose>
<c:when test="#{controlsState.lastEnabled}">
- <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick('last')}">
+ <span class="ds_button ds_right" onmousedown="this.className='ds_button ds_right ds_over'" onmouseup="this.className='ds_button ds_right'" onmouseout="this.className='ds_button ds_right'" onclick="#{getOnClick(facesContext, component, 'last')}">
»»
</span>
</c:when>
15 years, 9 months
JBoss Rich Faces SVN: r16542 - root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-03-09 10:17:13 -0500 (Tue, 09 Mar 2010)
New Revision: 16542
Modified:
root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
Log:
fix Table components search
Modified: root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java
===================================================================
--- root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-03-09 15:12:09 UTC (rev 16541)
+++ root/ui-sandbox/trunk/components/datascroller/ui/src/main/java/org/richfaces/component/UIDataScroller.java 2010-03-09 15:17:13 UTC (rev 16542)
@@ -1,6 +1,5 @@
package org.richfaces.component;
-import java.io.Serializable;
import java.util.Map;
import javax.el.ELException;
@@ -112,7 +111,7 @@
if (forComp == null) {
throw new IllegalArgumentException("could not find dataTable with id '" + forAttribute + "'");
- } else if (!(forComp instanceof UIData) || !(forComp instanceof UIDataAdaptor)) {
+ } else if (!((forComp instanceof UIData) || (forComp instanceof UIDataAdaptor))) {
throw new IllegalArgumentException( "component with id '" + forAttribute
+ "' must be of type " + UIData.class.getName() + " or " + UIDataAdaptor.class
15 years, 9 months
JBoss Rich Faces SVN: r16541 - root/ui-sandbox/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-03-09 10:12:09 -0500 (Tue, 09 Mar 2010)
New Revision: 16541
Modified:
root/ui-sandbox/trunk/pom.xml
Log:
Modified: root/ui-sandbox/trunk/pom.xml
===================================================================
--- root/ui-sandbox/trunk/pom.xml 2010-03-09 15:11:26 UTC (rev 16540)
+++ root/ui-sandbox/trunk/pom.xml 2010-03-09 15:12:09 UTC (rev 16541)
@@ -31,7 +31,7 @@
<goals>
<goal>generate</goal>
</goals>
- <inherited>false</inherited>
+ <inherited>true</inherited>
<configuration>
</configuration>
</execution>
15 years, 9 months
JBoss Rich Faces SVN: r16540 - in root/examples-sandbox/trunk/components/tables: src/main/java/org/richfaces/demo/utils and 1 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2010-03-09 10:11:26 -0500 (Tue, 09 Mar 2010)
New Revision: 16540
Modified:
root/examples-sandbox/trunk/components/tables/pom.xml
root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java
root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml
Log:
add daatscroller component
Modified: root/examples-sandbox/trunk/components/tables/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/tables/pom.xml 2010-03-09 14:24:55 UTC (rev 16539)
+++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-03-09 15:11:26 UTC (rev 16540)
@@ -49,16 +49,25 @@
<groupId>org.richfaces.sandbox.ui.components</groupId>
<artifactId>${example.componentName}-ui</artifactId>
</dependency>
- <dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>${example.componentName}-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>${example.componentName}-impl</artifactId>
- </dependency>
-
- <dependency>
+ <dependency>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <artifactId>${example.componentName}-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <artifactId>${example.componentName}-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <artifactId>datascroller-api</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.sandbox.ui.components</groupId>
+ <artifactId>datascroller-ui</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
<version>3.1.0.GA</version>
Modified: root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java
===================================================================
--- root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java 2010-03-09 14:24:55 UTC (rev 16539)
+++ root/examples-sandbox/trunk/components/tables/src/main/java/org/richfaces/demo/utils/EmployeeUtils.java 2010-03-09 15:11:26 UTC (rev 16540)
@@ -18,7 +18,7 @@
addEmployeeToCollection(employeeList, "2Hideo Kodzima", "Vice Prezident", "khideo(a)konami.jp", "AMicrosoft", "419-615-2730", "Tokyo, Japan");
addEmployeeToCollection(employeeList, "3Stan Carpenter", "Lead Designer", "scarpenter(a)ndogs.com", "AMicrosoft", "714-647-3380", "Tokyo, Japan");
addEmployeeToCollection(employeeList, "Clement Gaudet", "Chief Technology Officer", "cgaudet(a)rstar.com", "Rock Star", "403-444-1100", "Canada");
- /*addEmployeeToCollection(employeeList, "Kazunori Yamauchi", "CEO", "ykazunori(a)sony.jp", "Sony", "410-561-4400", "Tokyo, Japan");
+ addEmployeeToCollection(employeeList, "Kazunori Yamauchi", "CEO", "ykazunori(a)sony.jp", "Sony", "410-561-4400", "Tokyo, Japan");
addEmployeeToCollection(employeeList, "Willis Aberg", "VP and CIO", "waberg(a)evjscet.com", "Evj Scet", "+046-155248000", "Tacoma, WA United States");
addEmployeeToCollection(employeeList, "Nick Acree", "Computer Technician", "nacree(a)grifcity.com", "City Of Griffin", "781-229-9599", "Houston, TX United States");
addEmployeeToCollection(employeeList, "RIchard L. Adams", "Technology", "rladams(a)penergy.com", "Panhandle Energy", "713-789-1400", "Valencia, CA United States");
@@ -1345,7 +1345,7 @@
addEmployeeToCollection(employeeList, "Derrik Khoo Sin Huat", "CTO", "aksinhuat(a)aes.com", "The AES Corporation", "864-233-4064", "Sydney, Australia");
addEmployeeToCollection(employeeList, "Rick Kelsven", "Network Analyst", "rkelsven(a)rudny.com", "Rudny's Inc", "208-356-4991", "Bangkok, Thailand");
- */
+
return employeeList;
}
Modified: root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml
===================================================================
--- root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-03-09 14:24:55 UTC (rev 16539)
+++ root/examples-sandbox/trunk/components/tables/src/main/webapp/home.xhtml 2010-03-09 15:11:26 UTC (rev 16540)
@@ -3,7 +3,9 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://richfaces.org/rich">
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:ds="http://richfaces.org/datascroller"
+ >
<f:view contentType="text/html"/>
<h:head>
@@ -13,7 +15,7 @@
<h:body>
<h:form id="form1">
- <rich:dataTable var="record" value="#{dataBean.employeeList}" rows="20" sortMode="single">
+ <rich:dataTable id="richTable" var="record" value="#{dataBean.employeeList}" rows="20" sortMode="single">
<f:facet name="caption">
<h:outputText id="captioFacet1" value="Caption Facet" />
</f:facet>
@@ -77,6 +79,9 @@
</f:facet>
</rich:dataTable>
+
+ <ds:dataScroller id="ds" for="richTable" maxPages="7"></ds:dataScroller>
+ <br/>
<h:commandButton value="submit" />
</h:form>
</h:body>
15 years, 9 months