From 32d8bf8bd09599a64d46da019046e560255584cc Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 14 May 2007 20:08:49 +0000 Subject: [PATCH] [186848] check for hasChildren() before adding the go into action --- .../rse/internal/ui/view/SystemView.java | 18 ++++++++++++++++-- 1 file changed, 16 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 5b9717e34a4..4455b70ca89 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 @@ -854,8 +854,22 @@ public class SystemView extends SafeTreeViewer // OPEN IN NEW WINDOW ACTION... if (fromSystemViewPart) { GoIntoAction goIntoAction = getGoIntoAction(); - goIntoAction.setEnabled(selection.size() == 1); - menu.appendToGroup(ISystemContextMenuConstants.GROUP_GOTO, goIntoAction); + boolean singleSelection = selection.size() == 1; + goIntoAction.setEnabled(singleSelection); + if (singleSelection) + { + // dkm - first find out if the selection will have children + // only add this action if there are children + Object selectedObject = selection.getFirstElement(); + ISystemViewElementAdapter adapter = getViewAdapter(selectedObject); + if (adapter != null) + { + if (adapter.hasChildren((IAdaptable)selectedObject)) + { + menu.appendToGroup(ISystemContextMenuConstants.GROUP_GOTO, goIntoAction); + } + } + } if (showOpenViewActions()) { SystemOpenExplorerPerspectiveAction openToPerspectiveAction = getOpenToPerspectiveAction();