From c8e49716f3b00e2ed85e20f0c9c75e69b281e8f4 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Thu, 16 Oct 2008 19:00:07 +0000 Subject: [PATCH] [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc. --- .../ui/view/SystemViewFilterReferenceAdapter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java index ee0e9f19a0c..5ffd98362d9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java @@ -30,6 +30,7 @@ * David McKnight (IBM) - [233494] Show in Table Action should be removed from promptable filters * David McKnight (IBM) - [238507] Promptable Filters refreshed after modifying filter strings * David McKnight (IBM) - [244824] filter not refreshed if child is "empty list" or system message node + * David McKnight (IBM) - [249245] not showing inappropriate popup actions for: Refresh, Show In Table, Go Into, etc. *******************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -754,7 +755,8 @@ public class SystemViewFilterReferenceAdapter public boolean showOpenViewActions(Object element) { ISystemFilter filter = getFilter(element); - return !filter.isPromptable(); + ISubSystemConfiguration ssParentFactory = getSubSystemConfiguration(filter); + return !filter.isPromptable() && !ssParentFactory.supportsCommands(); } @@ -765,7 +767,7 @@ public class SystemViewFilterReferenceAdapter { ISystemFilter filter = getFilter(element); ISubSystemConfiguration ssParentFactory = getSubSystemConfiguration(filter); - return ssParentFactory.showGenericShowInTableOnFilter() && !filter.isPromptable(); + return ssParentFactory.showGenericShowInTableOnFilter() && !filter.isPromptable() && !ssParentFactory.supportsCommands(); } /** @@ -775,7 +777,7 @@ public class SystemViewFilterReferenceAdapter { ISystemFilter filter = getFilter(element); ISubSystemConfiguration ssParentFactory = getSubSystemConfiguration(filter); - return ssParentFactory.showRefreshOnFilter() && !filter.isPromptable(); + return ssParentFactory.showRefreshOnFilter() && !filter.isPromptable() && !ssParentFactory.supportsCommands(); } // ------------------------------------------------------------