You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2011/05/11 01:41:41 UTC
svn commit: r1101680 - in /pivot/trunk:
tests/src/org/apache/pivot/tests/issues/Pivot734.java
tests/src/org/apache/pivot/tests/issues/pivot_734.bxml
wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Author: smartini
Date: Tue May 10 23:41:40 2011
New Revision: 1101680
URL: http://svn.apache.org/viewvc?rev=1101680&view=rev
Log:
PIVOT-734 : the fix plus some other small feature to the related test application
Modified:
pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot734.java
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_734.bxml
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot734.java
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot734.java?rev=1101680&r1=1101679&r2=1101680&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot734.java (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/Pivot734.java Tue May 10 23:41:40 2011
@@ -35,7 +35,8 @@ public class Pivot734 implements Applica
private Window window = null;
private TreeView tree;
- private PushButton treeAddButton;
+ private PushButton treeButtonAdd;
+ private PushButton treeButtonRemove;
public Pivot734() {
@@ -50,10 +51,13 @@ public class Pivot734 implements Applica
}
private void controlTree(BXMLSerializer bxmlSerializer) {
- treeAddButton = (PushButton) bxmlSerializer.getNamespace().get("treeAddButton");
+ treeButtonAdd = (PushButton) bxmlSerializer.getNamespace().get("treeButtonAdd");
+ treeButtonRemove = (PushButton) bxmlSerializer.getNamespace().get("treeButtonRemove");
tree = (TreeView) bxmlSerializer.getNamespace().get("tree");
- tree.getTreeViewSelectionListeners().add(new TreeViewSelectionListener() {
+ String treeStyleForShowEmptyBranchControls = ((Boolean) tree.getStyles().get("showEmptyBranchControls")).toString();
+ System.out.println("tree style for showEmptyBranchControls is " + treeStyleForShowEmptyBranchControls);
+ tree.getTreeViewSelectionListeners().add(new TreeViewSelectionListener() {
public void selectedPathAdded(TreeView treeView, Path path) {
System.out.println("selectedPathAdded");
}
@@ -70,11 +74,11 @@ public class Pivot734 implements Applica
System.out.println("selectedNodeChanged");
}
});
- treeAddButton.getButtonPressListeners().add(new ButtonPressListener() {
+ treeButtonAdd.getButtonPressListeners().add(new ButtonPressListener() {
public void buttonPressed(Button button) {
Object x = tree.getSelectedNode();
- System.out.println("add a new element to :: " + x);
+ System.out.println("add a 'new branch' element to the selected element :: " + x);
if (x != null && x instanceof TreeBranch)
{
@@ -84,6 +88,21 @@ public class Pivot734 implements Applica
}
});
+
+ treeButtonRemove.getButtonPressListeners().add(new ButtonPressListener() {
+ public void buttonPressed(Button button) {
+ Object x = tree.getSelectedNode();
+ System.out.println("remove a 'new branch' element under the selected element :: " + x);
+
+ if (x != null && x instanceof TreeBranch)
+ {
+ TreeBranch treeBranch = new TreeBranch("new branch");
+ ((TreeBranch)x).remove(treeBranch);
+ }
+
+ }
+ });
+
}
@Override
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_734.bxml
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_734.bxml?rev=1101680&r1=1101679&r2=1101680&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_734.bxml (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot_734.bxml Tue May 10 23:41:40 2011
@@ -26,7 +26,10 @@ limitations under the License.
<BoxPane orientation="horizontal">
<BoxPane orientation="vertical">
- <PushButton bxml:id="treeAddButton" buttonData="add"/>
+ <BoxPane orientation="horizontal">
+ <PushButton bxml:id="treeButtonAdd" buttonData="add"/>
+ <PushButton bxml:id="treeButtonRemove" buttonData="remove"/>
+ </BoxPane>
<ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
<!--
<TreeView bxml:id="tree" styles="{}">
Modified: pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java
URL: http://svn.apache.org/viewvc/pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java?rev=1101680&r1=1101679&r2=1101680&view=diff
==============================================================================
--- pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java (original)
+++ pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/TerraTreeViewSkin.java Tue May 10 23:41:40 2011
@@ -390,7 +390,7 @@ public class TerraTreeViewSkin extends C
*/
@SuppressWarnings("unchecked")
public void loadChildren() {
- if (children == null) {
+ if (children == null || children.isEmpty()) {
List<Object> data = (List<Object>)this.data;
int count = data.getLength();