null.
+ */
+ private IRSESystemType getSystemTypeForHost(IHost host) {
+ if (host != null) {
+ return RSECorePlugin.getDefault().getRegistry().getSystemType((host.getSystemType()));
+ }
+ return null;
+ }
/**
* Returns any actions that should be contributed to the popup menu
* for the given element.
@@ -108,46 +126,46 @@ public class SystemViewConnectionAdapter
// bugzilla#161195: _ALL_ actions needs to be passed to the system type for approval.
// _Never_ add any action without the system type provider having said ok to this.
IHost host = (IHost)selection.getFirstElement();
- IRSESystemType sysType = RSECorePlugin.getDefault().getRegistry().getSystemType((host.getSystemType()));
- Object adapter = sysType.getAdapter(IRSESystemType.class);
+ IRSESystemType sysType = getSystemTypeForHost(host);
+ Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
//updateAction.setValue(null); // reset
if (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), anotherConnectionAction))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, anotherConnectionAction.getClass()))
menu.add(menuGroup, anotherConnectionAction);
if (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), copyAction))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, copyAction.getClass()))
menu.add(menuGroup, copyAction);
if (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), moveAction))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, moveAction.getClass()))
menu.add(menuGroup, moveAction);
if (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), upAction))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, upAction.getClass()))
menu.add(menuGroup, upAction);
if (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), downAction))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, downAction.getClass()))
menu.add(menuGroup, downAction);
// MJB: RE defect 40854
addConnectOrDisconnectAction(menu, menuGroup, selection);
if (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), clearPasswordAction))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, clearPasswordAction.getClass()))
menu.add(menuGroup, clearPasswordAction);
// yantzi: artemis 6.0, offline support, only add work offline action for system types that support offline mode
if (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), offlineAction))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, offlineAction.getClass()))
menu.add(menuGroup, offlineAction);
}
private void addConnectOrDisconnectAction(SystemMenuManager menu, String menuGroup, IStructuredSelection selection) {
IHost host = (IHost)selection.getFirstElement();
- IRSESystemType sysType = RSECorePlugin.getDefault().getRegistry().getSystemType((host.getSystemType()));
- Object adapter = sysType.getAdapter(IRSESystemType.class);
+ IRSESystemType sysType = getSystemTypeForHost(host);
+ Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
ISystemRegistry sysReg = RSEUIPlugin.getTheSystemRegistry();
@@ -158,11 +176,11 @@ public class SystemViewConnectionAdapter
boolean allConnected = sysReg.areAllSubSystemsConnected(host);
if (!allConnected && (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), connectAction)))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, connectAction.getClass())))
menu.add(menuGroup, connectAction);
if (anyConnected && (sysTypeAdapter == null
- || sysTypeAdapter.acceptContextMenuActionContribution(host, sysType, menu.getMenuManager(), disconnectAction)))
+ || sysTypeAdapter.acceptContextMenuActionContribution(host, disconnectAction.getClass())))
menu.add(menuGroup, disconnectAction);
}
}
@@ -182,17 +200,111 @@ public class SystemViewConnectionAdapter
actionsCreated = true;
}
-
+
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#showDelete(java.lang.Object)
+ */
+ public boolean showDelete(Object element) {
+ // bugzilla#161195: _ALL_ actions needs to be passed to the system type for approval.
+ // _Never_ add any action without the system type provider having said ok to this.
+ if (element instanceof IHost) {
+ IRSESystemType sysType = getSystemTypeForHost((IHost)element);
+ Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
+ RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
+ if (sysTypeAdapter != null) {
+ return sysTypeAdapter.acceptContextMenuActionContribution((IHost)element, SystemCommonDeleteAction.class);
+ }
+ }
+ return super.showDelete(element);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#showGenericShowInTableAction(java.lang.Object)
+ */
+ public boolean showGenericShowInTableAction(Object element) {
+ // bugzilla#161195: _ALL_ actions needs to be passed to the system type for approval.
+ // _Never_ add any action without the system type provider having said ok to this.
+ if (element instanceof IHost) {
+ IRSESystemType sysType = getSystemTypeForHost((IHost)element);
+ Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
+ RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
+ if (sysTypeAdapter != null) {
+ boolean accepted = false;
+ Class[] affectedClasses = new Class[] { SystemShowInTableAction.class, SystemShowInMonitorAction.class };
+ for (int i = 0; i < affectedClasses.length && accepted == false; i++) {
+ accepted |= sysTypeAdapter.acceptContextMenuActionContribution((IHost)element, affectedClasses[i]);
+ }
+ return accepted;
+ }
+ }
+ return super.showGenericShowInTableAction(element);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#showOpenViewActions(java.lang.Object)
+ */
+ public boolean showOpenViewActions(Object element) {
+ // bugzilla#161195: _ALL_ actions needs to be passed to the system type for approval.
+ // _Never_ add any action without the system type provider having said ok to this.
+ if (element instanceof IHost) {
+ IRSESystemType sysType = getSystemTypeForHost((IHost)element);
+ Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
+ RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
+ if (sysTypeAdapter != null) {
+ boolean accepted = false;
+ Class[] affectedClasses = new Class[] { GoIntoAction.class, SystemOpenExplorerPerspectiveAction.class };
+ for (int i = 0; i < affectedClasses.length && accepted == false; i++) {
+ accepted |= sysTypeAdapter.acceptContextMenuActionContribution((IHost)element, affectedClasses[i]);
+ }
+ return accepted;
+ }
+ }
+ return super.showOpenViewActions(element);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#showRefresh(java.lang.Object)
+ */
+ public boolean showRefresh(Object element) {
+ // bugzilla#161195: _ALL_ actions needs to be passed to the system type for approval.
+ // _Never_ add any action without the system type provider having said ok to this.
+ if (element instanceof IHost) {
+ IRSESystemType sysType = getSystemTypeForHost((IHost)element);
+ Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
+ RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
+ if (sysTypeAdapter != null) {
+ return sysTypeAdapter.acceptContextMenuActionContribution((IHost)element, SystemRefreshAction.class);
+ }
+ }
+ return super.showRefresh(element);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#showRename(java.lang.Object)
+ */
+ public boolean showRename(Object element) {
+ // bugzilla#161195: _ALL_ actions needs to be passed to the system type for approval.
+ // _Never_ add any action without the system type provider having said ok to this.
+ if (element instanceof IHost) {
+ IRSESystemType sysType = getSystemTypeForHost((IHost)element);
+ Object adapter = sysType != null ? sysType.getAdapter(IRSESystemType.class) : null;
+ RSESystemTypeAdapter sysTypeAdapter = adapter instanceof RSESystemTypeAdapter ? (RSESystemTypeAdapter)adapter : null;
+ if (sysTypeAdapter != null) {
+ return sysTypeAdapter.acceptContextMenuActionContribution((IHost)element, SystemCommonRenameAction.class);
+ }
+ }
+ return super.showRename(element);
+ }
+
/**
* Returns an image descriptor for the image. More efficient than getting the image.
* @param element The element for which an image is desired
*/
public ImageDescriptor getImageDescriptor(Object element) {
IHost connection = (IHost)element;
- String systemTypeName = connection.getSystemType();
boolean anyConnected = RSEUIPlugin.getTheSystemRegistry().isAnySubSystemConnected(connection);
ImageDescriptor descriptor = null;
- IRSESystemType systemType = RSECorePlugin.getDefault().getRegistry().getSystemType(systemTypeName);
+ IRSESystemType systemType = getSystemTypeForHost(connection);
if (systemType != null) {
RSESystemTypeAdapter sysTypeAdapter = (RSESystemTypeAdapter)(systemType.getAdapter(IRSESystemType.class));
if (anyConnected) {
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java
index 62ea037a4a8..c59943ac998 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSESystemTypeAdapter.java
@@ -23,11 +23,10 @@ import java.net.URL;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.IRSESystemTypeConstants;
+import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.RSEPreferencesManager;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.core.model.ISystemRegistry;
@@ -244,32 +243,34 @@ public class RSESystemTypeAdapter extends RSEAdapter implements IRSESystemTypeCo
/**
- * Called to approve the contribution of the specified action to the context menu of the
- * specified host of the specified system type. System type providers should implement
- * this method in a way that specific actions might be denied, but all other action contributions,
- * including unknown action contributions, should be accepted.
+ * Called to approve the contribution of the specified action class to the context menu of the
+ * specified host.
+ * + * Note: System type providers should implement this method in a way that specific + * actions might be denied, but all other action contributions, including unknown + * action contributions, should be accepted. *
* This method is called from:
*
null.
+ * @param actionClass The contributed action. Must be not null.
*
* @return True if the contributed action is accepted for the specified context, false otherwise.
*/
- public boolean acceptContextMenuActionContribution(IHost host, IRSESystemType systemType, IMenuManager menuManager, IAction action) {
+ public boolean acceptContextMenuActionContribution(IHost host, Class actionClass) {
+ assert host != null && actionClass != null;
// The SystemWorkOfflineAction is accepted if isEnabledOffline is returning true
- if (action instanceof SystemWorkOfflineAction) {
- return isEnableOffline(systemType);
+ if (actionClass.equals(SystemWorkOfflineAction.class)) {
+ return isEnableOffline(RSECorePlugin.getDefault().getRegistry().getSystemType(host.getSystemType()));
}
// SystemClearAllPasswordsAction is accepted only if passwords are supported
// by any of the sub systems.
- if (action instanceof SystemClearAllPasswordsAction) {
+ if (actionClass.equals(SystemClearAllPasswordsAction.class)) {
ISystemRegistry registry = RSEUIPlugin.getDefault().getSystemRegistry();
IConnectorService[] connectorServices = registry.getConnectorServices(host);
boolean passwordsSupported = false;