From 61cbdb14c7cdda0f42b6841cecd27dcbac45e25f Mon Sep 17 00:00:00 2001 From: David McKnight Date: Tue, 23 Jan 2007 14:07:17 +0000 Subject: [PATCH] kushal's change from 7.1 RSE to change the order of the menu popups --- .../rse/internal/ui/view/SystemView.java | 21 +++++++++++-------- .../org/eclipse/rse/ui/view/SystemView.java | 21 +++++++++++-------- 2 files changed, 24 insertions(+), 18 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 3fa823a36b9..aa675365aab 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 @@ -835,15 +835,18 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour //{ // ISystemViewElementAdapter nextAdapter = (ISystemViewElementAdapter)uniqueAdapters.nextElement(); adapter.addActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS); - if (adapter instanceof AbstractSystemViewAdapter) { - - AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter) adapter; - // add remote actions - aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS); - - // add dynamic menu popups - aVA.addDynamicPopupMenuActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADDITIONS); - } + + if (adapter instanceof AbstractSystemViewAdapter) + { + + AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter)adapter; + + // add dynamic menu popups + aVA.addDynamicPopupMenuActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADDITIONS); + + // add remote actions + aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS); + } //} } 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 3fa823a36b9..aa675365aab 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 @@ -835,15 +835,18 @@ public class SystemView extends TreeViewer implements ISystemTree, ISystemResour //{ // ISystemViewElementAdapter nextAdapter = (ISystemViewElementAdapter)uniqueAdapters.nextElement(); adapter.addActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS); - if (adapter instanceof AbstractSystemViewAdapter) { - - AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter) adapter; - // add remote actions - aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS); - - // add dynamic menu popups - aVA.addDynamicPopupMenuActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADDITIONS); - } + + if (adapter instanceof AbstractSystemViewAdapter) + { + + AbstractSystemViewAdapter aVA = (AbstractSystemViewAdapter)adapter; + + // add dynamic menu popups + aVA.addDynamicPopupMenuActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADDITIONS); + + // add remote actions + aVA.addCommonRemoteActions(ourMenu, selection, shell, ISystemContextMenuConstants.GROUP_ADAPTERS); + } //} }