diff options
| author | Stephan Leicht | 2012-01-24 13:59:59 +0000 |
|---|---|---|
| committer | Stephan Leicht | 2012-01-24 13:59:59 +0000 |
| commit | 2a4f0ada2369929cf9e3beedc3ede01bb56cbaf0 (patch) | |
| tree | 323e1454c34e9992c3adecec47bc2dcad6e2abeb | |
| parent | 66d59f42f247b842fbb27bd6bc9b4a92f3875c42 (diff) | |
| download | org.eclipse.scout.rt-2a4f0ada2369929cf9e3beedc3ede01bb56cbaf0.tar.gz org.eclipse.scout.rt-2a4f0ada2369929cf9e3beedc3ede01bb56cbaf0.tar.xz org.eclipse.scout.rt-2a4f0ada2369929cf9e3beedc3ede01bb56cbaf0.zip | |
missing disposed check
| -rw-r--r-- | org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/tree/RwtScoutTree.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/tree/RwtScoutTree.java b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/tree/RwtScoutTree.java index bb888c2aca..51fb44a7fb 100644 --- a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/tree/RwtScoutTree.java +++ b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/basic/tree/RwtScoutTree.java @@ -334,14 +334,14 @@ public class RwtScoutTree extends RwtScoutComposite<ITree> implements IRwtScoutT }
private void updateTreeStructureAndKeepSelection(ITreeNode node) {
-// if (getUiTreeViewer() != null && getUiTreeViewer().getTree() != null && !getUiTreeViewer().getTree().isDisposed()) {
- if (node == getScoutObject().getRootNode()) {
- getUiTreeViewer().refresh();
- }
- else {
- getUiTreeViewer().refresh(node);
+ if (getUiTreeViewer() != null && getUiTreeViewer().getTree() != null && !getUiTreeViewer().getTree().isDisposed()) {
+ if (node == getScoutObject().getRootNode()) {
+ getUiTreeViewer().refresh();
+ }
+ else {
+ getUiTreeViewer().refresh(node);
+ }
}
-// }
}
protected void setSelectionFromRwt(final ITreeNode[] nodes) {
@@ -378,7 +378,9 @@ public class RwtScoutTree extends RwtScoutComposite<ITree> implements IRwtScoutT * @rn imo, 18.11.2009, ticket #83255
*/
protected void scrollToSelection() {
- getUiField().showSelection();
+ if (getUiField() != null && !getUiField().isDisposed()) {
+ getUiField().showSelection();
+ }
}
@Override
|