summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan.kronqvist@itmill.com>2011-09-07 08:59:26 +0000
committerJonatan Kronqvist <jonatan.kronqvist@itmill.com>2011-09-07 08:59:26 +0000
commit841e99e80fc6edd9059c66e5fee72c7e11c21b05 (patch)
tree137316455dcb4d8be310a2dbe0b28d597ea7b42a
parentda3275a2f20112c0c2ed6614792c8099b061fe8d (diff)
downloadvaadin-framework-841e99e80fc6edd9059c66e5fee72c7e11c21b05.tar.gz
vaadin-framework-841e99e80fc6edd9059c66e5fee72c7e11c21b05.zip
Fixed typo in SimpleTree causing assert error
svn changeset:20900/svn branch:6.7
-rw-r--r--src/com/vaadin/terminal/gwt/client/SimpleTree.java25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/SimpleTree.java b/src/com/vaadin/terminal/gwt/client/SimpleTree.java
index ea7eadaed3..552644043d 100644
--- a/src/com/vaadin/terminal/gwt/client/SimpleTree.java
+++ b/src/com/vaadin/terminal/gwt/client/SimpleTree.java
@@ -24,7 +24,7 @@ public class SimpleTree extends ComplexPanel {
Style style = getElement().getStyle();
style.setProperty("whiteSpace", "nowrap");
style.setPadding(3, Unit.PX);
-
+
style = handle.getStyle();
style.setDisplay(Display.NONE);
style.setProperty("textAlign", "center");
@@ -34,33 +34,34 @@ public class SimpleTree extends ComplexPanel {
style.setBorderColor("grey");
style.setBorderWidth(1, Unit.PX);
style.setMarginRight(3, Unit.PX);
- style.setProperty("border-radius", "4px");
+ style.setProperty("borderRadius", "4px");
handle.setInnerHTML("+");
getElement().appendChild(handle);
getElement().appendChild(text);
style = children.getStyle();
style.setPaddingLeft(20, Unit.PX);
style.setDisplay(Display.NONE);
-
+
getElement().appendChild(children);
addDomHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
if (event.getNativeEvent().getEventTarget().cast() == handle) {
- if(children.getStyle().getDisplay().intern() == Display.NONE.getCssName()) {
+ if (children.getStyle().getDisplay().intern() == Display.NONE
+ .getCssName()) {
open(event.getNativeEvent().getShiftKey());
} else {
close();
}
-
+
} else if (event.getNativeEvent().getEventTarget().cast() == text) {
select(event);
}
}
}, ClickEvent.getType());
}
-
+
protected void select(ClickEvent event) {
-
+
}
public void close() {
@@ -71,7 +72,7 @@ public class SimpleTree extends ComplexPanel {
public void open(boolean recursive) {
handle.setInnerHTML("-");
children.getStyle().setDisplay(Display.BLOCK);
- if(recursive) {
+ if (recursive) {
for (Widget w : getChildren()) {
if (w instanceof SimpleTree) {
SimpleTree str = (SimpleTree) w;
@@ -85,21 +86,21 @@ public class SimpleTree extends ComplexPanel {
this();
setText(caption);
}
-
+
public void setText(String text) {
this.text.setInnerText(text);
}
-
+
public void addItem(String text) {
Label label = new Label(text);
add(label, children);
}
-
+
@Override
public void add(Widget child) {
add(child, children);
}
-
+
@Override
protected void add(Widget child, Element container) {
super.add(child, container);