From a9b455c205188eeaa7574fa4fd2a15a3d335d5ab Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 1 Aug 2006 18:33:23 +0000 Subject: [PATCH] delete when the parent is the tree itself --- .../UI/org/eclipse/rse/internal/ui/view/SystemView.java | 7 ++++++- .../UI/org/eclipse/rse/ui/view/SystemView.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 59e61beb9f0..f11483d69f1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -2012,12 +2012,17 @@ public class SystemView extends TreeViewer implements ISystemTree, return Status.OK_STATUS; if ((parentItem instanceof Item) && !getExpanded((Item)parentItem)) refresh(parent); // flush memory + else if (parentItem instanceof Tree) + { + refresh(); + } else { wasSelected = isSelectedOrChildSelected(multiSource); if (wasSelected) clearSelection(); - _originatingViewer.remove(multiSource); + if (_originatingViewer != null) + _originatingViewer.remove(multiSource); if (wasSelected) setSelection(new StructuredSelection(parent),true); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java index 59e61beb9f0..f11483d69f1 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java @@ -2012,12 +2012,17 @@ public class SystemView extends TreeViewer implements ISystemTree, return Status.OK_STATUS; if ((parentItem instanceof Item) && !getExpanded((Item)parentItem)) refresh(parent); // flush memory + else if (parentItem instanceof Tree) + { + refresh(); + } else { wasSelected = isSelectedOrChildSelected(multiSource); if (wasSelected) clearSelection(); - _originatingViewer.remove(multiSource); + if (_originatingViewer != null) + _originatingViewer.remove(multiSource); if (wasSelected) setSelection(new StructuredSelection(parent),true); }