Author: nbelaevski Date: 2009-01-13 21:14:47 -0500 (Tue, 13 Jan 2009) New Revision: 12268 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java trunk/test-applications/seleniumTest/richfaces/src/main/resources/swing-digester-rules.xml Log: https://jira.jboss.org/jira/browse/RF-4826 Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2009-01-14 02:12:33 UTC (rev 12267) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2009-01-14 02:14:47 UTC (rev 12268) @@ -22,13 +22,11 @@ import java.util.Date; -import javax.faces.FacesException; import javax.faces.component.UIComponent; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.event.ActionEvent; -import javax.faces.event.FacesEvent; import javax.faces.event.ValueChangeEvent; import org.ajax4jsf.javascript.ScriptUtils; @@ -36,8 +34,6 @@ import org.richfaces.event.NodeExpandedEvent; import org.richfaces.event.NodeSelectedEvent; -import sun.awt.datatransfer.DataTransferer.IndexOrderComparator; - /** * Bean for auto test * Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2009-01-14 02:12:33 UTC (rev 12267) +++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/tree/TreeTestBean.java 2009-01-14 02:14:47 UTC (rev 12268) @@ -22,6 +22,8 @@ import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; import java.util.Properties; import javax.faces.FacesException; @@ -130,13 +132,13 @@ return richRootNode; } - private javax.swing.tree.TreeNode swingRootNode = null; + private List<javax.swing.tree.TreeNode> swingNodes = null; - public synchronized javax.swing.tree.TreeNode getSwingTreeNode() { - if (null == swingRootNode) { + public synchronized List<javax.swing.tree.TreeNode> getSwingTreeNodes() { + if (null == swingNodes) { Digester digester = DigesterLoader.createDigester(getClass().getResource("/swing-digester-rules.xml")); - org.ajax4jsf.bean.tree.swing.AudioLibrary library = new org.ajax4jsf.bean.tree.swing.AudioLibrary(); - digester.push(library); + List<javax.swing.tree.TreeNode> nodes = new ArrayList<javax.swing.tree.TreeNode>(); + digester.push(nodes); try { digester.parse(getClass().getResourceAsStream("/audio-library.xml")); } catch (IOException e) { @@ -146,10 +148,10 @@ // TODO Auto-generated catch block e.printStackTrace(); } - swingRootNode = library; + swingNodes = nodes; } - return swingRootNode; + return swingNodes; } private boolean isRichModel = true; @@ -174,7 +176,7 @@ if(isRichModel) { return getRichTreeNode(); } else { - return getSwingTreeNode(); + return getSwingTreeNodes(); } } Modified: trunk/test-applications/seleniumTest/richfaces/src/main/resources/swing-digester-rules.xml =================================================================== --- trunk/test-applications/seleniumTest/richfaces/src/main/resources/swing-digester-rules.xml 2009-01-14 02:12:33 UTC (rev 12267) +++ trunk/test-applications/seleniumTest/richfaces/src/main/resources/swing-digester-rules.xml 2009-01-14 02:14:47 UTC (rev 12268) @@ -25,7 +25,7 @@ <pattern value="performer"> <object-create-rule classname="org.ajax4jsf.bean.tree.swing.Performer"/> <set-properties-rule/> - <set-next-rule methodname="addPerformer"/> + <set-next-rule methodname="add"/> <bean-property-setter-rule pattern="name"/> <pattern value="album"> <object-create-rule classname="org.ajax4jsf.bean.tree.swing.Album"/>