mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-03 23:25:26 +02:00
Code Issues Wiki Activity

[fix] [api] Unify action contribution methods in ISubSystemConfigurationAdapter

Browse source
This commit is contained in:
Uwe Stieber 2007-03-16 16:12:37 +00:00
parent bec5ef86c8
commit a9d61fdbac
9 changed files with 71 additions and 335 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterAdapter.java
View file

@ -89,7 +89,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter
ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(filter);
ssFactory.setConnection(null);
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell);
IAction[] actions = adapter.getFilterActions(menu, selection, shell, menuGroup, ssFactory, filter);
if (actions != null)
{
for (int idx=0; idx<actions.length; idx++)

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolAdapter.java
View file

@ -73,7 +73,7 @@ public class SystemViewFilterPoolAdapter extends AbstractSystemViewAdapter
ISystemFilterPool pool = ((ISystemFilterPool)selection.getFirstElement());
ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(pool);
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell);
IAction[] actions = adapter.getFilterPoolActions(menu, selection, shell, menuGroup, ssFactory, pool);
if (actions != null)
{
for (int idx=0; idx<actions.length; idx++)

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterPoolReferenceAdapter.java
View file

@ -78,7 +78,7 @@ public class SystemViewFilterPoolReferenceAdapter
ISubSystemConfiguration ssFactory = getSubSystemConfiguration(pool);
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell);
IAction[] actions = adapter.getFilterPoolActions(menu, selection, shell, menuGroup, ssFactory, pool);
if (actions != null)
{
for (int idx=0; idx<actions.length; idx++)
@ -87,7 +87,7 @@ public class SystemViewFilterPoolReferenceAdapter
menu.add(menuGroup, action);
}
}
actions = adapter.getFilterPoolReferenceActions(ssFactory, getFilterPoolReference(element), shell);
actions = adapter.getFilterPoolReferenceActions(menu, selection, shell, menuGroup, ssFactory, getFilterPoolReference(element));
if (actions != null)
{
//menu.addSeparator();

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterReferenceAdapter.java
View file

@ -100,7 +100,7 @@ public class SystemViewFilterReferenceAdapter
ssFactory.setCurrentSelection(selection.toArray());
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell);
IAction[] actions = adapter.getFilterActions(menu, selection, shell, menuGroup, ssFactory, filter);
if (actions != null)
{
for (int idx = 0; idx < actions.length; idx++)
@ -109,7 +109,7 @@ public class SystemViewFilterReferenceAdapter
menu.add(menuGroup, action);
}
}
actions = adapter.getFilterReferenceActions(ssFactory, getFilterReference(selection.getFirstElement()), shell);
actions = adapter.getFilterReferenceActions(menu, selection, shell, menuGroup, ssFactory, getFilterReference(selection.getFirstElement()));
if (actions != null)
{
for (int idx = 0; idx < actions.length; idx++)

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewFilterStringAdapter.java
View file

@ -63,18 +63,6 @@ public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter
ISystemFilterString filterString = getFilterString(selection.getFirstElement());
if (filterString.getParentSystemFilter().isTransient())
return;
/*
SubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(filterString);
ssFactory.setConnection(null);
IAction[] actions = ssFactory.getFilterActions(filter, shell);
if (actions != null)
{
for (int idx=0; idx<actions.length; idx++)
{
IAction action = actions[idx];
menu.add(menuGroup, action);
}
} */
}
private ISystemFilterString getFilterString(Object element)

35
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewSubSystemAdapter.java
View file

