9:27 a.m.
Author: konstantin.mishin
Date: 2010-03-10 10:27:39 -0500 (Wed, 10 Mar 2010)
New Revision: 16549
Modified:
root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java
root/ui-sandbox/trunk/pom.xml
Log:
RF-8118 RF-8119
Modified:
root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java 2010-03-10
14:56:45 UTC (rev 16548)
+++
root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ArrangeableModel.java 2010-03-10
15:27:39 UTC (rev 16549)
@@ -49,15 +49,15 @@
*/
public class ArrangeableModel extends ExtendedDataModel<Object> implements
Arrangeable {
- protected ArrangeableState state;
+ private ArrangeableState state;
- protected List<Object> rowKeys;
+ private List<Object> rowKeys;
- protected ExtendedDataModel<?> originalModel;
+ private ExtendedDataModel<?> originalModel;
- protected String var;
+ private String var;
- protected String filterVar;
+ private String filterVar;
private Comparator<? super String> stringComparator;
@@ -212,22 +212,22 @@
initializeRowKeys(context);
if (state != null) {
this.state = state;
- Map<Object, Object> attributes = context.getAttributes();
+ Map<String, Object> map =
context.getExternalContext().getRequestMap();
Object value = null;
Object filterValue = null;
if (var != null && var.length() > 0) {
- value = attributes.get(var);
+ value = map.get(var);
}
if (filterVar != null && filterVar.length() > 0) {
- filterValue = attributes.get(filterVar);
+ filterValue = map.get(filterVar);
}
filter(context);
sort(context);
if (var != null && var.length() > 0) {
- attributes.put(var, value);
+ map.put(var, value);
}
if (filterVar != null && filterVar.length() > 0) {
- attributes.put(filterVar, filterValue);
+ map.put(filterVar, filterValue);
}
}
}
@@ -252,7 +252,7 @@
originalModel.setRowKey(rowKey);
}
- protected void filter(FacesContext context) {
+ private void filter(FacesContext context) {
List<FilterField> filterFields = state.getFilterFields();
if (filterFields != null && !filterFields.isEmpty()) {
List<Object> filteredCollection = new ArrayList<Object>();
@@ -265,7 +265,7 @@
}
}
- protected void sort(final FacesContext context) {
+ private void sort(final FacesContext context) {
List<SortField> sortFields = state.getSortFields();
if (sortFields != null && !sortFields.isEmpty()) {
Collections.sort(rowKeys, new Comparator<Object>() {
@@ -277,7 +277,7 @@
}
@SuppressWarnings("unchecked")
- protected boolean accept(FacesContext context, Object rowKey) {
+ private boolean accept(FacesContext context, Object rowKey) {
originalModel.setRowKey(rowKey);
Object object = originalModel.getRowData();
updateVar(context, var, object);
@@ -299,7 +299,7 @@
}
@SuppressWarnings("unchecked")
- protected int compare(FacesContext context, Object rowKey1, Object rowKey2) {
+ private int compare(FacesContext context, Object rowKey1, Object rowKey2) {
originalModel.setRowKey(rowKey1);
Object object1 = originalModel.getRowData();
originalModel.setRowKey(rowKey2);
@@ -365,7 +365,7 @@
private void updateVar(FacesContext context, String var, Object value) {
if (var != null && var.length() > 0) {
- context.getAttributes().put(var, value);
+ context.getExternalContext().getRequestMap().put(var, value);
}
}
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-03-10
14:56:45 UTC (rev 16548)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTable.java 2010-03-10
15:27:39 UTC (rev 16549)
@@ -17,7 +17,7 @@
*/
-public abstract class UIDataTable extends UIDataTableBase {
+public class UIDataTable extends UIDataTableBase {
enum PropertyKeys {
sortingExpression
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-03-10
14:56:45 UTC (rev 16548)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIDataTableBase.java 2010-03-10
15:27:39 UTC (rev 16549)
@@ -41,10 +41,10 @@
import org.richfaces.model.SortField;
import org.richfaces.model.SortMode;
-public abstract class UIDataTableBase extends UISequence implements Row {
+public class UIDataTableBase extends UISequence implements Row {
protected enum PropertyKeys {
- filterVar
+ filterVar, sortPriority, sortMode
}
public Iterator<UIComponent> columns() {
@@ -74,14 +74,6 @@
return true;
}
- public abstract SortMode getSortMode();
-
- public abstract void setSortMode(SortMode sortMode);
-
- public abstract Collection<Object> getSortPriority();
-
- public abstract void setSortPriority(Collection<Object> sortPriority);
-
@Override
protected ExtendedDataModel<?> createExtendedDataModel() {
ExtendedDataModel<?> dataModel = super.createExtendedDataModel();
@@ -121,7 +113,7 @@
}
}
List<SortField> sortFields = new LinkedList<SortField>();
- Collection<Object> sortPriority = getSortPriority();
+ Collection<?> sortPriority = getSortPriority();
if (sortPriority != null) {
for (Object object : sortPriority) {
SortField sortField = sortFieldsMap.get(object);
@@ -146,4 +138,20 @@
public void setFilterVar(String filterVar) {
getStateHelper().put(PropertyKeys.filterVar, filterVar);
}
+
+ public Collection<?> getSortPriority() {
+ return (Collection<?>) getStateHelper().get(PropertyKeys.sortPriority);
+ }
+
+ public void setSortPriority(Collection<?> sortPriority) {
+ getStateHelper().put(PropertyKeys.sortPriority, sortPriority);
+ }
+
+ public SortMode getSortMode() {
+ return (SortMode) getStateHelper().get(PropertyKeys.sortMode);
+ }
+
+ public void setSortMode(SortMode sortMode) {
+ getStateHelper().put(PropertyKeys.sortMode, sortMode);
+ }
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java 2010-03-10
14:56:45 UTC (rev 16548)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlDataTable.java 2010-03-10
15:27:39 UTC (rev 16549)
@@ -1,40 +1,12 @@
package org.richfaces.component.html;
-import java.util.Collection;
-
import org.richfaces.component.UIDataTable;
-import org.richfaces.model.SortMode;
public class HtmlDataTable extends UIDataTable {
public static final String COMPONENT_TYPE = "org.richfaces.DataTable";
-
- protected enum PropertyKeys {
- sortMode, sortPriority,
- }
-
public HtmlDataTable() {
setRendererType("org.richfaces.DataTableRenderer");
}
-
- @Override
- public SortMode getSortMode() {
- return (SortMode)getStateHelper().eval(PropertyKeys.sortMode, SortMode.single);
- }
-
- @Override
- public Collection<Object> getSortPriority() {
- return (Collection)getStateHelper().eval(PropertyKeys.sortPriority);
- }
-
- @Override
- public void setSortMode(SortMode sortMode) {
- getStateHelper().put(PropertyKeys.sortMode, sortMode);
- }
-
- @Override
- public void setSortPriority(Collection<Object> sortPriority) {
- getStateHelper().put(PropertyKeys.sortPriority, sortPriority);
- }
- }
+}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java 2010-03-10
14:56:45 UTC (rev 16548)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlExtendedDataTable.java 2010-03-10
15:27:39 UTC (rev 16549)
@@ -21,10 +21,7 @@
*/
package org.richfaces.component.html;
-import java.util.Collection;
-
import org.richfaces.component.UIExtendedDataTable;
-import org.richfaces.model.SortMode;
public class HtmlExtendedDataTable extends UIExtendedDataTable {
@@ -61,23 +58,4 @@
public void setFrozenColumns(Integer frozenColumns) {
getStateHelper().put(PropertyKeys.frozenColumns, frozenColumns);
}
-
- @Override
- public SortMode getSortMode() {
- return null;
- }
-
- @Override
- public Collection<Object> getSortPriority() {
- return null;
- }
-
- @Override
- public void setSortMode(SortMode sortMode) {
- }
-
- @Override
- public void setSortPriority(Collection<Object> sortPriority) {
- }
-
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-03-10
14:56:45 UTC (rev 16548)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/html/HtmlSubTable.java 2010-03-10
15:27:39 UTC (rev 16549)
@@ -1,9 +1,6 @@
package org.richfaces.component.html;
-import java.util.Collection;
-
import org.richfaces.component.UISubTable;
-import org.richfaces.model.SortMode;
public class HtmlSubTable extends UISubTable {
@@ -12,7 +9,7 @@
protected enum PropertyKeys {
- expand, sortMode, sortPriority
+ expand
}
@Override
@@ -24,24 +21,4 @@
public void setExpanded(boolean expanded) {
getStateHelper().put(PropertyKeys.expand, expanded);
}
-
- @Override
- public SortMode getSortMode() {
- return (SortMode)getStateHelper().eval(PropertyKeys.sortMode, SortMode.single);
- }
-
- @Override
- public Collection<Object> getSortPriority() {
- return (Collection)getStateHelper().eval(PropertyKeys.sortPriority);
- }
-
- @Override
- public void setSortMode(SortMode sortMode) {
- getStateHelper().put(PropertyKeys.sortMode, sortMode);
- }
-
- @Override
- public void setSortPriority(Collection<Object> sortPriority) {
- getStateHelper().put(PropertyKeys.sortPriority, sortPriority);
- }
}
Modified: root/ui-sandbox/trunk/pom.xml
===================================================================
--- root/ui-sandbox/trunk/pom.xml 2010-03-10 14:56:45 UTC (rev 16548)
+++ root/ui-sandbox/trunk/pom.xml 2010-03-10 15:27:39 UTC (rev 16549)
@@ -81,6 +81,16 @@
<artifactId>jsf-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>