JBoss Rich Faces SVN: r11763 - trunk/framework/impl/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 16:55:32 -0500 (Sun, 14 Dec 2008)
New Revision: 11763
Modified:
trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java
Log:
https://jira.jboss.org/jira/browse/RF-5008
Modified: trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2008-12-14 21:52:56 UTC (rev 11762)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2008-12-14 21:55:32 UTC (rev 11763)
@@ -46,7 +46,7 @@
* @author Konstantin Mishin
*
*/
-public class ModifiableModel extends ExtendedDataModel implements Modifiable{
+public class ModifiableModel extends ExtendedDataModel implements Modifiable, LocaleAware {
protected class RowKeyWrapperFactory extends ObjectWrapperFactory {
@@ -90,16 +90,11 @@
protected String var;
- protected Locale locale;
+ protected Locale locale = null;
public ModifiableModel(ExtendedDataModel originalModel, String var) {
- this(originalModel, var, null);
- }
-
- public ModifiableModel(ExtendedDataModel originalModel, String var, Locale locale) {
this.originalModel = originalModel;
this.var = var;
- this.locale = locale;
}
@Override
@@ -112,6 +107,14 @@
return originalModel.getDataModelListeners();
}
+ public Locale getLocale() {
+ return locale;
+ }
+
+ public void setLocale(Locale locale) {
+ this.locale = locale;
+ }
+
@Override
public Object getRowKey() {
return rowKeys.indexOf(originalModel.getRowKey());
17 years, 5 months
JBoss Rich Faces SVN: r11762 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 16:52:56 -0500 (Sun, 14 Dec 2008)
New Revision: 11762
Added:
trunk/framework/api/src/main/java/org/richfaces/model/LocaleAware.java
Log:
https://jira.jboss.org/jira/browse/RF-5008
Added: trunk/framework/api/src/main/java/org/richfaces/model/LocaleAware.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/LocaleAware.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/LocaleAware.java 2008-12-14 21:52:56 UTC (rev 11762)
@@ -0,0 +1,38 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * 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.model;
+
+import java.util.Locale;
+
+/**
+ * Models that are based on locale-dependent operations should implement this interface
+ *
+ * @author Nick Belaevski
+ * @since 3.3.0
+ */
+
+public interface LocaleAware {
+
+ public Locale getLocale();
+
+ public void setLocale(Locale locale);
+}
17 years, 5 months
JBoss Rich Faces SVN: r11761 - trunk/ui/dataTable/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 16:30:03 -0500 (Sun, 14 Dec 2008)
New Revision: 11761
Modified:
trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
Log:
https://jira.jboss.org/jira/browse/RF-5008
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-12-14 21:23:18 UTC (rev 11760)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-12-14 21:30:03 UTC (rev 11761)
@@ -27,6 +27,7 @@
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.el.ELContext;
@@ -34,12 +35,14 @@
import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import org.ajax4jsf.component.SequenceDataAdaptor;
+import org.ajax4jsf.context.ContextInitParameters;
import org.ajax4jsf.model.ExtendedDataModel;
+import org.richfaces.model.FilterField;
import org.richfaces.model.Modifiable;
-import org.richfaces.model.FilterField;
import org.richfaces.model.ModifiableModel;
import org.richfaces.model.SortField2;
@@ -126,7 +129,15 @@
if (dataModel instanceof Modifiable) {
modifiable = (Modifiable) dataModel;
} else {
- ModifiableModel modifiableModel = new ModifiableModel(dataModel, getVar());
+ Locale locale = null;
+
+ FacesContext facesContext = getFacesContext();
+ if (ContextInitParameters.isDatatableUsesViewLocale(facesContext)) {
+ UIViewRoot viewRoot = facesContext.getViewRoot();
+ locale = viewRoot.getLocale();
+ }
+
+ ModifiableModel modifiableModel = new ModifiableModel(dataModel, getVar(), locale);
dataModel = modifiableModel;
modifiable = modifiableModel;
}
17 years, 5 months
JBoss Rich Faces SVN: r11760 - in trunk/framework/impl/src/main/java/org: richfaces/model and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 16:23:18 -0500 (Sun, 14 Dec 2008)
New Revision: 11760
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java
trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java
trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java
Log:
https://jira.jboss.org/jira/browse/RF-5008
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2008-12-14 18:11:00 UTC (rev 11759)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2008-12-14 21:23:18 UTC (rev 11760)
@@ -61,6 +61,7 @@
*/
public static final String HANDLE_VIEW_EXPIRED_ON_CLIENT="org.ajax4jsf.handleViewExpiredOnClient";
+ public static final String[] DATATABLE_USES_VIEW_LOCALE = {"org.richfaces.datatableUsesViewLocale"};
public static final boolean isSerializeServerState(FacesContext context) {
return getBoolean(context, SERIALIZE_SERVER_STATE, false);
@@ -86,6 +87,17 @@
AjaxStateManager.DEFAULT_NUMBER_OF_VIEWS);
}
+ /**
+ * Defines whether data table should use view root locale for sorting and filtering or the
+ * default platform one
+ *
+ * @param context
+ * @return
+ */
+ public static boolean isDatatableUsesViewLocale(FacesContext context) {
+ return getBoolean(context, DATATABLE_USES_VIEW_LOCALE, false);
+ }
+
static int getInteger(FacesContext context, String[] paramNames,
int defaulValue) {
String initParameter = getInitParameter(context,paramNames);
Modified: trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2008-12-14 18:11:00 UTC (rev 11759)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2008-12-14 21:23:18 UTC (rev 11760)
@@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.faces.context.FacesContext;
@@ -89,9 +90,16 @@
protected String var;
+ protected Locale locale;
+
public ModifiableModel(ExtendedDataModel originalModel, String var) {
+ this(originalModel, var, null);
+ }
+
+ public ModifiableModel(ExtendedDataModel originalModel, String var, Locale locale) {
this.originalModel = originalModel;
this.var = var;
+ this.locale = locale;
}
@Override
@@ -229,7 +237,8 @@
FacesContext context = FacesContext.getCurrentInstance();
List <Object> filteredCollection = new ArrayList<Object>();
ObjectWrapperFactory wrapperFactory = new RowKeyWrapperFactory(context, var, filterFields);
- WrappedBeanFilter wrappedBeanFilter = new WrappedBeanFilter(filterFields);
+
+ WrappedBeanFilter wrappedBeanFilter = new WrappedBeanFilter(filterFields, locale);
wrapperFactory.wrapList(rowKeys);
for (Object object : rowKeys) {
if(wrappedBeanFilter.accept((JavaBeanWrapper)object)) {
@@ -247,8 +256,9 @@
FacesContext context = FacesContext.getCurrentInstance();
ObjectWrapperFactory wrapperFactory = new RowKeyWrapperFactory(
context, var, sortFields);
+
WrappedBeanComparator2 wrappedBeanComparator = new WrappedBeanComparator2(
- sortFields);
+ sortFields, locale);
wrapperFactory.wrapList(rowKeys);
Collections.sort(rowKeys, wrappedBeanComparator);
wrapperFactory.unwrapList(rowKeys);
Modified: trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java 2008-12-14 18:11:00 UTC (rev 11759)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanComparator2.java 2008-12-14 21:23:18 UTC (rev 11760)
@@ -20,13 +20,16 @@
*/
package org.richfaces.model.impl.expressive;
+import java.text.Collator;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Locale;
import javax.el.Expression;
import org.richfaces.model.Ordering;
+import org.richfaces.model.SortField;
import org.richfaces.model.SortField2;
/**
@@ -38,13 +41,41 @@
*/
public final class WrappedBeanComparator2 implements Comparator<Object> {
+ private static final Comparator<String> defaultStringComparator = new Comparator<String>() {
+
+ public int compare(String o1, String o2) {
+ return o1.compareToIgnoreCase(o2);
+ }
+
+ };
+
private final List<SortField2> sortFields;
+ private Locale currentLocale;
+
+ private Comparator<? super String> stringComparator;
+
public WrappedBeanComparator2(List<SortField2> sortFields) {
+ this(sortFields, null);
+ }
+
+ public WrappedBeanComparator2(List<SortField2> sortFields, Locale locale) {
super();
this.sortFields = sortFields;
+ this.currentLocale = locale;
}
+ private Comparator<? super String> createStringComparator() {
+ Comparator<? super String> comparator = null;
+ if (currentLocale != null) {
+ comparator = Collator.getInstance(currentLocale);
+ } else {
+ comparator = defaultStringComparator;
+ }
+
+ return comparator;
+ }
+
public int compare(Object o1, Object o2) {
return compare((JavaBeanWrapper) o1, (JavaBeanWrapper) o2);
}
@@ -64,7 +95,10 @@
if (p1 == p2 && p1 instanceof Comparator) {
result = ((Comparator<Object>)p1).compare(w1.getWrappedObject(), w2.getWrappedObject());
} else if (p1 instanceof String && p2 instanceof String) {
- result = ((String)p1).trim().compareToIgnoreCase(((String)p2).trim());
+ if (stringComparator == null) {
+ stringComparator = createStringComparator();
+ }
+ result = stringComparator.compare(((String)p1).trim(), ((String)p2).trim());
} else if (p1 instanceof Comparable && p2 instanceof Comparable) {
result = ((Comparable<Object>) p1).compareTo(p2);
} else if (p1 == null && p2 != null) {
Modified: trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java 2008-12-14 18:11:00 UTC (rev 11759)
+++ trunk/framework/impl/src/main/java/org/richfaces/model/impl/expressive/WrappedBeanFilter.java 2008-12-14 21:23:18 UTC (rev 11760)
@@ -21,6 +21,7 @@
package org.richfaces.model.impl.expressive;
import java.util.List;
+import java.util.Locale;
import org.richfaces.model.ExtendedFilterField;
import org.richfaces.model.FilterField;
@@ -32,20 +33,26 @@
public class WrappedBeanFilter implements org.richfaces.model.filter.Filter<JavaBeanWrapper>{
private final List<FilterField> filterFields;
+ private Locale currentLocale;
+
+ public WrappedBeanFilter(List<FilterField> filterFields) {
+ this(filterFields, null);
+ }
- public WrappedBeanFilter(List<FilterField> filterFields) {
+ public WrappedBeanFilter(List<FilterField> filterFields, Locale locale) {
this.filterFields = filterFields;
+ this.currentLocale = (locale != null ? locale : Locale.getDefault());
}
-
+
public boolean accept(JavaBeanWrapper wrapper) {
for (FilterField filterField : filterFields) {
if (filterField instanceof ExtendedFilterField) {
Object property = wrapper.getProperty(filterField.getExpression().getExpressionString());
String filterValue = ((ExtendedFilterField)filterField).getFilterValue();
if(filterValue != null) {
- filterValue = filterValue.trim().toUpperCase();
+ filterValue = filterValue.trim().toUpperCase(currentLocale);
if(filterValue.length() > 0) {
- if(property == null || !property.toString().trim().toUpperCase().startsWith(filterValue)) {
+ if(property == null || !property.toString().trim().toUpperCase(currentLocale).startsWith(filterValue)) {
return false;
}
}
17 years, 5 months
JBoss Rich Faces SVN: r11759 - in trunk/samples/tree-demo/src/main: java/org/richfaces/rf4196 and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 13:11:00 -0500 (Sun, 14 Dec 2008)
New Revision: 11759
Added:
trunk/samples/tree-demo/src/main/java/org/richfaces/rf4196/
trunk/samples/tree-demo/src/main/java/org/richfaces/rf4196/Bean.java
trunk/samples/tree-demo/src/main/webapp/pages/rf-4196.jsp
Modified:
trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml
Log:
https://jira.jboss.org/jira/browse/RF-4196
Modified: trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2008-12-14 18:07:10 UTC (rev 11758)
+++ trunk/samples/tree-demo/src/main/java/org/richfaces/Bean.java 2008-12-14 18:11:00 UTC (rev 11759)
@@ -31,8 +31,11 @@
import javax.faces.FacesException;
import javax.faces.application.Application;
+import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
+import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import org.ajax4jsf.context.AjaxContext;
@@ -91,6 +94,8 @@
private int counter2 = 0;
+ private int requestCounter = 0;
+
public String getIcon() {
return icon;
}
@@ -482,4 +487,20 @@
System.out.println("Bean.action() " +
event.getComponent().getClientId(FacesContext.getCurrentInstance()));
}
+
+ private static final String REQUEST_COUNTER_ATTRIBUTE = Bean.class.getName() + ":requestCounter";
+
+ public int getRequestCounter() {
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ ExternalContext externalContext = facesContext.getExternalContext();
+ Map<String, Object> requestMap = externalContext.getRequestMap();
+
+ if (requestMap.get(REQUEST_COUNTER_ATTRIBUTE) == null) {
+ requestMap.put(REQUEST_COUNTER_ATTRIBUTE, Boolean.TRUE);
+
+ requestCounter++;
+ }
+
+ return requestCounter;
+ }
}
\ No newline at end of file
Added: trunk/samples/tree-demo/src/main/java/org/richfaces/rf4196/Bean.java
===================================================================
--- trunk/samples/tree-demo/src/main/java/org/richfaces/rf4196/Bean.java (rev 0)
+++ trunk/samples/tree-demo/src/main/java/org/richfaces/rf4196/Bean.java 2008-12-14 18:11:00 UTC (rev 11759)
@@ -0,0 +1,32 @@
+package org.richfaces.rf4196;
+
+import org.richfaces.component.UITree;
+import org.richfaces.event.NodeSelectedEvent;
+
+public class Bean {
+ private UITree tree;
+
+ public UITree getTree() {
+ return tree;
+ }
+
+ public void setTree(UITree tree) {
+ this.tree = tree;
+ }
+
+ public void rerenderNode() {
+ tree.addNodeRequestKey(tree.getRowKey());
+ }
+
+ public void rerenderSubtree() {
+ tree.addRequestKey(tree.getRowKey());
+ }
+
+ public void rerenderRoot() {
+ tree.addRequestKey(null);
+ }
+
+ public void select(NodeSelectedEvent event) {
+ tree.addNodeRequestKey(tree.getRowKey());
+ }
+}
Modified: trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-12-14 18:07:10 UTC (rev 11758)
+++ trunk/samples/tree-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-12-14 18:11:00 UTC (rev 11759)
@@ -30,4 +30,10 @@
<managed-bean-class>org.richfaces.rf3899.Bean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
+ <managed-bean>
+ <managed-bean-name>rf4196</managed-bean-name>
+ <managed-bean-class>org.richfaces.rf4196.Bean</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ </managed-bean>
</faces-config>
Added: trunk/samples/tree-demo/src/main/webapp/pages/rf-4196.jsp
===================================================================
--- trunk/samples/tree-demo/src/main/webapp/pages/rf-4196.jsp (rev 0)
+++ trunk/samples/tree-demo/src/main/webapp/pages/rf-4196.jsp 2008-12-14 18:11:00 UTC (rev 11759)
@@ -0,0 +1,26 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/tree" prefix="rich"%>
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <a4j:status startText="...start..." stopText="stopped" />
+
+ <h:form>
+ <rich:tree ajaxSubmitSelection="true" nodeSelectListener="#{rf4196.select}" ajaxKeys="#{null}" binding="#{rf4196.tree}" value="#{bean.data}" var="item" switchType="ajax">
+ <rich:treeNode>
+ <h:outputText escape="false" value="#{item} <b style='color: red;'>#{bean.requestCounter}</b> Re-render: " />
+ <a4j:commandLink value="Node" action="#{rf4196.rerenderNode}" /> /
+ <a4j:commandLink value="Subtree" action="#{rf4196.rerenderSubtree}" />
+ </rich:treeNode>
+ </rich:tree>
+
+ <a4j:commandLink value="Re-render tree root node" action="#{rf4196.rerenderRoot}" />
+ </h:form>
+ </f:view>
+ </body>
+</html>
17 years, 5 months
JBoss Rich Faces SVN: r11758 - in trunk/ui/tree/src: main/java/org/richfaces/component and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 13:07:10 -0500 (Sun, 14 Dec 2008)
New Revision: 11758
Removed:
trunk/ui/tree/src/test/java/org/richfaces/renderkit/TreeRowKeyComparatorTest.java
Modified:
trunk/ui/tree/src/main/config/component/tree.xml
trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java
trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
Log:
https://jira.jboss.org/jira/browse/RF-4196
Modified: trunk/ui/tree/src/main/config/component/tree.xml
===================================================================
--- trunk/ui/tree/src/main/config/component/tree.xml 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/main/config/component/tree.xml 2008-12-14 18:07:10 UTC (rev 11758)
@@ -303,6 +303,10 @@
<defaultvalue>""</defaultvalue>
</property>
+ <property>
+ <name>ajaxNodeKeys</name>
+ </property>
+
<property hidden="true">
<name>rowKeyConverter</name>
</property>
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITree.java 2008-12-14 18:07:10 UTC (rev 11758)
@@ -24,11 +24,14 @@
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.el.ValueExpression;
import javax.faces.application.Application;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
@@ -58,12 +61,15 @@
import org.richfaces.component.state.events.ExpandAllCommandEvent;
import org.richfaces.component.state.events.ExpandNodeCommandEvent;
import org.richfaces.component.state.events.TreeStateCommandEvent;
+import org.richfaces.event.AjaxExpandedEvent;
import org.richfaces.event.DragListener;
import org.richfaces.event.DropListener;
import org.richfaces.event.NodeExpandedEvent;
import org.richfaces.event.NodeExpandedListener;
import org.richfaces.event.NodeSelectedEvent;
import org.richfaces.event.NodeSelectedListener;
+import org.richfaces.event.TreeAjaxEvent;
+import org.richfaces.event.TreeAjaxEventType;
import org.richfaces.event.TreeListenerEventsProducer;
import org.richfaces.model.AbstractTreeDataModel;
import org.richfaces.model.CacheableTreeDataModel;
@@ -117,6 +123,10 @@
private UITreeNode defaultFacet;
+ private Set<Object> ajaxNodeKeys = null;
+
+ private Set<Object> nodeRequestKeys = null;
+
/**
* Name of EL variable for the tree node.
* This reference is needed to let this parent class
@@ -587,7 +597,7 @@
// fire node events
TreeEvents.invokeListenerBindings(this, event, getFacesContext());
-
+
if (event instanceof AjaxEvent) {
FacesContext facesContext = getFacesContext();
AjaxRendererUtils.addRegionsFromComponent(this, facesContext);
@@ -941,10 +951,11 @@
public Object saveState(FacesContext faces) {
- Object[] state = new Object[3];
+ Object[] state = new Object[4];
state[0] = super.saveState(faces);
state[1] = saveAttachedState(faces, defaultFacet);
state[2] = getTreeNodeVar();
+ state[3] = ajaxNodeKeys;
return state;
}
@@ -962,6 +973,7 @@
defaultFacet.setParent(this);
}
setTreeNodeVar((String) state[2]);
+ ajaxNodeKeys = (Set<Object>) state[3];
}
public String getResolvedDragIndicator(FacesContext facesContext) {
@@ -1191,6 +1203,120 @@
TreeState treeState = (TreeState) getComponentState();
treeState.transferQueuedNodes((TreeRowKey) getRowKey());
}
-}
+ /**
+ * @param o
+ * @since 3.3.0
+ */
+ public void addNodeRequestKey(Object o) {
+ if (o == null) {
+ throw new IllegalArgumentException();
+ }
+
+ if (nodeRequestKeys == null) {
+ nodeRequestKeys = new HashSet<Object>();
+ }
+
+ nodeRequestKeys.add(o);
+ }
+
+ /**
+ * @since 3.3.0
+ */
+ public void clearNodeRequestKeysSet() {
+ if (nodeRequestKeys != null) {
+ nodeRequestKeys.clear();
+ }
+ }
+
+ /**
+ * @param o
+ * @return
+ * @since 3.3.0
+ */
+ public boolean containsNodeRequestKey(Object o) {
+ return nodeRequestKeys != null && nodeRequestKeys.contains(o);
+ }
+
+ /**
+ * @param o
+ * @since 3.3.0
+ */
+ public void removeNodeRequestKey(Object o) {
+ if (nodeRequestKeys != null) {
+ nodeRequestKeys.remove(o);
+ }
+ }
+
+ /**
+ * @return
+ * @since 3.3.0
+ */
+ public Set<Object> getNodeRequestKeys() {
+ return nodeRequestKeys;
+ }
+
+ /**
+ * @return
+ * @since 3.3.0
+ */
+ public Set<Object> getAjaxNodeKeys() {
+ Set<Object> keys = null;
+ if (this.ajaxNodeKeys != null) {
+ keys = this.ajaxNodeKeys;
+ } else {
+ ValueExpression ve = this.getValueExpression("ajaxNodeKeys");
+ if (ve != null) {
+ keys = (Set<Object>) ve.getValue(getFacesContext().getELContext());
+ }
+ }
+
+ return keys;
+ }
+ /**
+ * @param keys
+ * @since 3.3.0
+ */
+ public void setAjaxNodeKeys(Set<Object> keys) {
+ this.ajaxNodeKeys = keys;
+ }
+
+ /**
+ * @return
+ * @since 3.3.0
+ */
+ public Set<Object> getAllAjaxNodeKeys() {
+ HashSet<Object> result = null;
+
+ Set<Object> ajaxNodeKeys = getAjaxNodeKeys();
+ if (ajaxNodeKeys != null) {
+ result = new HashSet<Object>(ajaxNodeKeys);
+ }
+
+ Set<Object> nodeRequestKeys = getNodeRequestKeys();
+ if (nodeRequestKeys != null) {
+ if (result != null) {
+ result.addAll(nodeRequestKeys);
+ } else {
+ result = new HashSet<Object>(nodeRequestKeys);
+ }
+ }
+
+ return result;
+ }
+
+ @Override
+ protected void addAjaxKeyEvent(FacesEvent event) {
+ if (event instanceof TreeAjaxEvent) {
+ TreeAjaxEvent treeAjaxEvent = (TreeAjaxEvent) event;
+ if (TreeAjaxEventType.EXPANSION.equals(treeAjaxEvent.getEventType())) {
+ addRequestKey(getRowKey());
+ } else {
+ super.addAjaxKeyEvent(event);
+ }
+ } else {
+ super.addAjaxKeyEvent(event);
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/events/TreeEvents.java 2008-12-14 18:07:10 UTC (rev 11758)
@@ -21,18 +21,20 @@
package org.richfaces.component.events;
+import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
-import org.ajax4jsf.event.AjaxEvent;
import org.richfaces.event.AjaxExpandedEvent;
import org.richfaces.event.AjaxSelectedEvent;
import org.richfaces.event.DragEvent;
import org.richfaces.event.DropEvent;
import org.richfaces.event.NodeExpandedEvent;
import org.richfaces.event.NodeSelectedEvent;
+import org.richfaces.event.TreeAjaxEvent;
+import org.richfaces.event.TreeAjaxEventType;
import org.richfaces.event.TreeListenerEventsProducer;
/**
@@ -52,15 +54,16 @@
throws AbortProcessingException {
MethodBinding binding = null;
+ UIComponent component = event.getComponent();
if (event instanceof NodeExpandedEvent) {
binding = eventsProducer.getChangeExpandListener();
if (event instanceof AjaxExpandedEvent) {
- new AjaxEvent(event.getComponent()).queue();
+ new TreeAjaxEvent(component, TreeAjaxEventType.EXPANSION).queue();
}
} else if (event instanceof AjaxSelectedEvent) {
if (eventsProducer.hasAjaxSubmitSelection()) {
binding = eventsProducer.getNodeSelectListener();
- new AjaxEvent(event.getComponent()).queue();
+ new TreeAjaxEvent(component, TreeAjaxEventType.SELECTION).queue();
}
} else if (event instanceof NodeSelectedEvent) {
binding = eventsProducer.getNodeSelectListener();
Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2008-12-14 18:07:10 UTC (rev 11758)
@@ -56,47 +56,32 @@
public abstract class TreeRendererBase extends CompositeRenderer {
- protected final static Comparator treeRowKeyComparator = new Comparator() {
+ protected static final class RowKeyHolder {
- public int compare(Object key1, Object key2) {
- TreeRowKey treeRowKey1 = (TreeRowKey) key1;
- TreeRowKey treeRowKey2 = (TreeRowKey) key2;
+ private TreeRowKey<Object> rowKey;
+
+ private boolean nodeKey;
+
+ public RowKeyHolder(TreeRowKey<Object> rowKey, boolean nodeKey) {
+ super();
+ this.rowKey = rowKey;
+ this.nodeKey = nodeKey;
+ }
+
+ public boolean isNodeKey() {
+ return nodeKey;
+ }
+
+ public TreeRowKey<Object> getRowKey() {
+ return rowKey;
+ }
- if (treeRowKey1 == null) {
- if (treeRowKey2 == null) {
- return 0;
- } else {
- return -1;
- }
- } else {
- if (treeRowKey2 == null) {
- return 1;
- }
- }
-
- Iterator iterator1 = treeRowKey1.iterator();
- Iterator iterator2 = treeRowKey2.iterator();
-
- while (iterator1.hasNext() && iterator2.hasNext()) {
- String id1 = iterator1.next().toString();
- String id2 = iterator2.next().toString();
-
- int cr = id1.compareTo(id2);
- if (cr != 0) {
- return cr;
- }
- }
-
- if (iterator1.hasNext()) {
- return 1;
- } else if (iterator2.hasNext()) {
- return -1;
- } else {
- return 0;
- }
+ @Override
+ public String toString() {
+ return this.getClass().getSimpleName() + "[" + rowKey + "]";
}
};
-
+
private final class RendererDataModelEventNavigator extends
TreeDataModelEventNavigator {
private final FacesContext context;
@@ -365,6 +350,38 @@
NSUtils.writeNameSpace(context, component);
}
+ private List<RowKeyHolder> getKeyHoldersList(Set subTreeKeys,
+ Set nodeKeys, String treePath) {
+
+ if (subTreeKeys != null && subTreeKeys.contains(null)) {
+ List<RowKeyHolder> list = new ArrayList<RowKeyHolder>(1);
+ list.add(new RowKeyHolder(null, false));
+ return list;
+ }
+
+ List<RowKeyHolder> list = new ArrayList<RowKeyHolder>((subTreeKeys == null ? 0 : subTreeKeys.size()) +
+ (nodeKeys == null ? 0 : nodeKeys.size()));
+
+ if (subTreeKeys != null) {
+ for (Object subTreeKey : subTreeKeys) {
+ list.add(new RowKeyHolder((TreeRowKey<Object>) subTreeKey, false));
+ }
+ }
+
+ if (nodeKeys != null) {
+ for (Object nodeKey : nodeKeys) {
+ TreeRowKey<Object> treeRowKey = (TreeRowKey<Object>) nodeKey;
+ if (treeRowKey != null && treeRowKey.depth() != 0) {
+ list.add(new RowKeyHolder(treeRowKey, true));
+ } else {
+ log.warn("Top node of the [" + treePath + "] tree cannot be re-rendered without subnodes");
+ }
+ }
+ }
+
+ return list;
+ }
+
public void encodeAjaxChildren(FacesContext context, UIComponent component,
String path, Set ids, Set renderedAreas) throws IOException {
super.encodeAjaxChildren(context, component, path, ids, renderedAreas);
@@ -389,68 +406,88 @@
writeNamespace(context, component);
List encodedAreaIds = new ArrayList();
-
+
try {
- Set ajaxKeys = tree.getAllAjaxKeys();
- if (ajaxKeys != null) {
- List sortedKeys = new ArrayList(ajaxKeys.size());
- sortedKeys.addAll(ajaxKeys);
- Collections.sort(sortedKeys, treeRowKeyComparator);
- Iterator ajaxKeysItr = sortedKeys.iterator();
- TreeRowKey lastKey = null;
- boolean nullRoot = false;
+ List<RowKeyHolder> keyHoldersList = getKeyHoldersList(
+ tree.getAllAjaxKeys(),
+ tree.getAllAjaxNodeKeys(),
+ id);
- while (!nullRoot && ajaxKeysItr.hasNext()) {
- TreeRowKey key = (TreeRowKey) ajaxKeysItr.next();
+ Collections.sort(keyHoldersList, new Comparator<RowKeyHolder>() {
- if (lastKey == null) {
- lastKey = key;
- } else {
- if (!lastKey.isSubKey(key)) {
- lastKey = key;
- } else {
- //skip nodes that's parent nodes have been rendered
- continue;
- }
- }
+ public int compare(RowKeyHolder o1, RowKeyHolder o2) {
+ int d1 = o1.rowKey == null ? 0 : o1.rowKey.depth();
+ int d2 = o2.rowKey == null ? 0 : o2.rowKey.depth();
- if (key == null || key.depth() == 0) {
- nullRoot = true;
- key = null;
+ return d1 < d2 ? -1 : (d2 > d1 ? 1 : 0);
+ }
+
+ });
+
+ List<RowKeyHolder> holders = new ArrayList<RowKeyHolder>();
+ for (RowKeyHolder holder : keyHoldersList) {
+ boolean isSubKey = false;
+
+ for (RowKeyHolder rowKeyHolder : holders) {
+ if (rowKeyHolder.rowKey == null ||
+ rowKeyHolder.rowKey.isSubKey(holder.rowKey)) {
+
+ isSubKey = true;
+ break;
}
+ }
- tree.setRowKey(context, key);
+ if (!isSubKey) {
+ holders.add(holder);
+ }
+ }
- if (key == null || tree.isRowAvailable()) {
- String treeClientId;
- if (key == null) {
- treeClientId = tree.getClientId(context);
- } else {
- treeClientId = tree.getNodeFacet().getClientId(context);
- }
+ Iterator<RowKeyHolder> ajaxKeysItr = holders.iterator();
+ while (ajaxKeysItr.hasNext()) {
+ RowKeyHolder keyHolder = ajaxKeysItr.next();
+ TreeRowKey key = keyHolder.getRowKey();
- String treeChildrenId = treeClientId + NamingContainer.SEPARATOR_CHAR + "childs";
-
- writeContent(context, tree, key);
- encodeScripts = true;
- renderedAreas.add(treeClientId);
- encodedAreaIds.add(treeClientId);
+ if (key != null && key.depth() == 0) {
+ key = null;
+ }
- renderedAreas.add(treeChildrenId);
- //encodedAreaIds.add(id+":childs");
+ tree.setRowKey(context, key);
+
+ if (key == null || tree.isRowAvailable()) {
+ String treeClientId;
+ if (key == null) {
+ treeClientId = tree.getClientId(context);
} else {
- String cid = tree.getClientId(context);
- String message = MessageFormat.format(
- "Failed to re-render tree node: {0} due to model data unavailability! " +
- "Maybe parent node should be re-rendered instead?",
- new Object[] { cid });
-
- ExternalContext externalContext = context.getExternalContext();
- externalContext.log(message);
+ treeClientId = tree.getNodeFacet().getClientId(context);
}
+
+ encodeScripts = true;
+
+ //should be added before children id
+ renderedAreas.add(treeClientId);
+
+ if (keyHolder.isNodeKey()) {
+ writeContent(context, tree, key, false);
+ } else {
+ writeContent(context, tree, key, true);
+ String treeChildrenId = treeClientId + NamingContainer.SEPARATOR_CHAR + "childs";
+ renderedAreas.add(treeChildrenId);
+ }
+
+ //add node to set of nodes refreshed by script
+ encodedAreaIds.add(treeClientId);
+ } else {
+ String cid = tree.getClientId(context);
+ String message = MessageFormat.format(
+ "Failed to re-render tree node: {0} due to model data unavailability! " +
+ "Maybe parent node should be re-rendered instead?",
+ new Object[] { cid });
+
+ ExternalContext externalContext = context.getExternalContext();
+ externalContext.log(message);
}
- //ajaxKeys.clear();
}
+ //ajaxKeys.clear();
} catch (Exception e) {
throw new FacesException(e);
} finally {
@@ -461,13 +498,9 @@
context.getExternalContext().log(e.getMessage(), e);
}
}
+
if (encodeScripts) {
writeScript(context, tree, encodedAreaIds, renderedAreas);
-
- String inputId = encodeSelectionStateInput(context, tree);
- if (inputId != null) {
- renderedAreas.add(inputId);
- }
}
responseWriter.endElement("div");
@@ -482,7 +515,7 @@
}
}
- public String encodeSelectionStateInput(FacesContext context, UITree tree) throws IOException {
+ protected String getSelectionValue(FacesContext context, UITree tree) {
String result = "";
TreeState treeState = (TreeState) tree.getComponentState();
TreeRowKey selectedNodeKey = treeState.getSelectedNode();
@@ -501,7 +534,11 @@
}
}
}
-
+
+ return result;
+ }
+
+ public String encodeSelectionStateInput(FacesContext context, UITree tree) throws IOException {
ResponseWriter writer = context.getResponseWriter();
writer.startElement("input", tree);
writer.writeAttribute("type", "hidden", null);
@@ -509,7 +546,7 @@
writer.writeAttribute("id", selectionHolderInputId, null);
writer.writeAttribute("name", selectionHolderInputId, null);
- writer.writeAttribute("value", result, null);
+ writer.writeAttribute("value", ScriptUtils.toScript(getSelectionValue(context, tree)), null);
writer.endElement("input");
return selectionHolderInputId;
@@ -555,8 +592,10 @@
writer.writeText(varName + ".getNodeElements(" +
ScriptUtils.toScript(encodedAreaIds) + ");", null);
-
-
+
+ writer.writeText(varName + ".updateSelection(" +
+ ScriptUtils.toScript(getSelectionValue(context, tree)) + ");", null);
+
writer.endElement("script");
writer.endElement("div");
@@ -570,16 +609,16 @@
public void encodeChildren(FacesContext context, UIComponent component)
throws IOException {
- writeContent(context, (UITree) component, null);
+ writeContent(context, (UITree) component, null, true);
}
public void writeContent(final FacesContext context, final UITree input)
throws IOException {
- writeContent(context, input, null);
+ writeContent(context, input, null, true);
}
public void writeContent(final FacesContext context, final UITree input,
- TreeRowKey key) throws IOException {
+ TreeRowKey key, final boolean withSubnodes) throws IOException {
// simple flag can be used here because
// we cannot jump more than one level down until next node
// when rendering
@@ -600,7 +639,7 @@
TreeRange treeRange = new TreeRange() {
public boolean processChildren(TreeRowKey rowKey) {
- return stateRange.processChildren(rowKey);
+ return withSubnodes ? stateRange.processChildren(rowKey) : false;
}
public boolean processNode(TreeRowKey rowKey) {
@@ -683,4 +722,4 @@
public void setHasChildren(boolean hasChildren) {
this.hasChildren = hasChildren;
}
-}
\ No newline at end of file
+}
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-item.js 2008-12-14 18:07:10 UTC (rev 11758)
@@ -1,13 +1,19 @@
-Tree.Item = Class.create();
+Tree.Item = Class.create(Richfaces.TreeComposite);
-Tree.Item.findComponent = function(elt) {
- while (elt && (!elt.tagName || elt.tagName.toLowerCase() != 'table')) {
- elt = elt.parentNode;
+Tree.Item.findComponent = function(elt, axisFunction) {
+ var component;
+
+ while (elt && !((component = elt.object) instanceof Tree.Item)) {
+ if (axisFunction) {
+ elt = axisFunction(elt);
+ } else {
+ elt = elt.parentNode;
+ }
}
- return elt.object;
+ return component;
};
-
+
Tree.Item.fireCollapsionEvent = function(elt) {
return Tree.Item.findComponent(elt).fireCollapsionEvent();
};
@@ -16,13 +22,57 @@
return Tree.Item.findComponent(elt).fireExpansionEvent();
};
+Tree.Item.createItemForNode = function() {
+ var getComponentIndex = function(node) {
+ var idx = 0;
+ var n = node;
+
+ while (n) {
+ if (n.object instanceof Tree.Item) {
+ idx++;
+ }
+
+ n = n.previousSibling;
+
+ };
+
+ return idx;
+ };
+
+ var findParentComponent = function(node) {
+ var n = node.parentNode;
+ if (n) {
+ n = Richfaces.previous(n);
+ }
+
+ if (n) {
+ return n.object;
+ }
+ };
+
+ return function(node, tree) {
+ var replacedNode = $(node);
+
+ var pNode = findParentComponent(replacedNode) || tree;
+ var idx = getComponentIndex(replacedNode);
+
+ var item = new Tree.Item(replacedNode, tree, true);
+
+ pNode.addChild(item, idx);
-Tree.Item.prototype = {
- initialize: function(id, tree, parent, ajaxUpdate) {
- this.parent = parent;
+ return item;
+ };
+}();
+
+Tree.Item.addMethods({
+ initialize: function($super, id, tree, ajaxUpdate) {
+ $super();
+
this.tree = tree;
this.elements = {};
+ this["rich:destructor"] = "destroy";
+
var element;
if (typeof id == 'string') {
@@ -33,9 +83,11 @@
this.id = element.id;
}
+ element.component = this;
element.object = this;
var rows = element.rows;
+ this.elements.itemElement = element;
this.elements.mainRow = rows[0];
var sibling = element.nextSibling;
@@ -50,8 +102,24 @@
var iconId = this.id + Tree.ID_DEVIDER + Tree.ID_ICON;
var textId = this.id + Tree.ID_DEVIDER + Tree.ID_TEXT;
- this.getElements(element, ajaxUpdate);
+ var childsTd = Richfaces.next(element);
+ this.createSubNodes(childsTd);
+ if (ajaxUpdate && this.tree.showConnectingLines) {
+ var cell = element.rows[0].cells[0];
+ if (cell.style && cell.style.removeExpression) {
+ cell.style.backgroundImage = cell.currentStyle.backgroundImage;
+ cell.style.removeExpression('backgroundImage');
+ }
+
+ if (childsTd) {
+ if (childsTd.style && childsTd.style.removeExpression) {
+ childsTd.style.backgroundImage = childsTd.currentStyle.backgroundImage;
+ childsTd.style.removeExpression('backgroundImage');
+ }
+ }
+ }
+
var handles = null;
var cells = this.elements.mainRow.cells;
if ("NETSCAPE" == RichFaces.navigatorType()) {
@@ -105,7 +173,7 @@
if (dropOpts) {
this.enableDropzoneCursors(dropOpts.acceptCursor, dropOpts.rejectCursor);
}
-
+
this.observeEvents();
this.previousTextClassNames = null;
@@ -114,15 +182,18 @@
},
destroy: function() {
+ this.elements = undefined;
+
+ //TODO remove check
+ if (this.parent) {
+ this.parent.removeChild(this);
+ }
+
+ this.clearChildren();
+
if (this == this.tree.selectionManager.activeItem) {
this.tree.selectionManager.activeItem = null;
}
-
- for (var i = 0; i < this.childs.length; i++) {
- this.childs[i].destroy();
- }
-
- this.childs = null;
},
observeEvents: function() {
@@ -136,7 +207,7 @@
Event.observe(this.elements.iconElement, "mouseout", this.eventMouseOut);
Event.observe(this.elements.iconElement, "mouseover", this.eventMouseOver);
if (this.onContextMenu) {
- this.elements.iconElement.oncontextmenu = this.onContextMenu;
+ Event.observe(this.elements.iconElement, "contextmenu", this.onContextMenu);
}
}
@@ -146,11 +217,11 @@
Event.observe(this.elements.textElement, "mouseout", this.eventMouseOut);
Event.observe(this.elements.textElement, "mouseover", this.eventMouseOver);
if (this.onContextMenu) {
- this.elements.textElement.oncontextmenu = this.onContextMenu;
+ Event.observe(this.elements.textElement, "contextmenu", this.onContextMenu);
}
}
- if (this.tree.switchType=="client" && this.childs.length > 0) {
+ if (this.tree.switchType=="client" && this.hasChilds()) {
this.eventCollapsionClick = this.toggleCollapsion.bindAsEventListener(this);
var handleElt = this.tree.toggleOnClick ? this.elements.mainRow : this.elements.handle;
@@ -158,50 +229,24 @@
}
},
- getElements: function(element, ajaxUpdate) {
- this.childs = [];
-
- var childsTd = element.nextSibling;
-
- if (ajaxUpdate && this.tree.showConnectingLines) {
- var cell = element.rows[0].cells[0];
- if (cell.style && cell.style.removeExpression) {
- cell.style.backgroundImage = cell.currentStyle.backgroundImage;
- cell.style.removeExpression('backgroundImage');
- }
-
- if (childsTd) {
- if (childsTd.style && childsTd.style.removeExpression) {
- childsTd.style.backgroundImage = childsTd.currentStyle.backgroundImage;
- childsTd.style.removeExpression('backgroundImage');
- }
- }
- }
-
- if (childsTd) {
- var child = childsTd.firstChild;
+ createSubNodes: function(childrenTd) {
+ if (childrenTd) {
+ var child = childrenTd.firstChild;
while ( child != null )
{
if (child.nodeType == 1 && child.tagName.toLowerCase() == "table") {
- this.addChild(new Tree.Item(child, this.tree, this));
+ if (child.object instanceof Tree.Item) {
+ var item = child.object;
+ this.addChild(item);
+ } else {
+ this.addChild(new Tree.Item(child, this.tree));
+ }
}
child = child.nextSibling;
}
- /*
- for (var i = 0; i < childsTd.childNodes.length; i++) {
- var child = childsTd.childNodes[i];
- if (child.nodeType == 1 && child.tagName.toLowerCase() == "table") {
- this.addChild(new Tree.Item(child.id, this.tree, this));
- }
- }
- */
}
},
- addChild: function(child) {
- this.childs.push(child);
- },
-
fireExpansionEvent: function() {
var props = new Object();
props[Richfaces.TreeExpandEvent] = true;
@@ -455,32 +500,26 @@
}
},
- next: function() {
- var children = this.parent.childs;
+ _nextForAxis: function(axisFunction) {
+ var item;
- for (var i = 0; i < children.length - 1; i++) {
- if (children[i] == this) {
- return children[i + 1];
- }
+ if (this.elements && this.elements.itemElement) {
+ item = Tree.Item.findComponent(axisFunction(this.elements.itemElement), axisFunction);
}
- return this;
+ return item || this;
},
+
+ next: function() {
+ return this._nextForAxis(Richfaces.next);
+ },
previous: function() {
- var children = this.parent.childs;
-
- for (var i = 1; i < children.length; i++) {
- if (children[i] == this) {
- return children[i - 1];
- }
- }
-
- return this;
+ return this._nextForAxis(Richfaces.previous);
},
hasChilds: function() {
- return this.childs.length > 0;
+ return this.childs && this.childs.length > 0;
},
getElement: function() {
@@ -490,4 +529,5 @@
isLeaf: function() {
return !this.elements.handle;
}
-}
+
+});
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree-selection.js 2008-12-14 18:07:10 UTC (rev 11758)
@@ -175,9 +175,7 @@
getPreviousItemForSelection: function(item) {
var prev = item.previous();
if (prev == item) {
- if (prev.parent == this.tree) {
- prev = item;
- } else {
+ if (item.parent != this.tree && item.parent) {
prev = item.parent;
}
} else if (!prev.isCollapsed() && prev.hasChilds()) {
Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2008-12-14 18:07:10 UTC (rev 11758)
@@ -2,7 +2,51 @@
Richfaces.TreeExpandEvent = "Richfaces.TreeExpandEvent";
Richfaces.TreeCollapseEvent = "Richfaces.TreeCollapseEvent";
-Tree = Class.create();
+Richfaces.TreeComposite = Class.create({
+
+ parent: null,
+
+ initialize: function() {
+ this.childs = [];
+ },
+
+ removeChild: function(child) {
+ if (this.childs.length) {
+ var idx = this.childs.indexOf(child);
+ if (idx != -1) {
+ var removedChildren = this.childs.splice(idx, 1);
+ if (removedChildren) {
+ for (var i = 0; i < removedChildren.length; i++) {
+ removedChildren[i].parent = undefined;
+ }
+ }
+ }
+ }
+ },
+
+ addChild: function(child, idx) {
+ var start;
+ if (typeof idx != 'undefined') {
+ start = idx;
+ } else {
+ start = this.childs.length;
+ }
+
+ this.childs.splice(start, 0, child);
+ child.parent = this;
+ },
+
+ clearChildren: function() {
+ for (var i = 0; i < this.childs.length; i++) {
+ this.childs[i].parent = undefined;
+ }
+
+ this.childs = [];
+ }
+
+});
+
+Tree = Class.create(Richfaces.TreeComposite);
Tree.ID_DEVIDER = ":";
Tree.ID_CONTENT = "content";
Tree.ID_CHILDS_ROW = "childs";
@@ -19,8 +63,9 @@
Tree.CLASS_ITEM_COLLAPSED = "dr-tree-h-ic-line-clp";
Tree.CLASS_AJAX_SELECTED_LISTENER_FLAG = "ajax_selected_listener_flag";
-Tree.prototype = {
- initialize: function(id, input, switchType, events, onAjaxSelect, toggleOnClick, showConnectingLines) {
+Tree.addMethods({
+ initialize: function($super, id, input, switchType, events, onAjaxSelect, toggleOnClick, showConnectingLines) {
+ $super();
this.childs = [];
this.elements = {};
@@ -122,69 +167,41 @@
Tree.ID_DEVIDER + Tree.ID_CHILDS_ROW/* + Tree.ID_DEVIDER + Tree.ID_CHILDS_TD*/);
if (this.elements.contentTd) {
- for(var child = this.elements.contentTd.firstChild; child != null; child = child.nextSibling ) {
+ for(var child = this.elements.contentTd.firstChild; child != null; child = child.nextSibling ) {
if (child.nodeType == 1 && child.tagName.toLowerCase() == "table") {
- this.addChild(new Tree.Item(child, this, this, ajaxUpdate));
+ this.addChild(new Tree.Item(child, this, ajaxUpdate));
}
}
/*
for (var i = 0; i < this.elements.contentTd.childNodes.length; i++) {
var child = this.elements.contentTd.childNodes[i];
if (child.nodeType == 1 && child.tagName.toLowerCase() == "table") {
- this.addChild(new Tree.Item(child.id, this, this, this.childs.length, this.switchType, this.toggleOnClick));
+ this.addChild(new Tree.Item(child.id, this, this.childs.length, this.switchType, this.toggleOnClick));
}
}
*/
}
},
- addChild: function(child) {
- this.childs.push(child);
- },
-
getNodeElements: function(nodeIds) {
if (nodeIds) {
for (var i = 0; i < nodeIds.length; i++ ) {
var nodeId = nodeIds[i];
- if (nodeId != this.id) {
- this._getNodeElements(this, nodeId, nodeId.substring(0, nodeId.lastIndexOf('::')));
+ if (nodeId == this.id) {
+ this.clearChildren();
+ this.getElements(true);
} else {
- for (var i = 0; i < this.childs.length; i++) {
- var child = this.childs[i];
- child.destroy();
- }
-
- this.childs = [];
- this.getElements(true);
+ Tree.Item.createItemForNode(nodeId, this);
}
}
-
- //input holding selection has been refreshed
- this.input = $(this.inputId);
- this.selectionManager.restoreSelection();
}
},
-
- _getNodeElements: function(node, nodeId, sNodeId) {
- for (var i = 0; i < node.childs.length; i++) {
- var child = node.childs[i];
- var cid = child.id;
-
- if (cid == nodeId) {
- child.destroy();
- node.childs[i] = new Tree.Item(cid, this, child.parent, true);
- break;
- } else {
- var scid = cid.substring(0, cid.lastIndexOf('::'));
- if (sNodeId.substr(0, scid.length) == scid && sNodeId.charAt(scid.length) == ':') {
-
- this._getNodeElements(child, nodeId, sNodeId);
- break;
- }
- }
- }
+
+ updateSelection: function(selectedNode) {
+ this.input.value = selectedNode;
+ this.selectionManager.restoreSelection();
},
-
+
showNode: function(itemNode) {
var node = itemNode;
var offsetTopItem = 0;
@@ -206,6 +223,4 @@
getElement: function() {
return $(this.id);
}
-}
-
-
+});
\ No newline at end of file
Deleted: trunk/ui/tree/src/test/java/org/richfaces/renderkit/TreeRowKeyComparatorTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/renderkit/TreeRowKeyComparatorTest.java 2008-12-14 18:03:41 UTC (rev 11757)
+++ trunk/ui/tree/src/test/java/org/richfaces/renderkit/TreeRowKeyComparatorTest.java 2008-12-14 18:07:10 UTC (rev 11758)
@@ -1,101 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * 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.renderkit;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-
-import org.richfaces.model.ListRowKey;
-
-import junit.framework.TestCase;
-
-/**
- *
- * <br /><br />
- *
- * Created 22.08.2007
- * @author Nick Belaevski
- * @since 3.1
- */
-
-public class TreeRowKeyComparatorTest extends TestCase {
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testComparator() throws Exception {
- Comparator comparator = TreeRendererBase.treeRowKeyComparator;
-
- ListRowKey emptyKey = new ListRowKey();
- ListRowKey key = new ListRowKey(new Integer(23));
- ListRowKey eqkey = new ListRowKey(new Integer(23));
- ListRowKey supKey = new ListRowKey(new ListRowKey(new Integer(23)), new Integer(34));
-
- ListRowKey predLongKey = new ListRowKey(new ListRowKey(new ListRowKey(new Integer(22)), new Integer(0)), new Integer(8));
- ListRowKey predKey = new ListRowKey(new Integer(22));
- ListRowKey predSupKey = new ListRowKey(new ListRowKey(new Integer(22)), new Integer(34));
- ListRowKey succKey = new ListRowKey(new ListRowKey(new Integer(25)), new Integer(34));
- ListRowKey succSupKey = new ListRowKey(new ListRowKey(new ListRowKey(new Integer(25)), new Integer(34)), new Integer(2));
-
- ArrayList list = new ArrayList();
- list.add(eqkey);
- list.add(succSupKey);
- list.add(succKey);
- list.add(predSupKey);
- list.add(predKey);
- list.add(supKey);
- list.add(key);
- list.add(null);
- list.add(emptyKey);
- list.add(null);
- list.add(predLongKey);
-
- Collections.sort(list, comparator);
-
- Iterator iterator = list.iterator();
- assertNull(iterator.next());
- assertNull(iterator.next());
- assertEquals(emptyKey, iterator.next());
- assertEquals(predKey, iterator.next());
- assertEquals(predLongKey, iterator.next());
- assertEquals(predSupKey, iterator.next());
- assertEquals(eqkey, iterator.next());
- assertEquals(key, iterator.next());
- assertEquals(supKey, iterator.next());
- assertEquals(succKey, iterator.next());
- assertEquals(succSupKey, iterator.next());
-
- }
-}
17 years, 5 months
JBoss Rich Faces SVN: r11757 - trunk/framework/impl/src/main/java/org/ajax4jsf/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 13:03:41 -0500 (Sun, 14 Dec 2008)
New Revision: 11757
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
Log:
https://jira.jboss.org/jira/browse/RF-4196
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-12-14 18:03:09 UTC (rev 11756)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIDataAdaptor.java 2008-12-14 18:03:41 UTC (rev 11757)
@@ -1331,6 +1331,15 @@
}
+ protected void addAjaxKeyEvent(FacesEvent event) {
+ Object eventRowKey = getRowKey();
+ if (null != eventRowKey) {
+ this._ajaxRowKey = eventRowKey;
+ this._ajaxRowKeysMap.put(getBaseClientId(getFacesContext()),
+ eventRowKey);
+ }
+ }
+
/*
* (non-Javadoc)
*
@@ -1340,12 +1349,7 @@
if (event.getComponent() != this) {
// For Ajax events, keep row value.
if (event.getPhaseId() == PhaseId.RENDER_RESPONSE) {
- Object eventRowKey = getRowKey();
- if (null != eventRowKey) {
- this._ajaxRowKey = eventRowKey;
- this._ajaxRowKeysMap.put(getBaseClientId(getFacesContext()),
- eventRowKey);
- }
+ addAjaxKeyEvent(event);
}
event = new IndexedEvent(this, event, getRowKey());
}
17 years, 5 months
JBoss Rich Faces SVN: r11756 - trunk/framework/api/src/main/java/org/richfaces/event.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-14 13:03:09 -0500 (Sun, 14 Dec 2008)
New Revision: 11756
Added:
trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEvent.java
trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEventType.java
Log:
https://jira.jboss.org/jira/browse/RF-4196
Added: trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEvent.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEvent.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEvent.java 2008-12-14 18:03:09 UTC (rev 11756)
@@ -0,0 +1,55 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * 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.event;
+
+import javax.faces.component.UIComponent;
+
+import org.ajax4jsf.event.AjaxEvent;
+
+/**
+ * Event send by tree component in case of AJAX of action (node expansion/collapsion or selection).
+ * Contains data to distinguish between different action types in order to support different re-rendering
+ * behaviors for particular actions.
+ *
+ * @author Nick Belaevski
+ * @since 3.3.0
+ */
+
+public class TreeAjaxEvent extends AjaxEvent {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2410803626536767706L;
+
+ private TreeAjaxEventType eventType;
+
+ public TreeAjaxEvent(UIComponent component, TreeAjaxEventType eventType) {
+ super(component);
+
+ this.eventType = eventType;
+ }
+
+ public TreeAjaxEventType getEventType() {
+ return eventType;
+ }
+}
Added: trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEventType.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEventType.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/event/TreeAjaxEventType.java 2008-12-14 18:03:09 UTC (rev 11756)
@@ -0,0 +1,33 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * 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.event;
+
+/**
+ * Types enumeration for possible tree actions to be used in {@link TreeAjaxEvent}
+ *
+ * @author Nick Belaevski
+ * @since 3.3.0
+ */
+
+public enum TreeAjaxEventType {
+ EXPANSION, SELECTION
+}
17 years, 5 months
JBoss Rich Faces SVN: r11755 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-12-13 10:02:19 -0500 (Sat, 13 Dec 2008)
New Revision: 11755
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
Log:
correction
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-12-13 14:59:40 UTC (rev 11754)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-12-13 15:02:19 UTC (rev 11755)
@@ -15,7 +15,7 @@
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING</param-name>
- <param-value>#{skinning.skinning}#{skinning.skinningClass}</param-value>
+ <param-value>#{skinning.skinning}</param-value>
</context-param>
<context-param>
17 years, 5 months
JBoss Rich Faces SVN: r11754 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-12-13 09:59:40 -0500 (Sat, 13 Dec 2008)
New Revision: 11754
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
Log:
replace skinning and skinningClass
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-12-12 19:09:00 UTC (rev 11753)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-12-13 14:59:40 UTC (rev 11754)
@@ -10,12 +10,12 @@
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name>
- <param-value>#{skinning.skinning}</param-value>
+ <param-value>#{skinning.skinningClass}</param-value>
</context-param>
<context-param>
<param-name>org.richfaces.CONTROL_SKINNING</param-name>
- <param-value>#{skinning.skinningClass}</param-value>
+ <param-value>#{skinning.skinning}#{skinning.skinningClass}</param-value>
</context-param>
<context-param>
@@ -176,7 +176,7 @@
<param-name>
org.apache.myfaces.CHECK_EXTENSIONS_FILTER
</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
@@ -213,7 +213,7 @@
<context-param>
<param-name>org.richfaces.queue.global.enabled</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<filter>
17 years, 5 months