aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2011-07-29 06:38:46 +0000
committerArtur Signell <artur.signell@itmill.com>2011-07-29 06:38:46 +0000
commit2eed05db5d201e4d792894bae4b3d591159b281f (patch)
tree4d1cdf67f72c0507aff1a436dacdd6f6f4fa9f38
parent3be6a0c18d6dd51300b6bdb75cfe8e7f2b91faab (diff)
downloadvaadin-framework-2eed05db5d201e4d792894bae4b3d591159b281f.tar.gz
vaadin-framework-2eed05db5d201e4d792894bae4b3d591159b281f.zip
Formatted source code
svn changeset:20011/svn branch:6.6
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VTree.java36
1 files changed, 19 insertions, 17 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index ed705dbb9e..cf7e8b5a70 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -417,8 +417,7 @@ public class VTree extends FocusElementPanel implements Paintable,
VerticalDropLocation curDetail = (VerticalDropLocation) event
.getDropDetails().get("detail");
if (curDetail == detail
- && newKey
- .equals(currentMouseOverKey)) {
+ && newKey.equals(currentMouseOverKey)) {
keyToNode.get(newKey).emphasis(detail);
}
/*
@@ -778,8 +777,9 @@ public class VTree extends FocusElementPanel implements Paintable,
if (selectable) {
// caption click = selection change && possible click
// event
- if (handleClickSelection(event.getCtrlKey()
- || event.getMetaKey(), event.getShiftKey())) {
+ if (handleClickSelection(
+ event.getCtrlKey() || event.getMetaKey(),
+ event.getShiftKey())) {
event.preventDefault();
}
} else {
@@ -986,14 +986,14 @@ public class VTree extends FocusElementPanel implements Paintable,
if (icon == null) {
onloadHandled = false;
icon = new Icon(client);
- DOM.insertBefore(DOM.getFirstChild(nodeCaptionDiv), icon
- .getElement(), nodeCaptionSpan);
+ DOM.insertBefore(DOM.getFirstChild(nodeCaptionDiv),
+ icon.getElement(), nodeCaptionSpan);
}
icon.setUri(uidl.getStringAttribute("icon"));
} else {
if (icon != null) {
- DOM.removeChild(DOM.getFirstChild(nodeCaptionDiv), icon
- .getElement());
+ DOM.removeChild(DOM.getFirstChild(nodeCaptionDiv),
+ icon.getElement());
icon = null;
}
}
@@ -1066,8 +1066,9 @@ public class VTree extends FocusElementPanel implements Paintable,
childNodeContainer.add(childTree);
}
if (!i.hasNext()) {
- childTree.addStyleDependentName(childTree.isLeaf()
- ? "leaf-last" : "last");
+ childTree
+ .addStyleDependentName(childTree.isLeaf() ? "leaf-last"
+ : "last");
childTree.childNodeContainer.addStyleDependentName("last");
}
}
@@ -1731,8 +1732,9 @@ public class VTree extends FocusElementPanel implements Paintable,
// keypress event
keyCode = CHARCODE_SPACE;
}
- if (handleKeyNavigation(keyCode, event.isControlKeyDown()
- || event.isMetaKeyDown(), event.isShiftKeyDown())) {
+ if (handleKeyNavigation(keyCode,
+ event.isControlKeyDown() || event.isMetaKeyDown(),
+ event.isShiftKeyDown())) {
event.preventDefault();
event.stopPropagation();
}
@@ -1746,9 +1748,9 @@ public class VTree extends FocusElementPanel implements Paintable,
* .event.dom.client.KeyDownEvent)
*/
public void onKeyDown(KeyDownEvent event) {
- if (handleKeyNavigation(event.getNativeEvent().getKeyCode(), event
- .isControlKeyDown()
- || event.isMetaKeyDown(), event.isShiftKeyDown())) {
+ if (handleKeyNavigation(event.getNativeEvent().getKeyCode(),
+ event.isControlKeyDown() || event.isMetaKeyDown(),
+ event.isShiftKeyDown())) {
event.preventDefault();
event.stopPropagation();
}
@@ -2206,8 +2208,8 @@ public class VTree extends FocusElementPanel implements Paintable,
ArrayList<Integer> positions = new ArrayList<Integer>();
while (treeNode.getParentNode() != null) {
- positions.add(0, treeNode.getParentNode().getChildren().indexOf(
- treeNode));
+ positions.add(0,
+ treeNode.getParentNode().getChildren().indexOf(treeNode));
treeNode = treeNode.getParentNode();
}
positions.add(0, getRootNodes().indexOf(treeNode));