richfaces-svn-commits
January 2010
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 152 discussions
JBoss Rich Faces SVN: r16253 - root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-01-11 08:35:55 -0500 (Mon, 11 Jan 2010)
New Revision: 16253
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js
Log:
base dataTable js api
Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js 2010-01-11 13:35:00 UTC (rev 16252)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/resources/datatable.js 2010-01-11 13:35:55 UTC (rev 16253)
@@ -1 +1,119 @@
-var c = 1;
\ No newline at end of file
+(function (jQuery, richfaces) {
+
+ richfaces.ui = richfaces.ui || {};
+
+ richfaces.ui.DataTable = function(id, options) {
+ this.id = id;
+ this.options = options;
+ this.sortMode = options.sortMode;
+ this.initializeColumns(options.columns);
+ };
+
+ jQuery.extend(richfaces.ui.DataTable.prototype, ( function () {
+
+ var columns = {};
+
+ var convertId = function (id){
+ return id.replace(/:/g, "\\:");
+ };
+
+ var getElement = function (id) {
+ return $("#" + convertId(id));
+ };
+
+ return {
+
+ initializeColumns : function(options) {
+ for(var property in options) {
+ var column = new richfaces.ui.Column(property, options[property]);
+ if(column.sortable) {
+ var element = getElement(column.id);
+ var _this = this;
+
+ element.bind(column.sortEvent, column, function(e) {
+ _this.processSortEvent(e);
+ });
+ }
+ columns[property] = column;
+ }
+ },
+
+ processSortEvent: function (e) {
+ var column = e.data;
+ column.toggleSortControl(e);
+
+ if(this.sortMode == 'single') {
+ for(var x in columns) {
+ if(columns[x].id != column.id) {
+ columns[x].resetSortControl();
+ }
+ }
+ }
+ }
+ }
+
+ })());
+
+})(jQuery, window.RichFaces);
+
+
+(function (jQuery, richfaces) {
+
+ richfaces.ui = richfaces.ui || {};
+
+ richfaces.ui.Column = function(id, options) {
+ this.id = id;
+ this.sortable = options.sorting.sortable;
+ this.sortOrder = options.sorting.sortOrder;
+ this.sortEvent = options.sorting.sortEvent;
+ this.initializeControls(id);
+ };
+
+ jQuery.extend(richfaces.ui.Column.prototype, ( function () {
+
+ var convertId = function (id){
+ return id.replace(/:/g, "\\:");
+ };
+
+ var getElement = function (id) {
+ return $("#" + convertId(id));
+ };
+
+ return {
+ initializeControls: function(id) {
+ this.asc = getElement(id+':ASCENDING');
+ this.desc = getElement(id+':DESCENDING');
+ this.unsort = getElement(id+':UNSORTED');
+ },
+
+ toggleSortControl: function(e) {
+
+ if(this.sortOrder == "ASCENDING") {
+ this.asc.hide();
+ this.unsort.hide();
+ this.desc.show();
+ this.sortOrder = "DESCENDING";
+
+ } else if(this.sortOrder == "DESCENDING") {
+ this.asc.show();
+ this.unsort.hide();
+ this.desc.hide();
+ this.sortOrder = "ASCENDING";
+
+ } else if(this.sortOrder == "UNSORTED") {
+ this.asc.hide();
+ this.unsort.hide();
+ this.desc.show();
+ this.sortOrder = "DESCENDING";
+ }
+ },
+
+ resetSortControl: function(){
+ this.asc.hide();
+ this.desc.hide();
+ this.unsort.show();
+ }
+ }
+ })());
+
+})(jQuery, window.RichFaces);
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16252 - in root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces: component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-01-11 08:35:00 -0500 (Mon, 11 Jan 2010)
New Revision: 16252
Removed:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/Expandable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/event/
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java
Log:
move to the api
Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/Expandable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/Expandable.java 2010-01-11 13:30:11 UTC (rev 16251)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/Expandable.java 2010-01-11 13:35:00 UTC (rev 16252)
@@ -1,23 +0,0 @@
-package org.richfaces.component;
-
-import javax.el.MethodExpression;
-
-import org.richfaces.event.ToggleListener;
-
-//TODO nick - move to API
-public interface Expandable {
-
- //TODO nick - setExpanded()
- public boolean isExpanded();
-
- public void addToggleListener(ToggleListener listener);
-
- public void removeToggleListener(ToggleListener listener);
-
- public ToggleListener[] getToggleListeners();
-
- public void setToggleListener(MethodExpression toggleExpression);
-
- public MethodExpression getToggleListener();
-
-}
Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java 2010-01-11 13:35:00 UTC (rev 16252)
@@ -1,15 +0,0 @@
-package org.richfaces.model.visual;
-
-import org.richfaces.model.Ordering;
-
-/**
- * @author Anton Belevich
- *
- */
-public interface ColumnVisualModel {
-
- public void setSortOrdering(Ordering sortOrder);
-
- public Ordering getSortOder();
-
-}
Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java 2010-01-11 13:35:00 UTC (rev 16252)
@@ -1,13 +0,0 @@
-package org.richfaces.model.visual;
-
-/**
- * @author Anton Belevich
- *
- */
-public interface DataTableVisualModel {
-
- public SortingFilteringVisualModel getSortingFilteringVisualModel();
-
- public void setSortingFilteringVisualModel(SortingFilteringVisualModel sortingFilteringVisualModel);
-
-}
Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-01-11 13:35:00 UTC (rev 16252)
@@ -1,16 +0,0 @@
-package org.richfaces.model.visual;
-
-import java.util.Collection;
-
-public interface SortingFilteringVisualModel {
-
- //TODO nick - make this Enum
- public String getSortMode();
-
- public void setSortMode(String sortMode);
-
- public Collection<String> getSortPriority();
-
- public void setSortPriority(Collection<String> sortPriority);
-
-}
Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java 2010-01-11 13:35:00 UTC (rev 16252)
@@ -1,13 +0,0 @@
-package org.richfaces.model.visual;
-
-/**
- * @author Anton Belevich
- *
- */
-public interface SubTableVisualModel {
-
- public boolean isExpanded();
-
- public void setExpanded(boolean expand);
-
-}
Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java 2010-01-11 13:30:11 UTC (rev 16251)
+++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/RowHolderBase.java 2010-01-11 13:35:00 UTC (rev 16252)
@@ -1,43 +0,0 @@
-package org.richfaces.renderkit;
-
-import javax.faces.context.FacesContext;
-
-import org.richfaces.component.Row;
-
-public abstract class RowHolderBase {
-
- private FacesContext context;
-
- private int currentRow;
-
- public RowHolderBase(FacesContext context) {
- this(context, 0);
- }
-
- public RowHolderBase(FacesContext context, int currentRow) {
- this.context = context;
- currentRow = 0;
- }
-
- public FacesContext getContext() {
- return context;
- }
-
- public abstract Row getRow();
-
- public int getCurrentRow() {
- return currentRow;
- }
-
- public int nextRow() {
- return ++currentRow;
- }
-
- public void setCurrentRow(int currentRow) {
- this.currentRow = currentRow;
- }
-
- public void resetCurrentRow() {
- this.currentRow = 0;
- }
-}
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16251 - in root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces: component and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-01-11 08:30:11 -0500 (Mon, 11 Jan 2010)
New Revision: 16251
Added:
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java
Modified:
root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java
Log:
move from the ui
Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java 2010-01-08 07:02:13 UTC (rev 16250)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Column.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -21,69 +21,11 @@
package org.richfaces.component;
-import javax.el.MethodExpression;
-import org.richfaces.model.Ordering;
-
/**
* Marker interface for all components used as column in UIDataTable
* @author shura
*
*/
public interface Column {
-
-
- /**
- * The column allows data sorting
- * @return
- */
- //TODO nick - deprecate this?
- public abstract boolean isSortable();
- public abstract void setSortable(boolean sortable);
-
- /**
- * expression used for column sorting.
- * literal value is treated as property of data object
- * EL-expression is evaluated on every data row
- * @param sortExpression
- */
- //TODO nick - use ValueExpression
- public abstract void setSortExpression(String sortExpression);
- public abstract String getSortExpression();
-
- /**
- * SortOrder is an enumeration of the possible sort orderings.
- *
- * @param sortOrder
- */
- //TODO nick - use annotation from Swing?
- public abstract void setSortOrder(Ordering sortOrder);
- public abstract Ordering getSortOrder();
-
- //TODO nick - "filterExpression" is missing
- //TODO nick - "selfSorted" is missing
-
- public abstract void setFilterMethod(MethodExpression methodExpression);
- public abstract MethodExpression getFilterMethod();
-
- //TODO nick - make this java.lang.Object. Use case: Long or Enum used as filtering criteria
- public abstract void setFilterValue(String filterValue);
- public abstract String getFilterValue();
-
- public abstract boolean isSelfSorted();
- public abstract void setSelfSorted(boolean selfSorted);
-
-
- /**
- * Out this column on new row
- * @parameter
- * @return the acceptClass
- */
- public abstract boolean isBreakBefore();
-
- /**
- * @param newBreakBefore the value to set
- */
- public abstract void setBreakBefore(boolean breakBefore);
-
}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/component/Expandable.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,23 @@
+package org.richfaces.component;
+
+import javax.el.MethodExpression;
+
+import org.richfaces.event.ToggleListener;
+
+//TODO nick - move to API
+public interface Expandable {
+
+ //TODO nick - setExpanded()
+ public boolean isExpanded();
+
+ public void addToggleListener(ToggleListener listener);
+
+ public void removeToggleListener(ToggleListener listener);
+
+ public ToggleListener[] getToggleListeners();
+
+ public void setToggleListener(MethodExpression toggleExpression);
+
+ public MethodExpression getToggleListener();
+
+}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleEvent.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,44 @@
+package org.richfaces.event;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+//TODO nick - move to api
+public class ToggleEvent extends FacesEvent {
+
+ private static final long serialVersionUID = 2916560585918250885L;
+
+ private boolean expanded;
+
+ private UIComponent target;
+
+ public ToggleEvent(UIComponent source, UIComponent target, boolean expanded) {
+ super(source);
+ this.target = target;
+ this.expanded = expanded;
+ }
+
+ public boolean isExpanded() {
+ return this.expanded;
+ }
+
+ @Override
+ public boolean isAppropriateListener(FacesListener listener) {
+ return (listener instanceof ToggleListener);
+ }
+
+ @Override
+ public void processListener(FacesListener listener) {
+ ((ToggleListener) listener).processToggle(this);
+ }
+
+ @Override
+ public UIComponent getComponent() {
+ return this.target;
+ }
+}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/event/ToggleListener.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,14 @@
+package org.richfaces.event;
+
+import javax.faces.event.FacesListener;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+//TODO nick - move to api
+public interface ToggleListener extends FacesListener {
+
+ public void processToggle(ToggleEvent event);
+
+}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/ColumnVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,15 @@
+package org.richfaces.model.visual;
+
+import org.richfaces.model.Ordering;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public interface ColumnVisualModel {
+
+ public void setSortOrdering(Ordering sortOrder);
+
+ public Ordering getSortOder();
+
+}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/DataTableVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,13 @@
+package org.richfaces.model.visual;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public interface DataTableVisualModel {
+
+ public SortingFilteringVisualModel getSortingFilteringVisualModel();
+
+ public void setSortingFilteringVisualModel(SortingFilteringVisualModel sortingFilteringVisualModel);
+
+}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SortingFilteringVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,16 @@
+package org.richfaces.model.visual;
+
+import java.util.Collection;
+
+public interface SortingFilteringVisualModel {
+
+ //TODO nick - make this Enum
+ public String getSortMode();
+
+ public void setSortMode(String sortMode);
+
+ public Collection<String> getSortPriority();
+
+ public void setSortPriority(Collection<String> sortPriority);
+
+}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/visual/SubTableVisualModel.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,13 @@
+package org.richfaces.model.visual;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public interface SubTableVisualModel {
+
+ public boolean isExpanded();
+
+ public void setExpanded(boolean expand);
+
+}
Added: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java
===================================================================
--- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java (rev 0)
+++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/renderkit/RowHolderBase.java 2010-01-11 13:30:11 UTC (rev 16251)
@@ -0,0 +1,43 @@
+package org.richfaces.renderkit;
+
+import javax.faces.context.FacesContext;
+
+import org.richfaces.component.Row;
+
+public abstract class RowHolderBase {
+
+ private FacesContext context;
+
+ private int currentRow;
+
+ public RowHolderBase(FacesContext context) {
+ this(context, 0);
+ }
+
+ public RowHolderBase(FacesContext context, int currentRow) {
+ this.context = context;
+ currentRow = 0;
+ }
+
+ public FacesContext getContext() {
+ return context;
+ }
+
+ public abstract Row getRow();
+
+ public int getCurrentRow() {
+ return currentRow;
+ }
+
+ public int nextRow() {
+ return ++currentRow;
+ }
+
+ public void setCurrentRow(int currentRow) {
+ this.currentRow = currentRow;
+ }
+
+ public void resetCurrentRow() {
+ this.currentRow = 0;
+ }
+}
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16250 - in root/docs/trunk/Component_Reference/en-US: extras and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: SeanRogers
Date: 2010-01-08 02:02:13 -0500 (Fri, 08 Jan 2010)
New Revision: 16250
Added:
root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richdataGrid-richdataGrid_example.xml_sample
root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richdataGrid-The_richdataGrid_component.png
root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richdataGrid-richdataGrid_example.png
Modified:
root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml
root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Tables_and_grids.xml
Log:
Updated tables and grids
Modified: root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml
===================================================================
--- root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml 2010-01-06 22:39:57 UTC (rev 16249)
+++ root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Common_features.xml 2010-01-08 07:02:13 UTC (rev 16250)
@@ -4,7 +4,7 @@
<chapter id="chap-Component_Reference-Common_features">
<title>Common features</title>
<para>
- Incomplete
+ This chapter covers those attributes and features that are common to many of the components in the tag libraries.
</para>
<section id="sect-Component_Reference-Common_features-Positioning_in_popup_components">
<title>Positioning in popup components</title>
Modified: root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Tables_and_grids.xml
===================================================================
--- root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Tables_and_grids.xml 2010-01-06 22:39:57 UTC (rev 16249)
+++ root/docs/trunk/Component_Reference/en-US/chap-Component_Reference-Tables_and_grids.xml 2010-01-08 07:02:13 UTC (rev 16250)
@@ -8,6 +8,33 @@
</para>
<section id="sect-Component_Reference-Tables_and_grids-richcolumn">
<title>rich:column</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ component-type: <classname>org.richfaces.Column</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-class: <classname>org.richfaces.component.html.HtmlColumn</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-family: <classname>org.richfaces.Column</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ renderer-type: <classname>org.richfaces.renderkit.CellRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ tag-class: <classname>org.richfaces.taglib.ColumnTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
The <sgmltag><rich:column></sgmltag> component facilitates columns in a table or other <classname>UIData</classname> component. It supports merging columns and rows, sorting, filtering, and customized skinning.
</para>
@@ -117,6 +144,33 @@
<section id="sect-Component_Reference-Tables_and_grids-richcolumnGroup">
<title>rich:columnGroup</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ component-type: <classname>org.richfaces.ColumnGroup</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-class: <classname>org.richfaces.component.html.HtmlColumnGroup</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-family: <classname>org.richfaces.ColumnGroup</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ renderer-type: <classname>org.richfaces.ColumnGroupRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ tag-class: <classname>org.richfaces.taglib.ColumnGroupTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
The <sgmltag><rich:columnGroup></sgmltag> component combines multiple columns in a single row to organize complex parts of a table. The resulting effect is similar to using the <varname>breakBefore</varname> attribute of the <sgmltag><rich:column></sgmltag> component, but is clearer and easier to follow in the source code.
</para>
@@ -131,19 +185,19 @@
<f:facet name="header">
<rich:columnGroup>
<rich:column rowspan="2">
- <h:outputText value="State Flag"/>
+ <h:outputText value="State Flag"/>
</rich:column>
<rich:column colspan="3">
- <h:outputText value="State Info"/>
+ <h:outputText value="State Info"/>
</rich:column>
<rich:column breakBefore="true">
- <h:outputText value="State Name"/>
+ <h:outputText value="State Name"/>
</rich:column>
<rich:column>
- <h:outputText value="State Capital"/>
+ <h:outputText value="State Capital"/>
</rich:column>
<rich:column>
- <h:outputText value="Time Zone"/>
+ <h:outputText value="Time Zone"/>
</rich:column>
</rich:columnGroup>
</f:facet>
@@ -174,8 +228,20 @@
<section id="sect-Component_Reference-Tables_and_grids-richcolumns">
<title>rich:columns</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ component-type: <classname>org.richfaces.Column</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ tag-class: <classname>org.richfaces.taglib.ColumnsTagHandler</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- The <sgmltag><rich:columns></sgmltag> component allows for dynamic sets of columns for tables. Columns and rows can be merged, and the look and feel can be highly customized. The component gets a list from a data model and creates a corresponding set of columns in a <sgmltag><rich:dataTable></sgmltag> component. The <sgmltag><rich:columns></sgmltag> component also supports header and footer facets.
+ The <sgmltag><rich:columns></sgmltag> component allows for dynamic sets of columns for tables. Columns and rows can be merged, and the look and feel can be highly customized. The component gets a list from a data model and creates a corresponding set of columns in a <sgmltag><rich:dataTable></sgmltag> component. The <sgmltag><rich:columns></sgmltag> component also supports <literal>header</literal> and <literal>footer</literal> facets.
</para>
<para>
Basic usage of the <sgmltag><rich:columns></sgmltag> component requires the <varname>value</varname> attribute, which points to the data model; the <varname>var</varname> attribute, which holds the current variable for the collection of data; and the <varname>index</varname> attribute, which holds the current counter. The <varname>id</varname> attribute is used for when the individuals rows require identifiers for Ajax events.
@@ -197,25 +263,172 @@
</programlisting>
</example>
<para>
- The <varname>columns</varname> attribute
+ The output can be customized to display specific columns and rows. The <varname>columns</varname> attribute specifies the number of columns. The <varname>rowspan</varname> attribute specifies the number of rows to display; if the attribute is set to <literal>0</literal>, all remaining rows in the table are displayed. The <varname>begin</varname> and <varname>end</varname> attributes are used to specify the first and last zero-based iteration items to display in the table. Columns can be adjusted using the <varname>colspan</varname>, <varname>rowspan</varname>, and <varname>breakBefore</varname> attributes the same as with the <sgmltag><rich:column></sgmltag> component.
</para>
<para>
+ The <sgmltag><rich:columns></sgmltag> component can be used alongside <sgmltag><rich:column></sgmltag> components.
+ </para>
+ <example id="exam-Component_Reference-richcolumns-Using_richcolumns_and_richcolumn_together">
+ <title>Using <rich:columns> and <rich:column> together</title>
+<programlisting language="XML" role="XML">
+<rich:dataTable value="#{dataTableScrollerBean.model}" var="model" width="500px" rows="5">
+ <f:facet name="header">
+ <h:outputText value="Cars Available"></h:outputText>
+ </f:facet>
+ <rich:columns value="#{dataTableScrollerBean.columns}" var="columns" index="ind">
+ <f:facet name="header">
+ <h:outputText value="#{columns.header}" />
+ </f:facet>
+ <h:outputText value="#{model[ind].model} " />
+ </rich:columns>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Price" />
+ </f:facet>
+ <h:outputText value="Price" />
+ </rich:column>
+ <rich:columns value="#{dataTableScrollerBean.columns}" var="columns" index="ind">
+ <f:facet name="header">
+ <h:outputText value="#{columns.header}" />
+ </f:facet>
+ <h:outputText value="#{model[ind].mileage}$" />
+ </rich:columns>
+</rich:dataTable>
+</programlisting>
+ </example>
+ <para>
For details on filtering and sorting columns, refer to <xref linkend="sect-Component_Reference-Tables_and_grids-Table_filtering" /> and <xref linkend="sect-Component_Reference-Tables_and_grids-Table_sorting" />.
</para>
</section>
<section id="sect-Component_Reference-Tables_and_grids-richdataFilterSlider">
<title>rich:dataFilterSlider</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ component-type: <classname>org.richfaces.DataFilterSlider</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-class: <classname>org.richfaces.component.html.HtmlDataFilterSlider</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-family: <classname>org.richfaces.DataFilterSlider</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ renderer-type: <classname>org.richfaces.DataFilterSliderRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ tag-class: <classname>org.richfaces.taglib.dataFilterSliderTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- The <sgmltag><rich:dataFilterSlider></sgmltag> components is a slider control that can be used for filtering data in a table.
+ The <sgmltag><rich:dataFilterSlider></sgmltag> components is a slider control that can be used for filtering data in a table. The range and increment of the slider control are defined using the <varname>startRange</varname>, <varname>endRange</varname>, and <varname>increment</varname> attributes.
</para>
+ <para>
+ The slider is bound to a <classname>UIData</classname> component specified with the <varname>for</varname> attribute. The <varname>forValRef</varname> attribute refers to the <varname>value</varname> attribute used by the target component, and the <varname>filterBy</varname> attribute specifies which object member to filter according to the slider.
+ </para>
+ <para>
+ The <varname>handleValue</varname> attribute keeps the current handle position on the slider control; filtering is based on this value. The <varname>storeResults</varname> attribute allows the <sgmltag><rich:dataFilterSlider></sgmltag> component to keep the target <classname>UIData</classname> component in session.
+ </para>
+ <para>
+ The event defined with the <varname>submitOnSlide</varname> attribute is triggered when the handle value on the slider is changed.
+ </para>
</section>
<section id="sect-Component_Reference-Tables_and_grids-richdataGrid">
<title>rich:dataGrid</title>
+ <itemizedlist>
+ <listitem>
+ <para>
+ component-type: <classname>org.richfaces.DataGrid</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-class: <classname>org.richfaces.component.html.HtmlDataGrid</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ component-family: <classname>org.richfaces.DataGrid</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ renderer-type: <classname>org.richfaces.DataGridRenderer</classname>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ tag-class: <classname>org.richfaces.taglib.DataGridTag</classname>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- Incomplete
+ The <sgmltag><rich:dataGrid></sgmltag> component is used to arrange data objects in a grid. Values in the grid can be updated dynamically from the data model, and Ajax updates can be limited to specific rows. The component supports <literal>header</literal>, <literal>footer</literal>, and <literal>caption</literal> facets.
</para>
+ <figure id="figu-Component_Reference-richdataGrid-The_richdataGrid_component">
+ <title>The rich:dataGrid component</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richdataGrid-The_richdataGrid_component.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ The rich:dataGrid component displaying four elements in two columns, with a <literal>header</literal> facet, and <literal>footer</literal> facet containing a data scroller component.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ <para>
+ The <sgmltag><rich:dataGrid></sgmltag> component requires the <varname>value</varname> attribute, which points to the data model, and the <varname>var</varname> attribute, which holds the current variable for the collection of data. The number of columns for the grid is specifed with the <varname>columns</varname> attribute, and the number of elements to layout among the columns is determined with the <varname>elements</varname> attribute. The <varname>first</varname> attribute references the zero-based element in the data model from which the grid starts.
+ </para>
+ <example id="exam-Component_Reference-richdataGrid-richdataGrid_example">
+ <title>rich:dataGrid example</title>
+<programlisting language="XML" role="XML">
+<xi:include parse="text" href="extras/exam-Component_Reference-richdataGrid-richdataGrid_example.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</programlisting>
+ <blockquote>
+ <figure id="figu-Component_Reference-richdataGrid-richdataGrid_example">
+ <title>rich:dataGrid example</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/figu-Component_Reference-richdataGrid-richdataGrid_example.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>
+ The result of the <sgmltag><rich:dataGrid></sgmltag> example, with the <literal>header</literal> facet, <literal>footer</literal> facet, and first element annotated.
+ </para>
+ </textobject>
+ </mediaobject>
+ </figure>
+ </blockquote>
+ </example>
+ <para>
+ The <sgmltag><rich:dataGrid></sgmltag> component can be used with the <sgmltag><rich:dataScroller></sgmltag> component to display multiple pages of grids. Refer to <xref linkend="sect-Component_Reference-Tables_and_grids-richdataScroller" /> for details on the <sgmltag><rich:dataScroller></sgmltag> component.
+ </para>
+ <para>
+ As the component is based on the <sgmltag><a4j:repeat></sgmltag> component, it can be partially updated with Ajax. The <varname>ajaxKeys</varname> attribute allows row keys to be defined, which are updated after an Ajax request.
+ </para>
+ <example id="exam-Component_Reference-richdataGrid-ajaxKeys_example">
+ <title><varname>ajaxKeys</varname> example</title>
+<programlisting language="XML" role="XML">
+<rich:dataGrid value="#{dataTableScrollerBean.allCars}" var="car" ajaxKeys="#{listBean.list}" binding="#{listBean.dataGrid}" id="grid" elements="4" columns="2">
+ ...
+</rich:dataGrid>
+...
+<a4j:commandButton action="#{listBean.action}" reRender="grid" value="Submit"/>
+</programlisting>
+ </example>
</section>
<section id="sect-Component_Reference-Tables_and_grids-richdataScroller">
Added: root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richdataGrid-richdataGrid_example.xml_sample
===================================================================
--- root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richdataGrid-richdataGrid_example.xml_sample (rev 0)
+++ root/docs/trunk/Component_Reference/en-US/extras/exam-Component_Reference-richdataGrid-richdataGrid_example.xml_sample 2010-01-08 07:02:13 UTC (rev 16250)
@@ -0,0 +1,23 @@
+<rich:panel style="width:150px;height:200px;">
+ <h:form>
+ <rich:dataGrid value="#{dataTableScrollerBean.allCars}" var="car" columns="2" elements="4" first="1">
+ <f:facet name="header">
+ <h:outputText value="Car Store"></h:outputText>
+ </f:facet>
+ <rich:panel>
+ <f:facet name="header">
+ <h:outputText value="#{car.make} #{car.model}"></h:outputText>
+ </f:facet>
+ <h:panelGrid columns="2">
+ <h:outputText value="Price:" styleClass="label"></h:outputText>
+ <h:outputText value="#{car.price}"/>
+ <h:outputText value="Mileage:" styleClass="label"></h:outputText>
+ <h:outputText value="#{car.mileage}"/>
+ </h:panelGrid>
+ </rich:panel>
+ <f:facet name="footer">
+ <rich:datascroller></rich:datascroller>
+ </f:facet>
+ </rich:dataGrid>
+ </h:form>
+</rich:panel>
Added: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richdataGrid-The_richdataGrid_component.png
===================================================================
(Binary files differ)
Property changes on: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richdataGrid-The_richdataGrid_component.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richdataGrid-richdataGrid_example.png
===================================================================
(Binary files differ)
Property changes on: root/docs/trunk/Component_Reference/en-US/images/figu-Component_Reference-richdataGrid-richdataGrid_example.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16249 - branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-01-06 17:39:57 -0500 (Wed, 06 Jan 2010)
New Revision: 16249
Modified:
branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
Log:
Fixed compilation error - extra bracket
Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
===================================================================
--- branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2010-01-06 19:04:11 UTC (rev 16248)
+++ branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2010-01-06 22:39:57 UTC (rev 16249)
@@ -258,7 +258,6 @@
if(!$(this.prefix + ":n")) {
if(this.eventKeyPress)
Event.stopObserving(document, "keydown", this.eventKeyPress);
-}
}
}.bind(this)
});
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16248 - in root/cdk/trunk/plugins/generator/src: main/java/org/richfaces/cdk/apt and 12 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-01-06 14:04:11 -0500 (Wed, 06 Jan 2010)
New Revision: 16248
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java
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/Tag.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.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/EventAdapter.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/FacetAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.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/RenderKitIdAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.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/JAXBCopyTest.java
root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java
Log:
https://jira.jboss.org/jira/browse/RF-8232
Tags support - rename model classes
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/CdkContextBase.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -44,8 +44,8 @@
import com.google.common.collect.MutableClassToInstanceMap;
/**
- * <p class="changed_added_4_0">Base CDK context class. Particular build tool ( Ant, Maven ) should extend that class with
- * tool-specific methods.</p>
+ * <p class="changed_added_4_0">Base CDK context class. Particular build tool ( Ant, Maven ) should extend that
+ * class with tool-specific methods.</p>
* @author asmirnov(a)exadel.com
*
*/
@@ -54,17 +54,21 @@
/* Map contains writer classes for standard outputs.
*/
static final ImmutableMap<OutputType, Class<? extends CdkWriter>> WRITERS =
- ImmutableMap.<OutputType, Class<? extends CdkWriter>>builder().put(StandardOutputs.COMPONENT_CLASSES,
- ComponentClassGenerator.class).put(StandardOutputs.RENDERER_CLASSES,
- RendererClassGenerator.class).put(StandardOutputs.FACES_CONFIG,
- FacesConfigGenerator.class).build();
+ ImmutableMap.<OutputType, Class<? extends CdkWriter>>builder()
+ .put(StandardOutputs.COMPONENT_CLASSES, ComponentClassGenerator.class)
+ .put(StandardOutputs.RENDERER_CLASSES, RendererClassGenerator.class)
+ .put(StandardOutputs.FACES_CONFIG, FacesConfigGenerator.class)
+ .build();
+
/**
* map contain library model builder classes for each source type.
*/
static final ImmutableMap<SourceType, Class<? extends ModelBuilder>> BUILDERS =
- ImmutableMap.<SourceType, Class<? extends ModelBuilder>> builder().put(StandardSources.FACES_CONFIGS,
- FacesConfigParser.class).put(StandardSources.JAVA_SOURCES, AptBuilder.class).put(
- StandardSources.RENDERER_TEMPLATES, RendererTemplateParser.class).build();
+ ImmutableMap.<SourceType, Class<? extends ModelBuilder>> builder()
+ .put(StandardSources.FACES_CONFIGS, FacesConfigParser.class)
+ .put(StandardSources.JAVA_SOURCES, AptBuilder.class)
+ .put(StandardSources.RENDERER_TEMPLATES, RendererTemplateParser.class)
+ .build();
private Map<String, String> options = Maps.newHashMap();
private Map<SourceType, Iterable<File>> sources = Maps.newHashMap();
@@ -83,6 +87,7 @@
* (non-Javadoc)
* @see org.richfaces.cdk.CdkContext#getLoader()
*/
+ @Override
public CdkClassLoader getLoader() {
return loader;
}
@@ -110,7 +115,7 @@
Iterator<OutputType> keysIterator = outputs.keySet().iterator();
while (null == outputFolder && keysIterator.hasNext()) {
- OutputType outputType = (OutputType) keysIterator.next();
+ OutputType outputType = keysIterator.next();
if (folderType.equals(outputType.getFolderType())) {
outputFolder = outputs.get(outputType);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/ValidatorImpl.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,10 +25,10 @@
package org.richfaces.cdk;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.RenderKit;
-import org.richfaces.cdk.model.Renderer;
+import org.richfaces.cdk.model.RenderKitModel;
+import org.richfaces.cdk.model.RendererModel;
import java.util.Collection;
@@ -46,7 +46,7 @@
/*
* (non-Javadoc)
- * @see org.richfaces.cdk.ModelValidator#verify(org.richfaces.cdk.model.ComponentLibrary)
+ * @see org.richfaces.cdk.ValidatorModel#verify(org.richfaces.cdk.model.ComponentLibrary)
*/
@Override
public void verify(ComponentLibrary library) throws CdkException {
@@ -58,10 +58,10 @@
}
protected void verifyRenderers(ComponentLibrary library) {
- for (RenderKit.Id renderKitId : library.getRenderKits().keySet()) {
+ for (RenderKitModel.Id renderKitId : library.getRenderKits().keySet()) {
// Check render kit name and class.
- RenderKit renderKit = library.getRenderKits().get(renderKitId);
- for (Renderer renderer : renderKit.getRenderers()) {
+ RenderKitModel renderKit = library.getRenderKits().get(renderKitId);
+ for (RendererModel renderer : renderKit.getRenderers()) {
// Check type.
// Check family.
@@ -76,7 +76,7 @@
protected void verifyComponents(ComponentLibrary library) throws CdkException {
NamingConventions namingConventions = getNamingConventions();
- for (Component component : library.getComponents()) {
+ for (ComponentModel component : library.getComponents()) {
// Check classes.
// Check Component type.
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/apt/ComponentProcessor.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -61,7 +61,9 @@
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.DescriptionGroup;
import org.richfaces.cdk.model.Property;
-import org.richfaces.cdk.model.Component.Type;
+import org.richfaces.cdk.model.ComponentModel;
+import org.richfaces.cdk.model.FacetModel;
+import org.richfaces.cdk.model.ComponentModel.Type;
import org.richfaces.cdk.util.Strings;
import org.richfaces.cdk.xmlconfig.CdkEntityResolver;
import org.richfaces.cdk.xmlconfig.FragmentParser;
@@ -88,7 +90,7 @@
// value here.
String type = getNamingConventions().inferComponentType(explicitType,
componentElement.getQualifiedName().toString());
- org.richfaces.cdk.model.Component component = new org.richfaces.cdk.model.Component();
+ ComponentModel component = new ComponentModel();
component.setType(new Type(type));
// Should that component be generated ?
setClassNames(componentElement, component);
@@ -107,7 +109,7 @@
}
- private void setComponentProperties(TypeElement componentElement, org.richfaces.cdk.model.Component component)
+ private void setComponentProperties(TypeElement componentElement, ComponentModel component)
throws CdkException {
// Component family
@@ -123,13 +125,13 @@
processAttributes(componentElement, component);
}
- private void processFacets(TypeElement componentElement, org.richfaces.cdk.model.Component component) {
+ private void processFacets(TypeElement componentElement, ComponentModel component) {
SourceUtils sourceUtils = context.getWorker(SourceUtils.class);
Set<BeanProperty> properties = sourceUtils.getBeanPropertiesAnnotatedWith(Facet.class, componentElement);
// TODO - encapsulate attribute builder into utility class.
for (BeanProperty beanProperty : properties) {
- org.richfaces.cdk.model.Facet facet = component.addFacet(beanProperty.getName());
+ FacetModel facet = component.addFacet(beanProperty.getName());
// Documentation
facet.setDescription(beanProperty.getDocComment());
@@ -167,7 +169,7 @@
}
}
- private void setComponentDescription(TypeElement componentElement, org.richfaces.cdk.model.Component component) {
+ private void setComponentDescription(TypeElement componentElement, ComponentModel component) {
SourceUtils sourceUtils = context.getWorker(SourceUtils.class);
// JavaDoc comments
@@ -205,7 +207,7 @@
component.setIcon(iconValue);
}
- private void setComponeneFamily(TypeElement componentElement, org.richfaces.cdk.model.Component component) {
+ private void setComponeneFamily(TypeElement componentElement, ComponentModel component) {
Family family = componentElement.getAnnotation(Family.class);
if (null != family) {
@@ -222,7 +224,7 @@
}
- private void setEvents(TypeElement componentElement, org.richfaces.cdk.model.Component component) {
+ private void setEvents(TypeElement componentElement, ComponentModel component) {
Fires fires = componentElement.getAnnotation(Fires.class);
if (null != fires) {
@@ -241,7 +243,7 @@
}
}
- private void setClassNames(TypeElement componentElement, org.richfaces.cdk.model.Component component) {
+ private void setClassNames(TypeElement componentElement, ComponentModel component) {
Generate generate = componentElement.getAnnotation(Generate.class);
// Set generated and base class names.
@@ -262,7 +264,7 @@
}
}
- protected void processAttributes(TypeElement componentElement, final org.richfaces.cdk.model.Component component)
+ protected void processAttributes(TypeElement componentElement, final ComponentModel component)
throws CdkException {
// Process XML files with standard attributes definitions.
@@ -284,8 +286,8 @@
@Override
public void visit(TypeMirror type) {
try {
- component.getAttributes().putAll(parseProperties(CdkEntityResolver.URN_ATTRIBUTES + type.toString()
- + ".xml"));
+ component.getAttributes().putAll(parseProperties(
+ CdkEntityResolver.URN_ATTRIBUTES + type.toString() + ".xml"));
} catch (CdkException e) {
// TODO - log errors ?
@@ -348,7 +350,7 @@
// TODO - set method return type.
}
- // Behavior events.
+ // BehaviorModel events.
EventName eventName = beanProperty.getAnnotation(EventName.class);
setBehaviorEvent(attribute, eventName);
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -30,7 +30,7 @@
import java.util.NoSuchElementException;
import java.util.Set;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.EventName;
import org.richfaces.cdk.model.Property;
@@ -51,7 +51,7 @@
*
*/
public class ComponentTemplateModel extends BeanModel implements TemplateModel {
- private final Component component;
+ private final ComponentModel component;
private Set<EventName> eventNames;
/**
@@ -61,7 +61,7 @@
* @param object
* @param wrapper
*/
- public ComponentTemplateModel(Component object, BeansWrapper wrapper) {
+ public ComponentTemplateModel(ComponentModel object, BeansWrapper wrapper) {
super(object, wrapper);
component = object;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/LibraryModelWrapper.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,7 +25,7 @@
package org.richfaces.cdk.freemarker;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import freemarker.ext.beans.BeansWrapper;
import freemarker.template.ObjectWrapper;
@@ -53,8 +53,8 @@
// TODO wrap specified model classes.
TemplateModel templateModel;
- if (obj instanceof Component) {
- templateModel = new ComponentTemplateModel((Component) obj, this);
+ if (obj instanceof ComponentModel) {
+ templateModel = new ComponentTemplateModel((ComponentModel) obj, this);
} else {
templateModel = super.wrap(obj);
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/java/ComponentClassGenerator.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -31,7 +31,7 @@
import org.richfaces.cdk.StandardOutputs;
import org.richfaces.cdk.CdkContext.OutputType;
import org.richfaces.cdk.freemarker.FreeMarkerRenderer;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.Visitable;
@@ -42,7 +42,7 @@
* @author asmirnov(a)exadel.com
*
*/
-public class ComponentClassGenerator extends FreeMarkerRenderer<Component, ComponentLibrary> implements CdkWriter {
+public class ComponentClassGenerator extends FreeMarkerRenderer<ComponentModel, ComponentLibrary> implements CdkWriter {
/*
* (non-Javadoc)
@@ -55,8 +55,8 @@
@Override
protected boolean isMyComponent(Visitable c) {
- if (c instanceof Component) {
- Component component = (Component) c;
+ if (c instanceof ComponentModel) {
+ ComponentModel component = (ComponentModel) c;
return component.isGenerate();
}
@@ -65,7 +65,7 @@
}
@Override
- protected String getOutputFile(Component c) throws CdkException {
+ protected String getOutputFile(ComponentModel c) throws CdkException {
return c.getComponentClass().getName().replace('.', File.separatorChar) + ".java";
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ClassDescription.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,6 +25,8 @@
import com.google.common.collect.ImmutableMap;
+import java.io.Serializable;
+
/**
* <p class="changed_added_4_0">
* Tthat class represents information about Jsf object class.
@@ -32,7 +34,7 @@
*
* @author asmirnov(a)exadel.com
*/
-public class ClassDescription {
+public class ClassDescription implements Serializable {
/**
* <p class="changed_added_4_0"></p>
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-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/ComponentLibrary.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -40,7 +40,7 @@
import javax.xml.bind.annotation.XmlType;
import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.model.RenderKit.Id;
+import org.richfaces.cdk.model.RenderKitModel.Id;
/**
* <p class="changed_added_4_0">
@@ -67,19 +67,19 @@
* </p>
*/
private static final long serialVersionUID = -6055670836731899832L;
- private final ModelCollection<Component> components = ModelCollection.<Component>create();
+ private final ModelCollection<ComponentModel> components = ModelCollection.<ComponentModel>create();
/**
* <p class="changed_added_4_0">
* JSF renderer associated with that library
* </p>
*/
- private final ModelMap<RenderKit.Id,RenderKit> renderKits = ModelMap.<RenderKit.Id,RenderKit>create();
+ private final ModelMap<RenderKitModel.Id, RenderKitModel> renderKits = ModelMap.<RenderKitModel.Id, RenderKitModel>create();
- private final ModelCollection<Converter> converters = ModelCollection.<Converter>create();
+ private final ModelCollection<ConverterModel> converters = ModelCollection.<ConverterModel>create();
- private final ModelCollection<Validator> validators = ModelCollection.<Validator>create();
- private final ModelCollection<Listener> listeners = ModelCollection.<Listener>create();
+ private final ModelCollection<ValidatorModel> validators = ModelCollection.<ValidatorModel>create();
+ private final ModelCollection<ListenerModel> listeners = ModelCollection.<ListenerModel>create();
private long lastModified = Long.MIN_VALUE;
/**
@@ -87,9 +87,9 @@
* Application level events fired by the component
* </p>
*/
- private final ModelCollection<Event> events = ModelCollection.<Event>create();
+ private final ModelCollection<EventModel> events = ModelCollection.<EventModel>create();
- private final ModelCollection<Behavior> behaviors = ModelCollection.<Behavior>create();
+ private final ModelCollection<BehaviorModel> behaviors = ModelCollection.<BehaviorModel>create();
private ConfigExtension extension;
@@ -101,10 +101,8 @@
private final TagLibrary tagLibrary;
/**
- * <p class="changed_added_4_0">
- * </p>
+ * <p class="changed_added_4_0"></p>
*
- * @param baseName
*/
public ComponentLibrary() {
this.tagLibrary = new TagLibrary();
@@ -131,13 +129,13 @@
* @param rendererType
* @return
*/
- public RenderKit addRenderKit(String renderKitId) {
- RenderKit.Id renderKitType = new RenderKit.Id(renderKitId);
+ public RenderKitModel addRenderKit(String renderKitId) {
+ RenderKitModel.Id renderKitType = new RenderKitModel.Id(renderKitId);
- RenderKit renderKit = renderKits.get(renderKitType);
+ RenderKitModel renderKit = renderKits.get(renderKitType);
if(null == renderKit){
- renderKit = new RenderKit();
+ renderKit = new RenderKitModel();
renderKits.put(renderKitType, renderKit);
}
return renderKit;
@@ -150,7 +148,7 @@
* @return the components
*/
@XmlElement
- public Collection<Component> getComponents() {
+ public Collection<ComponentModel> getComponents() {
return components;
}
@@ -160,7 +158,7 @@
*
* @return the renderKits
*/
- public Map<Id,RenderKit> getRenderKits() {
+ public Map<Id, RenderKitModel> getRenderKits() {
return renderKits;
}
@@ -170,7 +168,7 @@
*
* @return the converters
*/
- public Collection<Converter> getConverters() {
+ public Collection<ConverterModel> getConverters() {
return converters;
}
@@ -180,7 +178,7 @@
*
* @return the validators
*/
- public Collection<Validator> getValidators() {
+ public Collection<ValidatorModel> getValidators() {
return validators;
}
@@ -190,7 +188,7 @@
*
* @return the behaviors
*/
- public Collection<Behavior> getBehaviors() {
+ public Collection<BehaviorModel> getBehaviors() {
return behaviors;
}
@@ -200,7 +198,7 @@
*
* @return the listeners
*/
- public Collection<Listener> getListeners() {
+ public Collection<ListenerModel> getListeners() {
return listeners;
}
@@ -208,7 +206,7 @@
* <p class="changed_added_4_0"></p>
* @return the events
*/
- public Collection<Event> getEvents() {
+ public Collection<EventModel> getEvents() {
return events;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Tag.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,13 +25,17 @@
package org.richfaces.cdk.model;
+import java.io.Serializable;
+
/**
* <p class="changed_added_4_0">That bean represents VDL tag</p>
* @author asmirnov(a)exadel.com
*
*/
-public class Tag {
+public class Tag implements Serializable {
+ private static final long serialVersionUID = 3875718626199223087L;
+
/**
* <p class="changed_added_4_0">Component that the tag creates. This in bidirectional one to one relation.</p>
* TODO - tag should also works with {@code Validator}, {@code Converter}, {@code Behavior}, {@code FacesListener}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/TagLibrary.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,14 +25,17 @@
import java.util.ArrayList;
import java.util.List;
+import java.io.Serializable;
/**
* <p class="changed_added_4_0">That bean represents whole tag library.</p>
*
* @author asmirnov(a)exadel.com
*/
-public class TagLibrary {
+public class TagLibrary implements Serializable {
+ private static final long serialVersionUID = -3508492744326729833L;
+
/**
* <p class="changed_added_4_0">Collection of tags associated with that library</p>
*/
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -33,8 +33,8 @@
import org.richfaces.cdk.CdkWriter;
import org.richfaces.cdk.StandardOutputs;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.RenderKit;
-import org.richfaces.cdk.model.Renderer;
+import org.richfaces.cdk.model.RenderKitModel;
+import org.richfaces.cdk.model.RendererModel;
import org.richfaces.cdk.templatecompiler.model.Template;
import org.richfaces.cdk.xmlconfig.JAXBBinding;
@@ -84,8 +84,8 @@
@Override
public void render() throws CdkException {
ComponentLibrary library = context.getLibrary();
- for (RenderKit renderKit : library.getRenderKits().values()) {
- for (Renderer renderer : renderKit.getRenderers()) {
+ for (RenderKitModel renderKit : library.getRenderKits().values()) {
+ for (RendererModel renderer : renderKit.getRenderers()) {
Template template = renderer.getTemplate();
if (null != template) {
RendererClassVisitor visitor = new RendererClassVisitor(
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererTemplateParser.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -31,8 +31,8 @@
import org.richfaces.cdk.StandardSources;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.RenderKit;
-import org.richfaces.cdk.model.Renderer;
+import org.richfaces.cdk.model.RenderKitModel;
+import org.richfaces.cdk.model.RendererModel;
import org.richfaces.cdk.templatecompiler.model.CompositeInterface;
import org.richfaces.cdk.templatecompiler.model.Template;
import org.richfaces.cdk.xmlconfig.JAXBBinding;
@@ -58,8 +58,8 @@
Template template = parseTemplate(file);
CompositeInterface compositeInterface = template.getInterface();
// TODO - infer values ?
- RenderKit renderKit = library.addRenderKit(compositeInterface.getRenderKitId());
- Renderer renderer = new Renderer(new Renderer.Type(compositeInterface.getRendererType()));
+ RenderKitModel renderKit = library.addRenderKit(compositeInterface.getRenderKitId());
+ RendererModel renderer = new RendererModel(new RendererModel.Type(compositeInterface.getRendererType()));
renderKit.getRenderers().add(renderer);
String componentType = compositeInterface.getComponentType();
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Attribute.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
+import java.io.Serializable;
/**
* <p class="changed_added_4_0"></p>
@@ -32,8 +33,10 @@
* @author asmirnov(a)exadel.com
*/
@XmlType(name = "uicomponent-attributeType", namespace = Template.COMPOSITE_NAMESPACE)
-public class Attribute {
+public class Attribute implements Serializable {
+ private static final long serialVersionUID = -8183353368681247171L;
+
@XmlAttribute(required = true)
private String name;
@@ -166,7 +169,7 @@
/**
* <p class="changed_added_4_0"></p>
*
- * @param targets the targets to set
+ * @param applyTo the targets to set
*/
public void setTargets(String applyTo) {
this.targets = applyTo;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeImplementation.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -24,6 +24,7 @@
package org.richfaces.cdk.templatecompiler.model;
import javax.xml.bind.annotation.XmlType;
+import java.io.Serializable;
/**
* <p class="changed_added_4_0"></p>
@@ -31,6 +32,7 @@
* @author asmirnov(a)exadel.com
*/
@XmlType(name = "ImplementationType", namespace = Template.COMPOSITE_NAMESPACE)
-public class CompositeImplementation extends ModelFragment {
+public class CompositeImplementation extends ModelFragment implements Serializable {
+ private static final long serialVersionUID = -3046226976516170979L;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/CompositeInterface.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -28,6 +28,7 @@
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlType;
import java.util.List;
+import java.io.Serializable;
/**
* <p class="changed_added_4_0"></p>
@@ -35,8 +36,10 @@
* @author asmirnov(a)exadel.com
*/
@XmlType(name = "InterfaceType", namespace = Template.COMPOSITE_NAMESPACE)
-public class CompositeInterface {
+public class CompositeInterface implements Serializable {
+ private static final long serialVersionUID = -5578359507253872500L;
+
private String componentType;
private String componentFamily;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/ResourceDependency.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -24,14 +24,17 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import java.text.MessageFormat;
+import java.io.Serializable;
/**
* @author Nick Belaevski
* @since 4.0
*/
@XmlType(name = "resourceDependencyType", namespace = Template.CDK_NAMESPACE)
-public class ResourceDependency {
+public class ResourceDependency implements Serializable {
+ private static final long serialVersionUID = -7513798674871079584L;
+
private String name;
private String library;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/model/Template.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,6 +25,7 @@
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import java.io.Serializable;
/**
* <p class="changed_added_4_0"></p>
@@ -32,7 +33,7 @@
* @author asmirnov(a)exadel.com
*/
@XmlRootElement(name = "root", namespace = Template.CDK_NAMESPACE)
-public class Template {
+public class Template implements Serializable {
public static final String JSTL_CORE_NAMESPACE = "http://richfaces.org/cdk/jstl/core";
@@ -40,6 +41,8 @@
public static final String COMPOSITE_NAMESPACE = "http://richfaces.org/cdk/jsf/composite";
+ private static final long serialVersionUID = -6900382133123748812L;
+
private CompositeInterface compositeInterface;
private CompositeImplementation compositeImplementation;
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/FragmentParser.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -31,7 +31,7 @@
import org.richfaces.cdk.CdkContext;
import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.CdkWorker;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.Property;
import org.richfaces.cdk.xmlconfig.model.ComponentAdapter;
@@ -76,7 +76,7 @@
Class<Fragment> bindClass = Fragment.class;
Fragment unmarshal = getBinding().unmarshal(url, schemaLocation, bindClass);
if(null != unmarshal ){
- Component component = adapter.unmarshal(unmarshal);
+ ComponentModel component = adapter.unmarshal(unmarshal);
return component.getAttributes();
} else {
return Collections.<String, Property>emptyMap();
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/AttributeAdapter.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -23,7 +23,7 @@
package org.richfaces.cdk.xmlconfig.model;
-import org.richfaces.cdk.model.Attribute;
+import org.richfaces.cdk.model.AttributeModel;
import org.richfaces.cdk.model.Property;
/**
@@ -35,12 +35,12 @@
@Override
protected Class<? extends PropertyBase> getBeanClass(Property prop) {
- return prop instanceof Attribute?AttributeBean.class:PropertyBean.class;
+ return prop instanceof AttributeModel ?AttributeBean.class:PropertyBean.class;
}
@Override
protected Class<? extends Property> getModelClass(PropertyBase bean) {
- return bean instanceof AttributeBean?Attribute.class:Property.class;
+ return bean instanceof AttributeBean? AttributeModel.class:Property.class;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentAdapter.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -24,8 +24,8 @@
package org.richfaces.cdk.xmlconfig.model;
-import org.richfaces.cdk.model.Component;
-import org.richfaces.cdk.model.Component.Type;
+import org.richfaces.cdk.model.ComponentModel;
+import org.richfaces.cdk.model.ComponentModel.Type;
/**
@@ -33,31 +33,31 @@
*
* @author asmirnov(a)exadel.com
*/
-public class ComponentAdapter extends AdapterBase<ComponentBean, Component> {
+public class ComponentAdapter extends AdapterBase<ComponentBean, ComponentModel> {
private static final AttributeAdapter ATTRIBUTE_ADAPTER = new AttributeAdapter();
private static final FacetAdapter FACET_ADAPTER = new FacetAdapter();
@Override
- protected Class<? extends ComponentBean> getBeanClass(Component c) {
+ protected Class<? extends ComponentBean> getBeanClass(ComponentModel c) {
return ComponentBean.class;
}
@Override
- protected Class<? extends Component> getModelClass(ComponentBean b) {
- return Component.class;
+ protected Class<? extends ComponentModel> getModelClass(ComponentBean b) {
+ return ComponentModel.class;
}
@Override
- protected void postMarshal(Component model, ComponentBean bean) {
+ protected void postMarshal(ComponentModel model, ComponentBean bean) {
// Copy properties/attributes
bean.setAttributes(marshalMap(model.getAttributes(),ATTRIBUTE_ADAPTER));
bean.setFacets(marshalMap(model.getFacets(),FACET_ADAPTER));
}
@Override
- protected void postUnmarshal(ComponentBean bean,Component model) {
+ protected void postUnmarshal(ComponentBean bean, ComponentModel model) {
// Copy type.
String type = bean.getType();
if(null != type){
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-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/ComponentBean.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -33,7 +33,7 @@
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConfigExtension;
-import org.richfaces.cdk.model.Event;
+import org.richfaces.cdk.model.EventModel;
import com.google.common.collect.Lists;
@@ -157,7 +157,7 @@
public static class ComponentExtension extends ConfigExtension {
private List<String> rendererTypes = Lists.newArrayList();
- private List<Event> events = Lists.newArrayList();
+ private List<EventModel> events = Lists.newArrayList();
private ClassDescription baseClass;
private String family;
private boolean generate;
@@ -246,7 +246,7 @@
*/
@XmlElement(name = "fires", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
@XmlJavaTypeAdapter(EventAdapter.class)
- public List<Event> getEvents() {
+ public List<EventModel> getEvents() {
return events;
}
@@ -255,7 +255,7 @@
*
* @param events the events to set
*/
- public void setEvents(List<Event> events) {
+ public void setEvents(List<EventModel> events) {
this.events = events;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/EventAdapter.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -23,23 +23,23 @@
package org.richfaces.cdk.xmlconfig.model;
-import org.richfaces.cdk.model.Event;
+import org.richfaces.cdk.model.EventModel;
/**
* <p class="changed_added_4_0"></p>
*
* @author asmirnov(a)exadel.com
*/
-public class EventAdapter extends AdapterBase<EventBean, Event> {
+public class EventAdapter extends AdapterBase<EventBean, EventModel> {
@Override
- protected Class<? extends EventBean> getBeanClass(Event model) {
+ protected Class<? extends EventBean> getBeanClass(EventModel model) {
return EventBean.class;
}
@Override
- protected Class<? extends Event> getModelClass(EventBean bean) {
- return Event.class;
+ protected Class<? extends EventModel> getModelClass(EventBean bean) {
+ return EventModel.class;
}
}
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-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacesConfigBean.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -31,10 +31,10 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConfigExtension;
-import org.richfaces.cdk.model.Event;
+import org.richfaces.cdk.model.EventModel;
import org.richfaces.cdk.model.Extensible;
import com.google.common.collect.Lists;
@@ -49,7 +49,7 @@
public class FacesConfigBean implements Extensible<FacesConfigBean.FacesConfigExtension> {
@XmlElement(name = "component", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
@XmlJavaTypeAdapter(ComponentAdapter.class)
- private List<Component> components = Lists.newArrayList();
+ private List<ComponentModel> components = Lists.newArrayList();
@XmlElement(name = "render-kit", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
private List<RenderKitBean> renderKits = Lists.newArrayList();
@XmlAttribute
@@ -98,7 +98,7 @@
*
* @return the components
*/
- public List<Component> getComponents() {
+ public List<ComponentModel> getComponents() {
return components;
}
@@ -107,7 +107,7 @@
*
* @param components the components to set
*/
- public void setComponents(List<Component> components) {
+ public void setComponents(List<ComponentModel> components) {
this.components = components;
}
@@ -148,11 +148,11 @@
}
public static final class FacesConfigExtension extends ConfigExtension {
- private List<Event> events = Lists.newArrayList();
+ private List<EventModel> events = Lists.newArrayList();
@XmlElement(name = "faces-event", namespace = ComponentLibrary.CDK_EXTENSIONS_NAMESPACE)
@XmlJavaTypeAdapter(EventAdapter.class)
- public List<Event> getEvents() {
+ public List<EventModel> getEvents() {
return events;
}
@@ -161,7 +161,7 @@
*
* @param events the events to set
*/
- public void setEvents(List<Event> events) {
+ public void setEvents(List<EventModel> events) {
this.events = events;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/FacetAdapter.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -23,22 +23,22 @@
package org.richfaces.cdk.xmlconfig.model;
-import org.richfaces.cdk.model.Facet;
+import org.richfaces.cdk.model.FacetModel;
/**
* <p class="changed_added_4_0"></p>
*
* @author asmirnov(a)exadel.com
*/
-public class FacetAdapter extends AdapterBase<FacetBean, Facet> {
+public class FacetAdapter extends AdapterBase<FacetBean, FacetModel> {
@Override
- protected Class<? extends FacetBean> getBeanClass(Facet model) {
+ protected Class<? extends FacetBean> getBeanClass(FacetModel model) {
return FacetBean.class;
}
@Override
- protected Class<? extends Facet> getModelClass(FacetBean bean) {
- return Facet.class;
+ protected Class<? extends FacetModel> getModelClass(FacetBean bean) {
+ return FacetModel.class;
}
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitAdapter.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -23,22 +23,22 @@
package org.richfaces.cdk.xmlconfig.model;
-import org.richfaces.cdk.model.RenderKit;
+import org.richfaces.cdk.model.RenderKitModel;
/**
* <p class="changed_added_4_0"></p>
*
* @author asmirnov(a)exadel.com
*/
-public class RenderKitAdapter extends AdapterBase<RenderKitBean, RenderKit> {
+public class RenderKitAdapter extends AdapterBase<RenderKitBean, RenderKitModel> {
@Override
- protected Class<? extends RenderKitBean> getBeanClass(RenderKit model) {
+ protected Class<? extends RenderKitBean> getBeanClass(RenderKitModel model) {
return RenderKitBean.class;
}
@Override
- protected Class<? extends RenderKit> getModelClass(RenderKitBean bean) {
- return RenderKit.class;
+ protected Class<? extends RenderKitModel> getModelClass(RenderKitBean bean) {
+ return RenderKitModel.class;
}
}
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-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitBean.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -34,9 +34,9 @@
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConfigExtension;
-import org.richfaces.cdk.model.RenderKit;
-import org.richfaces.cdk.model.Renderer;
-import org.richfaces.cdk.model.RenderKit.Id;
+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;
@@ -47,9 +47,9 @@
*/
@XmlType(name="faces-config-render-kitType",namespace=ComponentLibrary.FACES_CONFIG_NAMESPACE,
propOrder={"key","renderkitClass","renderers","behaviorRenderers","extension"})
-public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> implements MapEntry<RenderKit.Id> {
+public class RenderKitBean extends ExtensibleBean<RenderKitBean.RenderKitExtension> implements MapEntry<RenderKitModel.Id> {
- private List<Renderer> renderers = Lists.newArrayList();
+ private List<RendererModel> renderers = Lists.newArrayList();
private List<BehaviorRenderer> behaviorRenderers = Lists.newArrayList();
private ClassDescription renderkitClass;
private Id key = new Id(RenderKitFactory.HTML_BASIC_RENDER_KIT);
@@ -94,7 +94,7 @@
*/
@XmlElement(name = "renderer", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE)
@XmlJavaTypeAdapter(RendererAdapter.class)
- public List<Renderer> getRenderers() {
+ public List<RendererModel> getRenderers() {
return renderers;
}
@@ -103,7 +103,7 @@
*
* @param renderers the renderers to set
*/
- public void setRenderers(List<Renderer> renderers) {
+ public void setRenderers(List<RendererModel> renderers) {
this.renderers = renderers;
}
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RenderKitIdAdapter.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,15 +25,15 @@
import javax.xml.bind.annotation.adapters.XmlAdapter;
-import org.richfaces.cdk.model.RenderKit;
-import org.richfaces.cdk.model.RenderKit.Id;
+import org.richfaces.cdk.model.RenderKitModel;
+import org.richfaces.cdk.model.RenderKitModel.Id;
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
*
*/
-public class RenderKitIdAdapter extends XmlAdapter<String, RenderKit.Id>{
+public class RenderKitIdAdapter extends XmlAdapter<String, RenderKitModel.Id>{
@Override
public String marshal(Id v) throws Exception {
Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererAdapter.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -23,8 +23,8 @@
package org.richfaces.cdk.xmlconfig.model;
-import org.richfaces.cdk.model.Renderer;
-import org.richfaces.cdk.model.Renderer.Type;
+import org.richfaces.cdk.model.RendererModel;
+import org.richfaces.cdk.model.RendererModel.Type;
/**
* <p class="changed_added_4_0">
@@ -32,24 +32,24 @@
*
* @author asmirnov(a)exadel.com
*/
-public class RendererAdapter extends AdapterBase<RendererBean, Renderer> {
+public class RendererAdapter extends AdapterBase<RendererBean, RendererModel> {
@Override
- protected Class<? extends RendererBean> getBeanClass(Renderer model) {
+ protected Class<? extends RendererBean> getBeanClass(RendererModel model) {
return RendererBean.class;
}
@Override
- protected Class<? extends Renderer> getModelClass(RendererBean bean) {
- return Renderer.class;
+ protected Class<? extends RendererModel> getModelClass(RendererBean bean) {
+ return RendererModel.class;
}
@Override
- protected void postMarshal(Renderer model, RendererBean bean) {
+ protected void postMarshal(RendererModel model, RendererBean bean) {
}
@Override
- protected void postUnmarshal(RendererBean bean, Renderer model) {
+ protected void postUnmarshal(RendererBean bean, RendererModel model) {
// Copy type.
String type = bean.getType();
if (null != type) {
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-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/xmlconfig/model/RendererBean.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -29,7 +29,7 @@
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.richfaces.cdk.model.Attribute;
+import org.richfaces.cdk.model.AttributeModel;
import org.richfaces.cdk.model.ClassDescription;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.ConfigExtension;
@@ -48,7 +48,7 @@
public class RendererBean extends
ExtensibleBean<RendererBean.RendererExtension> {
- private List<Attribute> attributes = Lists.newArrayList();
+ private List<AttributeModel> attributes = Lists.newArrayList();
private String family;
private ClassDescription rendererClass;
private String type;
@@ -124,7 +124,7 @@
* @return the attributes
*/
@XmlElement(name = "attribute", namespace = ComponentLibrary.FACES_CONFIG_NAMESPACE, type = AttributeBean.class)
- public List<Attribute> getAttributes() {
+ public List<AttributeModel> getAttributes() {
return this.attributes;
}
@@ -134,7 +134,7 @@
*
* @param attributes the attributes to set
*/
- public void setAttributes(List<Attribute> attributes) {
+ public void setAttributes(List<AttributeModel> attributes) {
this.attributes = attributes;
}
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/apt/ComponentProcessorTest.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -43,7 +43,7 @@
import org.richfaces.cdk.RichFacesConventions;
import org.richfaces.cdk.StandardSources;
import org.richfaces.cdk.annotations.Family;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.Property;
import org.richfaces.cdk.xmlconfig.FragmentParser;
@@ -85,11 +85,11 @@
verify(cdkContext);
ComponentLibrary library = cdkContext.getLibrary();
- Collection<Component> components = library.getComponents();
+ Collection<ComponentModel> components = library.getComponents();
assertEquals(1, components.size());
- Component component = Iterables.get(components, 0);
+ ComponentModel component = Iterables.get(components, 0);
Map<String, Property> attributes = component.getAttributes();
assertEquals(17, attributes.size());
@@ -117,11 +117,11 @@
verify(cdkContext);
ComponentLibrary library = cdkContext.getLibrary();
- Collection<Component> components = library.getComponents();
+ Collection<ComponentModel> components = library.getComponents();
assertEquals(1, components.size());
- Component component = Iterables.get(components, 0);
+ ComponentModel component = Iterables.get(components, 0);
Map<String, Property> attributes = component.getAttributes();
assertEquals(15, attributes.size());
@@ -146,7 +146,7 @@
JAXBBinding jaxbBinding = new JAXBBinding();
expect(cdkContext.getWorker(JAXBBinding.class)).andStubReturn(jaxbBinding);
- expect(cdkContext.setWorker(SourceUtils.class,(SourceUtils)anyObject())).andStubReturn(null);
+ expect(cdkContext.setWorker(eq(SourceUtils.class), (SourceUtils) anyObject())).andStubReturn(null);
replay(cdkContext);
richFacesConventions.init(cdkContext);
jaxbBinding.init(cdkContext);
@@ -157,7 +157,7 @@
protected CdkClassLoader createClassLoader() throws Exception {
return new CdkClassLoader(ImmutableList.of(getLibraryFile("test.source.properties"),
- getLibraryFile(Component.class),
+ getLibraryFile(ComponentModel.class),
getLibraryFile(ELContext.class),
getLibraryFile(Family.class),
getLibraryFile(UIComponent.class)),
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/freemarker/FreeMarkerRendererTest.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -12,7 +12,7 @@
import org.richfaces.cdk.CdkTestBase;
import org.richfaces.cdk.StandardSources;
import org.richfaces.cdk.CdkContext.OutputType;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.Visitable;
public class FreeMarkerRendererTest extends CdkTestBase {
@@ -25,14 +25,14 @@
@Test
public void testProcessComponent() throws Exception {
final StringWriter output = new StringWriter();
- Component component = new Component(new Component.Type("foo.Bar"));
- FreeMarkerRenderer<Component, Boolean> renderer = new FreeMarkerRenderer<Component, Boolean>() {
+ ComponentModel component = new ComponentModel(new ComponentModel.Type("foo.Bar"));
+ FreeMarkerRenderer<ComponentModel, Boolean> renderer = new FreeMarkerRenderer<ComponentModel, Boolean>() {
@Override
- protected String getOutputFile(Component c) {
+ protected String getOutputFile(ComponentModel c) {
return null;
}
@Override
- protected Writer getOutput(Component c) throws CdkException {
+ protected Writer getOutput(ComponentModel c) throws CdkException {
return output;
}
@Override
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/generate/java/ComponentClassGeneratorTest.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -39,7 +39,7 @@
import org.richfaces.cdk.CdkTestBase;
import org.richfaces.cdk.StandardSources;
import org.richfaces.cdk.model.ClassDescription;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
import org.richfaces.cdk.model.EventName;
import org.richfaces.cdk.model.Property;
@@ -52,7 +52,7 @@
public class ComponentClassGeneratorTest extends CdkTestBase {
/**
- * Test method for {@link org.richfaces.cdk.generate.java.ComponentClassGenerator#getOutputFile(org.richfaces.cdk.model.Component)}.
+ * Test method for {@link org.richfaces.cdk.generate.java.ComponentClassGenerator#getOutputFile(org.richfaces.cdk.model.ComponentModel)}.
* @throws Exception
*/
@Test
@@ -60,7 +60,7 @@
final StringWriter output = new StringWriter();
ComponentClassGenerator generator = new ComponentClassGenerator() {
@Override
- protected Writer getOutput(Component c) throws CdkException {
+ protected Writer getOutput(ComponentModel c) throws CdkException {
return output;
}
};
@@ -69,7 +69,7 @@
generator.init(mockContext);
ComponentLibrary library = new ComponentLibrary();
- Component component = new Component(new Component.Type("foo.bar"));
+ ComponentModel component = new ComponentModel(new ComponentModel.Type("foo.bar"));
library.getComponents().add(component);
component.setGenerate(true);
component.setBaseClass(new ClassDescription(UIOutput.class));
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/model/ComponentLibraryTest.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -34,8 +34,6 @@
import org.junit.Test;
-import org.richfaces.cdk.CdkException;
-
/**
* <p class="changed_added_4_0"></p>
* @author asmirnov(a)exadel.com
@@ -50,7 +48,7 @@
@Test
public void testAcceptLibraryVisitorOfRPP() throws Exception {
ComponentLibrary lib = new ComponentLibrary();
- final Component component = new Component(new Component.Type("foo.Bar"));
+ final ComponentModel component = new ComponentModel(new ComponentModel.Type("foo.Bar"));
lib.getComponents().add(component);
LibraryVisitor<Boolean, Boolean> visitor = new LibraryVisitor<Boolean, Boolean>() {
@Override
@@ -68,7 +66,7 @@
@Test
public void testFindOrCreateRenderKit() {
ComponentLibrary lib = new ComponentLibrary();
- RenderKit renderKit = lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT);
+ RenderKitModel renderKit = lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT);
assertNotNull(renderKit);
assertSame(renderKit, lib.addRenderKit(RenderKitFactory.HTML_BASIC_RENDER_KIT));
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-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/FacesConfigTest.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -25,7 +25,6 @@
import static org.junit.Assert.*;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -33,11 +32,11 @@
import org.richfaces.cdk.CdkContextBase;
import org.richfaces.cdk.CdkTestBase;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.Facet;
+import org.richfaces.cdk.model.FacetModel;
import org.richfaces.cdk.model.Property;
-import org.richfaces.cdk.model.RenderKit;
+import org.richfaces.cdk.model.RenderKitModel;
import org.richfaces.cdk.xmlconfig.model.FacesConfigBean;
import org.richfaces.cdk.xmlconfig.model.RenderKitBean;
@@ -60,7 +59,7 @@
assertEquals(1, library.getComponents().size());
- Component component = library.getComponents().get(0);
+ ComponentModel component = library.getComponents().get(0);
assertEquals("javax.faces.Panel", component.getType().toString());
assertEquals("javax.faces.Panel", component.getFamily());
@@ -71,7 +70,7 @@
assertEquals("Panel", component.getDisplayname());
assertTrue(component.isGenerate());
- Facet facet = Iterables.getOnlyElement(component.getFacets().values());
+ FacetModel facet = Iterables.getOnlyElement(component.getFacets().values());
String key = Iterables.getOnlyElement(component.getFacets().keySet());
assertEquals("header", key);
assertEquals("Header facet", facet.getDescription());
@@ -90,8 +89,8 @@
ComponentLibrary.FACES_CONFIG_SCHEMA_LOCATION, FacesConfigBean.class);
List<RenderKitBean> renderKits = library.getRenderKits();
assertEquals(2, renderKits.size());
- assertEquals(new RenderKit.Id("HTML_BASIC"), renderKits.get(0).getKey());
- assertEquals(new RenderKit.Id("RDFa"), renderKits.get(1).getKey());
+ assertEquals(new RenderKitModel.Id("HTML_BASIC"), renderKits.get(0).getKey());
+ assertEquals(new RenderKitModel.Id("RDFa"), renderKits.get(1).getKey());
}
/**
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JAXBCopyTest.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -6,10 +6,8 @@
import org.junit.Test;
-import org.richfaces.cdk.CdkException;
import org.richfaces.cdk.model.ClassDescription;
-import org.richfaces.cdk.model.Component;
-import org.richfaces.cdk.model.Property;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.xmlconfig.model.ComponentBean;
import org.richfaces.cdk.xmlconfig.model.PropertyBase;
import org.richfaces.cdk.xmlconfig.model.ComponentBean.ComponentExtension;
@@ -23,7 +21,7 @@
@Test
public void testCreateAdapter() throws Exception {
- Component component = new Component(new Component.Type(FOO_BAR));
+ ComponentModel component = new ComponentModel(new ComponentModel.Type(FOO_BAR));
component.setDescription(FOO_DESCTIPTION);
component.setComponentClass(new ClassDescription(FOO_UI_BAR));
Modified: root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java
===================================================================
--- root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java 2010-01-06 18:11:51 UTC (rev 16247)
+++ root/cdk/trunk/plugins/generator/src/test/java/org/richfaces/cdk/xmlconfig/JaxbMarshalTest.java 2010-01-06 19:04:11 UTC (rev 16248)
@@ -1,7 +1,5 @@
package org.richfaces.cdk.xmlconfig;
-import static org.junit.Assert.*;
-
import java.io.StringWriter;
import javax.xml.transform.stream.StreamResult;
@@ -9,11 +7,10 @@
import org.junit.Test;
import org.richfaces.cdk.CdkContextBase;
-import org.richfaces.cdk.CdkException;
-import org.richfaces.cdk.model.Component;
+import org.richfaces.cdk.model.ComponentModel;
import org.richfaces.cdk.model.ComponentLibrary;
-import org.richfaces.cdk.model.RenderKit;
-import org.richfaces.cdk.model.Renderer;
+import org.richfaces.cdk.model.RenderKitModel;
+import org.richfaces.cdk.model.RendererModel;
import org.richfaces.cdk.xmlconfig.model.FacesConfigAdapter;
public class JaxbMarshalTest extends JaxbTestBase {
@@ -25,10 +22,10 @@
jaxbBinding.init(contextBase);
ComponentLibrary library = new ComponentLibrary();
- Component component = new Component( new Component.Type("foo.bar"));
+ ComponentModel component = new ComponentModel( new ComponentModel.Type("foo.bar"));
library.getComponents().add(component);
- RenderKit renderKit = library.addRenderKit("HTML");
- Renderer renderer = new Renderer(new Renderer.Type("foo.Renderer"));
+ RenderKitModel renderKit = library.addRenderKit("HTML");
+ RendererModel renderer = new RendererModel(new RendererModel.Type("foo.Renderer"));
renderKit.getRenderers().add(renderer);
StringWriter writer = new StringWriter();
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16247 - branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-01-06 13:11:51 -0500 (Wed, 06 Jan 2010)
New Revision: 16247
Modified:
branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java
Log:
RF-7603
Modified: branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java
===================================================================
--- branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java 2010-01-06 18:09:40 UTC (rev 16246)
+++ branches/community/3.3.X/ui/core/src/main/java/org/ajax4jsf/component/UIAjaxForm.java 2010-01-06 18:11:51 UTC (rev 16247)
@@ -33,6 +33,7 @@
import org.ajax4jsf.event.AjaxEvent;
import org.ajax4jsf.event.AjaxListener;
import org.ajax4jsf.event.AjaxSource;
+import org.ajax4jsf.renderkit.RendererUtils;
/**
@@ -45,6 +46,7 @@
public abstract class UIAjaxForm extends UIForm implements AjaxComponent, AjaxSource, IterationStateHolder
{
public static final String COMPONENT_TYPE = "org.ajax4jsf.Form";
+ public static final String FOCUS_DATA_ID = "_A4J.AJAX.focus";
/* (non-Javadoc)
* @see javax.faces.component.UIComponent#processDecodes(javax.faces.context.FacesContext)
@@ -122,10 +124,38 @@
public void broadcast(FacesEvent event) throws AbortProcessingException {
// perform default
super.broadcast(event);
- if (event instanceof AjaxEvent) {
+ /*if (event instanceof AjaxEvent) {
// complete re-Render fields. AjaxEvent deliver before render response.
setupReRender();
- }
+ }*/
+ if (event instanceof AjaxEvent)
+ {
+ FacesContext context = this.getFacesContext();
+ // complete re-Render fields. AjaxEvent deliver before render
+ // response.
+ this.setupReRender(context);
+ // Put data for send in response
+ Object data = this.getData();
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+ if (null != data)
+ {
+ ajaxContext.setResponseData(data);
+ }
+ String focus = this.getFocus();
+ if (null != focus)
+ {
+ // search for component in tree.
+ // XXX - use more pourful search, as in h:outputLabel
+ // component.
+ UIComponent focusComponent = RendererUtils.getInstance().findComponentFor(this, focus);
+ if (null != focusComponent)
+ {
+ focus = focusComponent.getClientId(context);
+ }
+ ajaxContext.getResponseDataMap().put(FOCUS_DATA_ID, focus);
+ }
+ ajaxContext.setOncomplete(this.getOncomplete());
+ }
}
@@ -137,6 +167,10 @@
AjaxContext.getCurrentInstance(context).addRegionsFromComponent(this);
}
+ protected void setupReRender(final FacesContext facesContext){
+ AjaxContext.getCurrentInstance(facesContext).addRegionsFromComponent(this);
+ this.setupReRender();
+ }
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16246 - in branches/community/3.3.X/framework/impl/src/main: java-jsf20/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-01-06 13:09:40 -0500 (Wed, 06 Jan 2010)
New Revision: 16246
Added:
branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/JSF2Compatible.java
Modified:
branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
Log:
Fix RFPL-296
Modified: branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2010-01-06 18:02:55 UTC (rev 16245)
+++ branches/community/3.3.X/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2010-01-06 18:09:40 UTC (rev 16246)
@@ -25,9 +25,12 @@
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
import java.util.Iterator;
import java.util.Map;
+import javax.faces.FactoryFinder;
import javax.faces.application.ViewExpiredException;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -40,6 +43,8 @@
import org.ajax4jsf.Messages;
import org.ajax4jsf.application.AjaxViewHandler;
+import org.ajax4jsf.component.AjaxRegionBrige;
+import org.ajax4jsf.component.UIDataAdaptor;
import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.context.ContextInitParameters;
import org.ajax4jsf.renderkit.AjaxContainerRenderer;
@@ -120,9 +125,32 @@
setNamespace((String) nz(config.getInitParameter(NAMESPACE_PARAMETER),
getNamespace()));
handleViewExpiredOnClient = Boolean.parseBoolean(config.getServletContext().getInitParameter(ContextInitParameters.HANDLE_VIEW_EXPIRED_ON_CLIENT));
-
+ checkJSFVersion();
}
+ private void checkJSFVersion() {
+ boolean jsf2 = false;
+ try{
+ Object factory = FactoryFinder.getFactory("javax.faces.context.PartialViewContextFactory");
+ jsf2 = true;
+ }catch(Exception e){
+ //It's normal situation
+ }
+ boolean jsf2compatible = false;
+ try {
+ Thread.currentThread().getContextClassLoader().loadClass("org.richfaces.JSF2Compatible");
+ jsf2compatible = true;
+ }catch (Throwable e) {
+ //It's normal situation
+ }
+ if(jsf2compatible && !jsf2){
+ log.warn("This version of RichFaces implementation compatible for JSF2.0, but running under JSF1.2");
+ }
+ if(!jsf2compatible && jsf2){
+ log.warn("This version of RichFaces implementation compatible for JSF1.2, but running under JSF2.0");
+ }
+ }
+
private Boolean stringToBoolean(String s) {
if ("false".equalsIgnoreCase(s)) {
return Boolean.FALSE;
Added: branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/JSF2Compatible.java
===================================================================
--- branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/JSF2Compatible.java (rev 0)
+++ branches/community/3.3.X/framework/impl/src/main/java-jsf20/org/richfaces/JSF2Compatible.java 2010-01-06 18:09:40 UTC (rev 16246)
@@ -0,0 +1,32 @@
+/**
+ * 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;
+
+/**
+ * Vendor and version information for A4J project
+ * @author asmirnov(a)exadel.com (latest modification by $Author: alexsmirnov $)
+ * @version $Revision: 15696 $ $Date: 2009-10-05 20:54:09 +0400 (Пн, 05 окт 2009) $
+ *
+ */
+public class JSF2Compatible {
+
+}
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16245 - branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-01-06 13:02:55 -0500 (Wed, 06 Jan 2010)
New Revision: 16245
Modified:
branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
Log:
Fix RF-8212
Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js
===================================================================
--- branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2010-01-06 18:01:55 UTC (rev 16244)
+++ branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/ClientUI/controls/datatable/ExtendedDataTableSelection.js 2010-01-06 18:02:55 UTC (rev 16245)
@@ -252,11 +252,13 @@
if(this.options.selectionMode != "none") {
this.eventKeyPress = this.processKeyDown.bindAsEventListener(this);
Event.observe(document, "keydown", this.eventKeyPress);
- }
+ }
A4J.AJAX.AddListener({
onafterajax: function(req, event, data) {
if(!$(this.prefix + ":n")) {
- Event.stopObserving(document, "keydown", this.eventKeyPress);
+ if(this.eventKeyPress)
+ Event.stopObserving(document, "keydown", this.eventKeyPress);
+}
}
}.bind(this)
});
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r16244 - in branches/community/3.3.X: ui and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2010-01-06 13:01:55 -0500 (Wed, 06 Jan 2010)
New Revision: 16244
Modified:
branches/community/3.3.X/framework/api/pom.xml
branches/community/3.3.X/ui/pom.xml
Log:
Fix RF-8218
Modified: branches/community/3.3.X/framework/api/pom.xml
===================================================================
--- branches/community/3.3.X/framework/api/pom.xml 2010-01-06 17:21:54 UTC (rev 16243)
+++ branches/community/3.3.X/framework/api/pom.xml 2010-01-06 18:01:55 UTC (rev 16244)
@@ -24,7 +24,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
Modified: branches/community/3.3.X/ui/pom.xml
===================================================================
--- branches/community/3.3.X/ui/pom.xml 2010-01-06 17:21:54 UTC (rev 16243)
+++ branches/community/3.3.X/ui/pom.xml 2010-01-06 18:01:55 UTC (rev 16244)
@@ -202,7 +202,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
+ <version>1.8.0</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
14 years, 4 months
- 1
- 0