@ -17,6 +17,7 @@
package org.eclipse.rse.internal.ui.view;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection;
@ -27,6 +28,7 @@ import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.ISystemContextMenuConstants;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.SystemResources;
@ -78,22 +80,25 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
*/
public void addActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup)
{
if (selection.size() != 1)
return; // does not make sense adding unique actions per multi-selection
Object element = selection.getFirstElement();
ISubSystem ss = (ISubSystem)element;
ISubSystemConfiguration ssFactory = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemConfiguration(ss);
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getSubSystemActions(ssFactory, ss,shell);
if (actions != null)
{
for (int idx=0; idx<actions.length; idx++)
{
IAction action = actions[idx];
menu.add(menuGroup, action);
}
// does not make sense adding unique actions per multi-selection
if (selection.size() == 1) {
Object element = selection.getFirstElement();
ISubSystem ss = (ISubSystem)element;
ISubSystemConfiguration ssFactory = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemConfiguration(ss);
ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getSubSystemActions(menu, selection, shell, menuGroup, ssFactory, ss);
if (actions != null)
{
for (int idx=0; idx<actions.length; idx++)
{
IAction action = actions[idx];
menu.add(menuGroup, action);
}
}
}
menu.appendToGroup(ISystemContextMenuConstants.GROUP_NEW, new GroupMarker(ISystemContextMenuConstants.GROUP_NEW_NONCASCADING));// user or BP/ISV additions
}
/**

308
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
View file

@ -430,33 +430,25 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
/**
* Returns a list of actions for the popup menu when user right clicks on a subsystem object from this factory.
* By default returns a single item array with a SystemNewFilterPoolAction object and
* calls overridable method getAdditionalSubSystemActions.
* <p>
* If you wish to support more actions, override getAdditionalSubSystemActions to return a Vector
* of IAction objects.
* @see #getSubSystemNewFilterPoolActions(ISubSystemConfiguration, ISubSystem, Shell)
* @see #getAdditionalSubSystemActions(ISubSystemConfiguration, ISubSystem, Shell)
* Override if additional actions needs to be contributed.
* <p>
* @see #getSubSystemNewFilterPoolActions(SystemMenuManager, IStructuredSelection, Shell, String, ISubSystemConfiguration, ISubSystem)
*
* @param selectedSubSystem the currently selected subsystem
* @param shell The Shell of the view where this action was launched from
* @return array of IAction objects to contribute to the popup menu
*/
public IAction[] getSubSystemActions(ISubSystemConfiguration factory, ISubSystem selectedSubSystem, Shell shell)
public IAction[] getSubSystemActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISubSystem selectedSubSystem)
{
Vector ourChildActions = getAdditionalSubSystemActions(factory, selectedSubSystem, shell);
// we need to start with a fresh vector each time not build up on what our child
// class gives us, since that may be cached and hence will grow if we keep adding to i.
Vector childActions = new Vector();
if (ourChildActions != null)
for (int idx = 0; idx < ourChildActions.size(); idx++)
childActions.addElement(ourChildActions.elementAt(idx));
if (factory.supportsFilters())
{
boolean showFilterPools = factory.showFilterPools();
// if showing filter pools, we have to add a "new filter pool" action here...
if (showFilterPools)
{
IAction[] newFPActions = getSubSystemNewFilterPoolActions(factory, selectedSubSystem, shell);
IAction[] newFPActions = getSubSystemNewFilterPoolActions(menu, selection, shell, menuGroup, factory, selectedSubSystem);
if (newFPActions != null)
{
for (int idx = 0; idx < newFPActions.length; idx++)
@ -482,7 +474,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
// if not showing filter pools, we have to add a "new filter" action here...
if (!showFilterPools)
{
IAction[] newFilterActions = getNewFilterPoolFilterActions(factory, null, shell);
IAction[] newFilterActions = getNewFilterPoolFilterActions(menu, selection, shell, menuGroup, factory, null);
if ((newFilterActions != null) && (newFilterActions.length > 0))
{
// pre-scan for legacy
@ -494,20 +486,6 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
{
}
}
/*
if (anyLegacy)
{
SystemFilterPoolReferenceManager refMgr = selectedSubSystem.getSystemFilterPoolReferenceManager();
SystemFilterPool[] refdPools = refMgr.getReferencedSystemFilterPools();
if ( refdPools.length == 0 )
RSEUIPlugin.logInfo("SubSystemConfigurationImpl::getSubSystemActions - getReferencedSystemFilterPools returned array of lenght zero.");
for (int idx=0; idx<newFilterActions.length; idx++)
{
if (newFilterActions[idx] instanceof SystemFilterBaseNewFilterAction && refdPools.length > 0 )
((SystemFilterBaseNewFilterAction)newFilterActions[idx]).setAllowFilterPoolSelection(refdPools);
} // end for loop
}
*/
// now add the actions
for (int idx = 0; idx < newFilterActions.length; idx++)
childActions.addElement(newFilterActions[idx]);
@ -569,7 +547,14 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
return allActions;
}
private void addConnectOrDisconnectAction(Vector actions, Shell shell, ISubSystem selectedSS)
/**
* Overridable method to add the connect or disconnect action.
*
* @param actions The list of child actions. Add the connect/disconnect action to this vector is applicable.
* @param shell The shell.
* @param selectedSS The selected subsystem.
*/
protected void addConnectOrDisconnectAction(Vector actions, Shell shell, ISubSystem selectedSS)
{
boolean connected = selectedSS.isConnected();
if (connected)
@ -684,7 +669,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* @param shell The Shell of the view where this action was launched from
* @return array of IAction objects to contribute to the popup menu
*/
protected IAction[] getSubSystemNewFilterPoolActions(ISubSystemConfiguration factory, ISubSystem selectedSubSystem, Shell shell)
protected IAction[] getSubSystemNewFilterPoolActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISubSystem selectedSubSystem)
{
IAction[] actions = new IAction[2];
actions[0] = new SystemFilterNewFilterPoolAction(shell);
@ -694,23 +679,6 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
((ISystemAction) actions[1]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0041"); //$NON-NLS-1$
return actions;
}
/**
* Overridable entry for child classes to contribute subsystem actions
* beyond the default supplied actions.
* <p>
* By default, returns null.
* @return Vector of IAction objects.
* @see #getSubSystemActions(ISubSystemConfiguration, ISubSystem, Shell)
*/
protected Vector getAdditionalSubSystemActions(ISubSystemConfiguration factory, ISubSystem selectedSubSystem, Shell shell)
{
return null;
}
/**
* Supply the image to be used for filter pool managers, within actions.
@ -778,19 +746,14 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* <p>
* Most actions are handled in this base, except if you have your own action for
* creating a new filter. In this case, <b>override getNewFilterAction()</b>
* To add additional actions, override {@link #getAdditionalFilterPoolActions(ISubSystemConfiguration, ISystemFilterPool, Shell)}.
*
* @param selectedPool the currently selected pool
* @param shell parent shell of viewer where the popup menu is being constructed
*/
public IAction[] getFilterPoolActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
public IAction[] getFilterPoolActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilterPool selectedPool)
{
Vector childActions = new Vector();
Vector ourChildActions = getAdditionalFilterPoolActions(factory, selectedPool, shell);
if (ourChildActions != null)
for (int idx = 0; idx < ourChildActions.size(); idx++)
childActions.addElement(ourChildActions.elementAt(idx));
IAction[] newActions = getNewFilterPoolFilterActions(factory, selectedPool, shell);
IAction[] newActions = getNewFilterPoolFilterActions(menu, selection, shell, menuGroup, factory, selectedPool);
if (newActions != null)
{
for (int idx = 0; idx < newActions.length; idx++)
@ -826,21 +789,8 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
return allFilterPoolActions;
}
/**
* Overridable entry for child classes to contribute filter pool actions beyond the
* default supplied actions.
* <p>
* By default, this returns null.
* @param selectedPool the currently selected pool
* @param shell parent shell of viewer where the popup menu is being constructed
* @return Vector of IAction objects.
* @see #getFilterPoolActions(ISubSystemConfiguration, ISystemFilterPool, Shell)
*/
protected Vector getAdditionalFilterPoolActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
{
return null;
}
/**
/**
* Overridable method to return the actions for creating a new filter in a filter pool.
* By default returns one action created by calling {@link #getNewFilterPoolFilterAction(ISubSystemConfiguration, ISystemFilterPool, Shell)}.
* <p>
@ -851,7 +801,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* @param selectedPool the currently selected pool
* @param shell parent shell of viewer where the popup menu is being constructed
*/
protected IAction[] getNewFilterPoolFilterActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
protected IAction[] getNewFilterPoolFilterActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilterPool selectedPool)
{
IAction[] actions = new IAction[1];
actions[0] = getNewFilterPoolFilterAction(factory, selectedPool, shell);
@ -1024,49 +974,26 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* filter pool reference object within a subsystem of this factory. Note,
* these are added to the list returned by getFilterPoolActions().
* Only supported by subsystems that support filters.
* @param selectedPoolRef the currently selected pool reference
* @param selectedPoolReference the currently selected pool reference
* @param shell parent shell of viewer where the popup menu is being constructed
*/
public IAction[] getFilterPoolReferenceActions(ISubSystemConfiguration factory, ISystemFilterPoolReference selectedPoolRef, Shell shell)
public IAction[] getFilterPoolReferenceActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilterPoolReference selectedPoolReference)
{
ISystemFilterPool selectedPool = selectedPoolRef.getReferencedFilterPool();
Vector childActions = getAdditionalFilterPoolReferenceActions(factory, selectedPool, shell);
int nbrChildActions = 0;
if (childActions != null)
nbrChildActions = childActions.size();
int fpIdx = 0;
ISystemFilterPool selectedPool = selectedPoolReference.getReferencedFilterPool();
if (filterPoolReferenceActions == null)
{
int nbr = 3;
filterPoolReferenceActions = new IAction[nbr + nbrChildActions];
filterPoolReferenceActions[fpIdx++] = getRemoveFilterPoolReferenceAction(factory, selectedPool, shell);
filterPoolReferenceActions[fpIdx] = new SystemFilterMoveUpFilterPoolReferenceAction(shell);
((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0063"); //$NON-NLS-1$
filterPoolReferenceActions[fpIdx] = new SystemFilterMoveDownFilterPoolReferenceAction(shell);
((ISystemAction) filterPoolReferenceActions[fpIdx++]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0064"); //$NON-NLS-1$
filterPoolReferenceActions = new IAction[3];
filterPoolReferenceActions[0] = getRemoveFilterPoolReferenceAction(factory, selectedPool, shell);
filterPoolReferenceActions[1] = new SystemFilterMoveUpFilterPoolReferenceAction(shell);
((ISystemAction) filterPoolReferenceActions[1]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0063"); //$NON-NLS-1$
filterPoolReferenceActions[2] = new SystemFilterMoveDownFilterPoolReferenceAction(shell);
((ISystemAction) filterPoolReferenceActions[2]).setHelp(RSEUIPlugin.HELPPREFIX + "actn0064"); //$NON-NLS-1$
}
if (childActions != null)
for (int idx = 0; idx < nbrChildActions; idx++)
filterPoolReferenceActions[fpIdx++] = (IAction) childActions.elementAt(idx);
return filterPoolReferenceActions;
}
/**
* Overridable entry for child classes to contribute filter pool reference actions beyond the
* default supplied actions.
* <p>
* By default, this returns null.
* @param selectedPool the currently selected pool
* @param shell parent shell of viewer where the popup menu is being constructed
* @return Vector of IAction objects.
* @see #getFilterPoolReferenceActions(ISubSystemConfiguration, ISystemFilterPoolReference, Shell)
*/
protected Vector getAdditionalFilterPoolReferenceActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell)
{
return null;
}
/**
/**
* Overridable method to return the action for removing a filter pool reference.
* By default returns new SystemRemoveFilterPoolReferenceAction.
* @param selectedPool the currently selected pool
@ -1129,7 +1056,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* Most actions are handled in this base, except if you have your own action for
* creating a new nested filter. In this case, <b>override getNewFilterAction()</b>
*/
public IAction[] getFilterActions(ISubSystemConfiguration factory, ISystemFilter selectedFilter, Shell shell)
public IAction[] getFilterActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilter selectedFilter)
{
Vector childActions = new Vector();
Vector ourChildActions = getAdditionalFilterActions(factory, selectedFilter, shell);
@ -1211,7 +1138,7 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* <p>
* By default, this returns null.
* @return Vector of IAction objects.
* @see #getFilterActions(ISubSystemConfiguration, ISystemFilter, Shell)
* @see #getFilterActions(SystemMenuManager, IStructuredSelection, Shell, String, ISubSystemConfiguration, ISystemFilter)
*/
protected Vector getAdditionalFilterActions(ISubSystemConfiguration factory, ISystemFilter selectedFilter, Shell shell)
{
@ -1231,180 +1158,15 @@ public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAda
* <p>
* Most actions are handled in this base, except if you have your own action for
* creating a new filter. In this case, <b>override getNewFilterAction()</b>
* To add additional actions, override {@link #getAdditionalFilterReferenceActions(ISubSystemConfiguration, ISystemFilterReference, Shell)}.
*
* @param selectedFilterRef the currently selected filter reference
* @param shell parent shell of viewer where the popup menu is being constructed
*/
public IAction[] getFilterReferenceActions(ISubSystemConfiguration factory, ISystemFilterReference selectedFilterRef, Shell shell)
{
Vector childActions = getAdditionalFilterReferenceActions(factory, selectedFilterRef, shell);
int nbrChildActions = 0;
if (childActions != null)
nbrChildActions = childActions.size();
else
childActions = new Vector();
/*
if (filterReferenceActions == null)
{
int nbr = 2;
filterReferenceActions = new IAction[nbr];
}
for (int idx=0; idx<filterReferenceActions.length; idx++)
{
childActions.addElement(filterReferenceActions[idx]);
++nbrChildActions;
}
*/
IAction[] allFilterRefActions = new IAction[nbrChildActions];
for (int idx = 0; idx < nbrChildActions; idx++)
allFilterRefActions[idx] = (IAction) childActions.elementAt(idx);
return allFilterRefActions;
}
/**
* Overridable entry for child classes to contribute filter reference actions beyond the
* default supplied actions.
* <p>
* By default, this returns null.
* @param selectedFilterRef the currently selected filter reference
* @param shell parent shell of viewer where the popup menu is being constructed
* @return Vector of IAction objects.
*/
protected Vector getAdditionalFilterReferenceActions(ISubSystemConfiguration factory, ISystemFilterReference selectedFilterRef, Shell shell)
public IAction[] getFilterReferenceActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilterReference selectedFilterRef)
{
return null;
}
// ---------------------------------
// FILTER STRING METHODS
// ---------------------------------
/*
* Returns a list of actions for the popup menu when user right clicks on a
* filter string object (and has set the preferences to see them).
* Only supported and used by subsystems that support filters.
* <p>
* YOU DO NOT NEED TO OVERRIDE THIS METHOD.
* <p>
* Most actions are handled in this base, only override if you have something unique.
*
public IAction[] getFilterStringActions(SystemFilterString selectedFilterString, Shell shell)
{
Vector childActions = new Vector();
Vector ourChildActions = getAdditionalFilterStringActions(selectedFilterString, shell);
if (ourChildActions != null)
for (int idx=0; idx<ourChildActions.size(); idx++)
childActions.addElement(ourChildActions.elementAt(idx));
if (filterStringActions == null)
{
filterStringActions = new IAction[4];
filterStringActions[0] = new SystemFilterMoveUpFilterStringAction(shell);
((ISystemAction)filterStringActions[0]).setHelp(RSEUIPlugin.HELPPREFIX+"actn0093");
filterStringActions[1] = new SystemFilterMoveDownFilterStringAction(shell);
((ISystemAction)filterStringActions[1]).setHelp(RSEUIPlugin.HELPPREFIX+"actn0094");
SystemFilterCopyFilterStringAction copyAction = new SystemFilterCopyFilterStringAction(shell);
copyAction.setPromptString(SystemResources.RESID_COPY_TARGET_FILTER_PROMPT));
copyAction.setHelp(RSEUIPlugin.HELPPREFIX+"actn0091");
copyAction.setDialogHelp(RSEUIPlugin.HELPPREFIX+"dcfs0000");
filterStringActions[2] = copyAction;
SystemFilterMoveFilterStringAction moveAction = new SystemFilterMoveFilterStringAction(shell);
moveAction.setPromptString(SystemResources.RESID_MOVE_TARGET_FILTER_PROMPT));
moveAction.setHelp(RSEUIPlugin.HELPPREFIX+"actn0093");
moveAction.setDialogHelp(RSEUIPlugin.HELPPREFIX+"dmfs0000");
filterStringActions[3] = moveAction;
}
IAction chgAction = getChangeFilterStringAction(selectedFilterString, shell);
if (chgAction != null)
childActions.addElement(chgAction);
for (int idx=0; idx<filterStringActions.length; idx++)
{
childActions.addElement(filterStringActions[idx]);
}
IAction[] allFilterStringActions = new IAction[childActions.size()];
for (int idx=0; idx<childActions.size(); idx++)
allFilterStringActions[idx] = (IAction)childActions.elementAt(idx);
return allFilterStringActions;
}*/
/*
* Overridable entry for child classes to contribute filter string actions beyond the
* default supplied actions.
* <p>
* By default, this returns null.
* @param selectedFilterString the currently selected filter string
* @param shell parent shell of viewer where the popup menu is being constructed
* @return Vector of IAction objects.
*
protected Vector getAdditionalFilterStringActions(SystemFilterString selectedFilterString, Shell shell)
{
return null;
}*/
/*
* Overridable entry for child classes to contribute their own change filter string action.
* <p>
* By default, this returns the default change filter string action.
* @param selectedFilterString the currently selected filter string
* @param shell parent shell of viewer where the popup menu is being constructed
* @return change action.
*
protected IAction getChangeFilterStringAction(SystemFilterString selectedFilterString, Shell shell)
{
//IAction chgAction = new SystemFilterDefaultUpdateFilterStringAction(shell);
//return chgAction;
return null;
}*/
/*
* Returns a list of actions for the popup menu when user right clicks on a
* filter string reference object (and has set the preferences to see them).
* <p>
* Only supported and used by subsystems that support filters.
* <p>
* Most actions are handled in this base, only override if you have something unique.
*
public IAction[] getFilterStringReferenceActions(SystemFilterStringReference selectedFilterStringRef, Shell shell)
{
Vector childActions = new Vector();
Vector ourChildActions = getAdditionalFilterStringReferenceActions(selectedFilterStringRef, shell);
if (ourChildActions != null)
for (int idx=0; idx<ourChildActions.size(); idx++)
childActions.addElement(ourChildActions.elementAt(idx));
if (filterStringReferenceActions == null)
{
}
if (filterStringReferenceActions != null)
{
for (int idx=0; idx<filterStringReferenceActions.length; idx++)
{
childActions.addElement(filterStringReferenceActions[idx]);
}
}
IAction[] allFilterStringRefActions = new IAction[childActions.size()];
for (int idx=0; idx<childActions.size(); idx++)
allFilterStringRefActions[idx] = (IAction)childActions.elementAt(idx);
return allFilterStringRefActions;
}*/
/*
* Overridable entry for child classes to contribute filter string refernce actions beyond the
* default supplied actions.
* <p>
* By default, this returns null.
* @param selectedFilterStringRef the currently selected filter string reference
* @param shell parent shell of viewer where the popup menu is being constructed
* @return Vector of IAction objects.
*
protected Vector getAdditionalFilterStringReferenceActions(SystemFilterStringReference selectedFilterStringRef, Shell shell)
{
return null;
}*/
// -------------------------
// SERVER LAUNCH SUPPORT ...
// -------------------------

27
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/ServiceSubSystemConfiguration.java
View file

@ -18,6 +18,7 @@ package org.eclipse.rse.core.servicesubsystem;
import java.util.Vector;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.filters.ISystemFilter;
import org.eclipse.rse.core.filters.ISystemFilterPool;
import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage;
@ -27,6 +28,7 @@ import org.eclipse.rse.core.subsystems.IServiceSubSystemConfiguration;
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
import org.eclipse.rse.ui.SystemMenuManager;
import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.swt.widgets.Shell;
@ -44,7 +46,7 @@ import org.eclipse.swt.widgets.Shell;
* <p>
* For additional customization of the subsystem, you may supply a {@link SubSystemConfigurationAdapter},
* which allows you to
* <li>supply your own subsystem popup menu actions via {@link SubSystemConfigurationAdapter#getAdditionalSubSystemActions(ISubSystemConfiguration, ISubSystem, Shell)},
* <li>supply your own subsystem popup menu actions via {@link SubSystemConfigurationAdapter#getSubSystemActions(SystemMenuManager, IStructuredSelection, Shell, String, ISubSystemConfiguration, ISubSystem)}
* <li>supply your own New->Filter popup menu action via {@link SubSystemConfigurationAdapter#getNewFilterPoolFilterAction(ISubSystemConfiguration, ISystemFilterPool, Shell)}, and
* <li>supply your own Change Filter popup menu action via {@link SubSystemConfigurationAdapter#getChangeFilterAction(ISubSystemConfiguration, ISystemFilter,Shell)}.
* </ul>
@ -185,27 +187,6 @@ public abstract class ServiceSubSystemConfiguration extends SubSystemConfigurati
// --------------------------------
// METHODS FOR SUPPLYING ACTIONS...
// --------------------------------
/**
* <i>Overridable method for getting Remote System view popup menu actions.</i><br>
* Called by {@link org.eclipse.rse.internal.ui.view.SystemView SystemView} when constructing
* the popup menu for a selected subsystem.
* <p>
* For contributing popup menu actions to <b>subsystem objects</b>, beyond the
* default actions already supplied by our parent class. This method is only called with
* subsystems created by this subsystem factory.
* <p>
* Returns null by default. Override to show your own popup menu actions for your own subsystems.
*
* @return Vector of IAction objects, which usually are subclasses of {@link org.eclipse.rse.ui.actions.SystemBaseAction SystemBaseAction} or
* {@link org.eclipse.rse.ui.actions.SystemBaseDialogAction SystemBaseDialogAction} or
* {@link org.eclipse.rse.ui.actions.SystemBaseWizardAction SystemBaseWizardAction} or
* {@link org.eclipse.rse.ui.actions.SystemBaseSubMenuAction SystemBaseSubMenuAction}.
*/
protected Vector getAdditionalSubSystemActions(ISubSystem selectedSubSystem, Shell shell)
{
return null;
}
/**
* <i>Optionally overridable method affecting the visual display of objects within subsystems created by this factory.</i><br>
@ -224,7 +205,7 @@ public abstract class ServiceSubSystemConfiguration extends SubSystemConfigurati
* This method is only called for filters within subsystems created by this subsystem factory.<br>
* By default, this returns null. Override if appropriate.
*
* @see SubSystemConfigurationAdapter#getFilterActions(ISubSystemConfiguration, ISystemFilter, Shell)
* @see SubSystemConfigurationAdapter#getFilterActions(SystemMenuManager, IStructuredSelection, Shell, String, ISubSystemConfiguration, ISystemFilter)
*
* @return Vector of IAction objects, which usually are subclasses of {@link org.eclipse.rse.ui.actions.SystemBaseAction SystemBaseAction} or
* {@link org.eclipse.rse.ui.actions.SystemBaseDialogAction SystemBaseDialogAction} or

12
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubSystemConfigurationAdapter.java
View file

@ -106,7 +106,7 @@ public interface ISubSystemConfigurationAdapter
* filter pool object within a subsystem of this factory.
* Only supported by subsystems that support filters.
*/
public IAction[] getFilterPoolActions(ISubSystemConfiguration factory, ISystemFilterPool selectedPool, Shell shell);
public IAction[] getFilterPoolActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilterPool selectedPool);
// ---------------------------------
// FILTER POOL REFERENCE METHODS...
@ -118,7 +118,7 @@ public interface ISubSystemConfigurationAdapter
* <p>
* Only supported by subsystems that support filters.
*/
public IAction[] getFilterPoolReferenceActions(ISubSystemConfiguration factory, ISystemFilterPoolReference selectedPoolReference, Shell shell);
public IAction[] getFilterPoolReferenceActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilterPoolReference selectedPoolReference);
// ---------------------------------
@ -133,7 +133,7 @@ public interface ISubSystemConfigurationAdapter
* Most actions are handled in this base, except if you have your own action for
* creating a new nested filter. In this case, <b>override getNewFilterAction()</b>
*/
public IAction[] getFilterActions(ISubSystemConfiguration factory, ISystemFilter selectedFilter, Shell shell);
public IAction[] getFilterActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilter selectedFilter);
/**
* In addition to a change filter action, we now also support the same functionality
@ -169,17 +169,17 @@ public interface ISubSystemConfigurationAdapter
* <p>
* Most actions are handled in this base, except if you have your own action for
* creating a new filter. In this case, <b>override getNewFilterAction()</b>
* To add additional actions, override {@link #getFilterReferenceActions(ISubSystemConfiguration, ISystemFilterReference, Shell)}.
* To add additional actions, override {@link #getFilterReferenceActions(SystemMenuManager, IStructuredSelection, Shell, String, ISubSystemConfiguration, ISystemFilterReference)}.
*
* @param selectedFilterRef the currently selected filter reference
* @param shell parent shell of viewer where the popup menu is being constructed
*/
public IAction[] getFilterReferenceActions(ISubSystemConfiguration factory, ISystemFilterReference selectedFilterRef, Shell shell);
public IAction[] getFilterReferenceActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISystemFilterReference selectedFilterRef);
/**
* Returns a list of actions for the popup menu when user right clicks on a subsystem object from this factory.
*/
public IAction[] getSubSystemActions(ISubSystemConfiguration factory, ISubSystem selectedSubSystem, Shell shell);
public IAction[] getSubSystemActions(SystemMenuManager menu, IStructuredSelection selection, Shell shell, String menuGroup, ISubSystemConfiguration factory, ISubSystem selectedSubSystem);