Author: lfryc(a)redhat.com Date: 2011-02-24 06:11:26 -0500 (Thu, 24 Feb 2011) New Revision: 21911 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java Log: fixed issues with recognition of selected nodes in map Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java 2011-02-24 11:10:32 UTC (rev 21910) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/model/treeAdaptor/ModelNode.java 2011-02-24 11:11:26 UTC (rev 21911) @@ -129,6 +129,11 @@ public int compareTo(K o) { return this.number - o.number; } + + @Override + public String toString() { + return Integer.toString(number); + } } public class V implements Serializable { Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-02-24 11:10:32 UTC (rev 21910) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richTreeModelAdaptor/TestTreeModelAdaptorSelection.java 2011-02-24 11:11:26 UTC (rev 21911) @@ -140,15 +140,21 @@ } private Integer fixShiftWhenModelPresent(List<Integer> list, int integer) { - if (paths.toString().equals(pathsForRecursiveModel.toString())) { - if (!list.isEmpty()) { - if (list.get(0) % 2 == 0) { - if (list.size() == 2) { + if (!list.isEmpty()) { + if (list.get(0) % 2 == 0) { + if (list.size() == 2) { + if (paths.toString().equals(pathsForRecursiveModel.toString())) { return integer + 7; + } else if (paths.toString().equals(pathsForMapModel.toString())) { + return integer + 3; } - } else { - if (list.size() == 3) { + } + } else { + if (list.size() == 3) { + if (paths.toString().equals(pathsForRecursiveModel.toString())) { return integer + 7; + } else if (paths.toString().equals(pathsForMapModel.toString())) { + return integer + 3; } } }