You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/09/25 01:12:36 UTC
svn commit: r579014 - in
/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component:
UIXTableTemplate.java UIXTreeTemplate.java
Author: awiner
Date: Mon Sep 24 16:12:33 2007
New Revision: 579014
URL: http://svn.apache.org/viewvc?rev=579014&view=rev
Log:
TRINIDAD-737: Need To Establish Currency for Table Events
- Patch from Max Starets - improve ease-of-use by making table and tree listeners fire with
the row key set to the first selected row (and ditto for anything in a facet of the
table or tree that isn't already in a specific row)
Modified:
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java?rev=579014&r1=579013&r2=579014&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTableTemplate.java Mon Sep 24 16:12:33 2007
@@ -22,6 +22,8 @@
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -62,7 +64,31 @@
public void queueEvent(FacesEvent event)
{
TableUtils.__handleQueueEvent(this, event);
- super.queueEvent(event);
+
+ // If the currency is not already established,
+ // associate selected row key with the event
+ // UIXCollection.queueEvent() will wrap the event into
+ // a TableRowEvent that will include currency information
+
+ Object newKey = null;
+ Object oldKey = getRowKey();
+ if (oldKey == null)
+ {
+ Set keys = getSelectedRowKeys();
+ if (!keys.isEmpty())
+ newKey = keys.iterator().next();
+ }
+
+ if (newKey != null)
+ {
+ setRowKey(newKey);
+ super.queueEvent(event);
+ setRowKey(oldKey);
+ }
+ else
+ {
+ super.queueEvent(event);
+ }
}
/**
Modified: myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java?rev=579014&r1=579013&r2=579014&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java Mon Sep 24 16:12:33 2007
@@ -19,6 +19,9 @@
package org.apache.myfaces.trinidad.component;
import java.io.IOException;
+
+import java.util.Set;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.el.MethodBinding;
@@ -52,7 +55,31 @@
public void queueEvent(FacesEvent event)
{
TableUtils.__handleQueueEvent(this, event);
- super.queueEvent(event);
+
+ // If the currency is not already established,
+ // associate selected row key with the event
+ // UIXCollection.queueEvent() will wrap the event into
+ // a TableRowEvent that will include currency information
+
+ Object newKey = null;
+ Object oldKey = getRowKey();
+ if (oldKey == null)
+ {
+ Set keys = getSelectedRowKeys();
+ if (!keys.isEmpty())
+ newKey = keys.iterator().next();
+ }
+
+ if (newKey != null)
+ {
+ setRowKey(newKey);
+ super.queueEvent(event);
+ setRowKey(oldKey);
+ }
+ else
+ {
+ super.queueEvent(event);
+ }
}
/**