mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

[cleanup] Rename Subsystem -> SubSystem in all method and class names

Browse source
This commit is contained in:
Martin Oberhuber 2006-08-10 12:52:38 +00:00
parent 8adfb164bb
commit d94d5ac9f3
47 changed files with 120 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/examples/org.eclipse.rse.examples.daytime/plugin.xml
View file

@ -45,7 +45,7 @@ Martin Oberhuber (Wind River) - initial API and implementation
iconlive="icons/full/obj16/daytimelive_obj.gif" iconlive="icons/full/obj16/daytimelive_obj.gif"
icon="icons/full/obj16/daytime_obj.gif" icon="icons/full/obj16/daytime_obj.gif"
category="daytime" category="daytime"
class="org.eclipse.rse.examples.daytime.subsystems.DaytimeSubsystemConfiguration" class="org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration"
vendor="Wind River Systems" vendor="Wind River Systems"
id="daytime.tcp"> id="daytime.tcp">
</configuration> </configuration>

6
rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java → rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystemConfiguration.java
View file

@ -29,17 +29,17 @@ import org.eclipse.rse.model.IHost;
import org.eclipse.rse.services.IService; import org.eclipse.rse.services.IService;
/** /**
* The DaytimeSubsystemConfiguration implements the main API for registering * The DaytimeSubSystemConfiguration implements the main API for registering
* a new subsystem type. * a new subsystem type.
* It gives the RSE framework basic configuration data about enabled * It gives the RSE framework basic configuration data about enabled
* or disabled options, and is responsible for instanciating the actual * or disabled options, and is responsible for instanciating the actual
* Daytime subsystem as well as the UI-less configuration layer (service). * Daytime subsystem as well as the UI-less configuration layer (service).
*/ */
public class DaytimeSubsystemConfiguration extends ServiceSubSystemConfiguration { public class DaytimeSubSystemConfiguration extends ServiceSubSystemConfiguration {
private Map fServices = new HashMap(); private Map fServices = new HashMap();
public DaytimeSubsystemConfiguration() { public DaytimeSubSystemConfiguration() {
super(); super();
} }

6
rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java
View file

@ -21,17 +21,17 @@ import java.util.Vector;
import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizard;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.ui.view.SubsystemConfigurationAdapter; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage;
public class DaytimeSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter public class DaytimeSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter
{ {
Vector _additionalActions; Vector _additionalActions;
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.eclipse.rse.ui.view.SubsystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard) * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getNewConnectionWizardPages(org.eclipse.rse.core.subsystems.ISubSystemConfiguration, org.eclipse.jface.wizard.IWizard)
*/ */
public ISystemNewConnectionWizardPage[] getNewConnectionWizardPages(ISubSystemConfiguration factory, IWizard wizard) public ISystemNewConnectionWizardPage[] getNewConnectionWizardPages(ISubSystemConfiguration factory, IWizard wizard)
{ {

12
rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java
View file

@ -2,12 +2,12 @@ package org.eclipse.rse.examples.daytime.ui;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.examples.daytime.subsystems.DaytimeSubsystemConfiguration; import org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration;
public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFactory { public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFactory {
private ISubsystemConfigurationAdapter ssFactoryAdapter = new DaytimeSubSystemConfigurationAdapter(); private ISubSystemConfigurationAdapter ssFactoryAdapter = new DaytimeSubSystemConfigurationAdapter();
/* /*
* (non-Javadoc) * (non-Javadoc)
@ -15,7 +15,7 @@ public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFact
*/ */
public Class[] getAdapterList() public Class[] getAdapterList()
{ {
return new Class[] {ISubsystemConfigurationAdapter.class}; return new Class[] {ISubSystemConfigurationAdapter.class};
} }
/** /**
@ -27,7 +27,7 @@ public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFact
*/ */
public void registerWithManager(IAdapterManager manager) public void registerWithManager(IAdapterManager manager)
{ {
manager.registerAdapters(this, DaytimeSubsystemConfiguration.class); manager.registerAdapters(this, DaytimeSubSystemConfiguration.class);
} }
/* /*
@ -37,7 +37,7 @@ public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFact
public Object getAdapter(Object adaptableObject, Class adapterType) public Object getAdapter(Object adaptableObject, Class adapterType)
{ {
Object adapter = null; Object adapter = null;
if (adaptableObject instanceof DaytimeSubsystemConfiguration) if (adaptableObject instanceof DaytimeSubSystemConfiguration)
adapter = ssFactoryAdapter; adapter = ssFactoryAdapter;
return adapter; return adapter;

6
rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java
View file

@ -23,7 +23,7 @@ import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction; import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction;
import org.eclipse.rse.ui.filters.actions.SystemNewFilterAction; import org.eclipse.rse.ui.filters.actions.SystemNewFilterAction;
import org.eclipse.rse.ui.view.SubsystemConfigurationAdapter; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
import samples.RSESamplesPlugin; import samples.RSESamplesPlugin;
@ -32,7 +32,7 @@ import samples.RSESamplesPlugin;
* Adds functionality to the basic SubSystemConfiguration. * Adds functionality to the basic SubSystemConfiguration.
*/ */
public class DeveloperSubSystemConfigurationAdapter extends public class DeveloperSubSystemConfigurationAdapter extends
SubsystemConfigurationAdapter SubSystemConfigurationAdapter
{ {
/** /**
@ -92,7 +92,7 @@ public class DeveloperSubSystemConfigurationAdapter extends
/** /**
* Override of parent method for returning the image for filters in our subsystem. * Override of parent method for returning the image for filters in our subsystem.
* @see org.eclipse.rse.ui.view.SubsystemConfigurationAdapter#getSystemFilterImage(org.eclipse.rse.filters.ISystemFilter) * @see org.eclipse.rse.ui.view.SubSystemConfigurationAdapter#getSystemFilterImage(org.eclipse.rse.filters.ISystemFilter)
*/ */
public ImageDescriptor getSystemFilterImage(ISystemFilter filter) public ImageDescriptor getSystemFilterImage(ISystemFilter filter)
{ {

6
rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java
View file

@ -18,7 +18,7 @@ package samples.subsystems;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
/** /**
* @author martin.oberhuber@windriver.com * @author martin.oberhuber@windriver.com
@ -27,14 +27,14 @@ import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter;
public class DeveloperSubSystemConfigurationAdapterFactory implements public class DeveloperSubSystemConfigurationAdapterFactory implements
IAdapterFactory { IAdapterFactory {
private ISubsystemConfigurationAdapter ssConfigAdapter = new DeveloperSubSystemConfigurationAdapter(); private ISubSystemConfigurationAdapter ssConfigAdapter = new DeveloperSubSystemConfigurationAdapter();
/** /**
* @see IAdapterFactory#getAdapterList() * @see IAdapterFactory#getAdapterList()
*/ */
public Class[] getAdapterList() public Class[] getAdapterList()
{ {
return new Class[] {ISubsystemConfigurationAdapter.class}; return new Class[] {ISubSystemConfigurationAdapter.class};
} }
/** /**

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java
View file

@ -24,7 +24,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager; import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager;
import org.eclipse.rse.files.ui.resources.SystemUniversalTempFileListener; import org.eclipse.rse.files.ui.resources.SystemUniversalTempFileListener;
import org.eclipse.rse.files.ui.view.RemoteFileSubsystemConfigurationAdapterFactory; import org.eclipse.rse.files.ui.view.RemoteFileSubSystemConfigurationAdapterFactory;
import org.eclipse.rse.files.ui.view.SystemViewFileAdapterFactory; import org.eclipse.rse.files.ui.view.SystemViewFileAdapterFactory;
import org.eclipse.rse.files.ui.view.SystemViewSearchResultAdapterFactory; import org.eclipse.rse.files.ui.view.SystemViewSearchResultAdapterFactory;
import org.eclipse.rse.files.ui.view.SystemViewSearchResultSetAdapterFactory; import org.eclipse.rse.files.ui.view.SystemViewSearchResultSetAdapterFactory;
@ -83,7 +83,7 @@ public class Activator extends AbstractUIPlugin {
svsraf = new SystemViewSearchResultAdapterFactory(); svsraf = new SystemViewSearchResultAdapterFactory();
svsraf.registerWithManager(manager); svsraf.registerWithManager(manager);
RemoteFileSubsystemConfigurationAdapterFactory rfssfaf = new RemoteFileSubsystemConfigurationAdapterFactory(); RemoteFileSubSystemConfigurationAdapterFactory rfssfaf = new RemoteFileSubSystemConfigurationAdapterFactory();
rfssfaf.registerWithManager(manager); rfssfaf.registerWithManager(manager);
// universal temp file listener // universal temp file listener

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java
View file

@ -39,13 +39,13 @@ import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction; import org.eclipse.rse.ui.actions.SystemPasteFromClipboardAction;
import org.eclipse.rse.ui.view.SubsystemConfigurationAdapter; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage;
import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.dnd.Clipboard;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
public class RemoteFileSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter public class RemoteFileSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter
{ {
SystemNewFileFilterAction _newFileFilterAction; SystemNewFileFilterAction _newFileFilterAction;

8
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java → rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapterFactory.java
View file

@ -18,21 +18,21 @@ package org.eclipse.rse.files.ui.view;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
public class RemoteFileSubsystemConfigurationAdapterFactory implements IAdapterFactory public class RemoteFileSubSystemConfigurationAdapterFactory implements IAdapterFactory
{ {
private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteFileSubSystemConfigurationAdapter(); private ISubSystemConfigurationAdapter ssFactoryAdapter = new RemoteFileSubSystemConfigurationAdapter();
/** /**
* @see IAdapterFactory#getAdapterList() * @see IAdapterFactory#getAdapterList()
*/ */
public Class[] getAdapterList() public Class[] getAdapterList()
{ {
return new Class[] {ISubsystemConfigurationAdapter.class}; return new Class[] {ISubSystemConfigurationAdapter.class};
} }
/** /**
* Called by our plugin's startup method to register our adaptable object types * Called by our plugin's startup method to register our adaptable object types

4
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/ProcessesPlugin.java
View file

@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.processes.ui.view.RemoteProcessSubsystemConfigurationAdapterFactory; import org.eclipse.rse.processes.ui.view.RemoteProcessSubSystemConfigurationAdapterFactory;
import org.eclipse.rse.processes.ui.view.SystemViewProcessAdapterFactory; import org.eclipse.rse.processes.ui.view.SystemViewProcessAdapterFactory;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
import org.eclipse.rse.services.clientserver.messages.SystemMessageFile; import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
@ -66,7 +66,7 @@ public class ProcessesPlugin extends SystemBasePlugin {
svpaf = new SystemViewProcessAdapterFactory(); svpaf = new SystemViewProcessAdapterFactory();
svpaf.registerWithManager(manager); svpaf.registerWithManager(manager);
RemoteProcessSubsystemConfigurationAdapterFactory rpssfaf = new RemoteProcessSubsystemConfigurationAdapterFactory(); RemoteProcessSubSystemConfigurationAdapterFactory rpssfaf = new RemoteProcessSubSystemConfigurationAdapterFactory();
rpssfaf.registerWithManager(manager); rpssfaf.registerWithManager(manager);
} }

4
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java
View file

@ -24,11 +24,11 @@ import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.processes.ui.actions.SystemNewProcessFilterAction; import org.eclipse.rse.processes.ui.actions.SystemNewProcessFilterAction;
import org.eclipse.rse.processes.ui.actions.SystemProcessUpdateFilterAction; import org.eclipse.rse.processes.ui.actions.SystemProcessUpdateFilterAction;
import org.eclipse.rse.ui.view.SubsystemConfigurationAdapter; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
public class RemoteProcessSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter public class RemoteProcessSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter
{ {
SystemNewProcessFilterAction _newProcessFilterAction; SystemNewProcessFilterAction _newProcessFilterAction;

8
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java → rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapterFactory.java
View file

@ -18,21 +18,21 @@ package org.eclipse.rse.processes.ui.view;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration;
public class RemoteProcessSubsystemConfigurationAdapterFactory implements IAdapterFactory public class RemoteProcessSubSystemConfigurationAdapterFactory implements IAdapterFactory
{ {
private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteProcessSubSystemConfigurationAdapter(); private ISubSystemConfigurationAdapter ssFactoryAdapter = new RemoteProcessSubSystemConfigurationAdapter();
/** /**
* @see IAdapterFactory#getAdapterList() * @see IAdapterFactory#getAdapterList()
*/ */
public Class[] getAdapterList() public Class[] getAdapterList()
{ {
return new Class[] {ISubsystemConfigurationAdapter.class}; return new Class[] {ISubSystemConfigurationAdapter.class};
} }
/** /**
* Called by our plugin's startup method to register our adaptable object types * Called by our plugin's startup method to register our adaptable object types

4
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java
View file

@ -19,7 +19,7 @@ package org.eclipse.rse.shells.ui;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.shells.ui.view.ShellServiceSubsystemConfigurationAdapterFactory; import org.eclipse.rse.shells.ui.view.ShellServiceSubSystemConfigurationAdapterFactory;
import org.eclipse.rse.shells.ui.view.SystemViewOutputAdapterFactory; import org.eclipse.rse.shells.ui.view.SystemViewOutputAdapterFactory;
import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
@ -53,7 +53,7 @@ public class Activator extends AbstractUIPlugin {
_svoaf = new SystemViewOutputAdapterFactory(); _svoaf = new SystemViewOutputAdapterFactory();
_svoaf.registerWithManager(manager); _svoaf.registerWithManager(manager);
ShellServiceSubsystemConfigurationAdapterFactory fac = new ShellServiceSubsystemConfigurationAdapterFactory(); ShellServiceSubSystemConfigurationAdapterFactory fac = new ShellServiceSubSystemConfigurationAdapterFactory();
fac.registerWithManager(manager); fac.registerWithManager(manager);
} }

4
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java
View file

@ -31,11 +31,11 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem; import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.view.SubsystemConfigurationAdapter; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapter;
import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Shell;
public class ShellServiceSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter public class ShellServiceSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter
{ {
protected IAction _exportShellHistoryAction; protected IAction _exportShellHistoryAction;
protected IAction _exportShellOutputAction; protected IAction _exportShellOutputAction;

8
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java → rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapterFactory.java
View file

@ -18,22 +18,22 @@ package org.eclipse.rse.shells.ui.view;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShellServiceSubSystemConfiguration;
import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystemConfiguration; import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystemConfiguration;
public class ShellServiceSubsystemConfigurationAdapterFactory implements IAdapterFactory public class ShellServiceSubSystemConfigurationAdapterFactory implements IAdapterFactory
{ {
private ISubsystemConfigurationAdapter ssFactoryAdapter = new ShellServiceSubSystemConfigurationAdapter(); private ISubSystemConfigurationAdapter ssFactoryAdapter = new ShellServiceSubSystemConfigurationAdapter();
/** /**
* @see IAdapterFactory#getAdapterList() * @see IAdapterFactory#getAdapterList()
*/ */
public Class[] getAdapterList() public Class[] getAdapterList()
{ {
return new Class[] {ISubsystemConfigurationAdapter.class}; return new Class[] {ISubSystemConfigurationAdapter.class};
} }
/** /**
* Called by our plugin's startup method to register our adaptable object types * Called by our plugin's startup method to register our adaptable object types

6
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java
View file

@ -35,7 +35,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.IRemoteLineReference; import org.eclipse.rse.core.subsystems.IRemoteLineReference;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.files.ui.actions.SystemRemoteFileLineOpenWithMenu; import org.eclipse.rse.files.ui.actions.SystemRemoteFileLineOpenWithMenu;
import org.eclipse.rse.files.ui.resources.RemoteSourceLookupDirector; import org.eclipse.rse.files.ui.resources.RemoteSourceLookupDirector;
import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile;
@ -215,7 +215,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
_shellActions.add(new Separator()); _shellActions.add(new Separator());
ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class);
_exportShellOutputAction = factoryAdapter.getCommandShellOutputExportAction(shell); _exportShellOutputAction = factoryAdapter.getCommandShellOutputExportAction(shell);
_shellActions.add(_exportShellOutputAction); _shellActions.add(_exportShellOutputAction);
@ -821,7 +821,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu
{ {
IRemoteCommandShell command = (IRemoteCommandShell) element; IRemoteCommandShell command = (IRemoteCommandShell) element;
IRemoteCmdSubSystemConfiguration factory = command.getCommandSubSystem().getParentRemoteCmdSubSystemConfiguration(); IRemoteCmdSubSystemConfiguration factory = command.getCommandSubSystem().getParentRemoteCmdSubSystemConfiguration();
ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class);
ImageDescriptor imageDescriptor = null; ImageDescriptor imageDescriptor = null;
if (command.isActive()) if (command.isActive())
{ {

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java
View file

@ -58,7 +58,7 @@ import org.eclipse.rse.ui.internal.RSESystemTypeAdapterFactory;
import org.eclipse.rse.ui.internal.RSEUIRegistry; import org.eclipse.rse.ui.internal.RSEUIRegistry;
import org.eclipse.rse.ui.propertypages.RemoteSystemsPreferencePage; import org.eclipse.rse.ui.propertypages.RemoteSystemsPreferencePage;
import org.eclipse.rse.ui.propertypages.SystemCommunicationsPreferencePage; import org.eclipse.rse.ui.propertypages.SystemCommunicationsPreferencePage;
import org.eclipse.rse.ui.view.SubsystemConfigurationAdapterFactory; import org.eclipse.rse.ui.view.SubSystemConfigurationAdapterFactory;
import org.eclipse.rse.ui.view.SystemViewAdapterFactory; import org.eclipse.rse.ui.view.SystemViewAdapterFactory;
import org.eclipse.rse.ui.view.team.SystemTeamViewResourceAdapterFactory; import org.eclipse.rse.ui.view.team.SystemTeamViewResourceAdapterFactory;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
@ -488,7 +488,7 @@ public class RSEUIPlugin extends SystemBasePlugin
// DKM // DKM
// for subsystem factories // for subsystem factories
SubsystemConfigurationAdapterFactory ssfaf = new SubsystemConfigurationAdapterFactory(); SubSystemConfigurationAdapterFactory ssfaf = new SubSystemConfigurationAdapterFactory();
ssfaf.registerWithManager(manager); ssfaf.registerWithManager(manager);
RSESystemTypeAdapterFactory rseSysTypeFactory = new RSESystemTypeAdapterFactory(); RSESystemTypeAdapterFactory rseSysTypeFactory = new RSESystemTypeAdapterFactory();

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterUIHelpers.java
View file

@ -18,7 +18,7 @@ package org.eclipse.rse.ui.filters;
import java.util.Vector; import java.util.Vector;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -121,7 +121,7 @@ public class SystemFilterUIHelpers
poolMgrProvider = poolMgr.getProvider(); poolMgrProvider = poolMgr.getProvider();
if (poolMgrProvider != null) if (poolMgrProvider != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
poolMgrImage = adapter.getSystemFilterPoolManagerImage(); poolMgrImage = adapter.getSystemFilterPoolManagerImage();
} }
if (poolMgrImage == null) if (poolMgrImage == null)
@ -140,7 +140,7 @@ public class SystemFilterUIHelpers
poolMgrProvider = pool.getProvider(); poolMgrProvider = pool.getProvider();
if (poolMgrProvider != null) if (poolMgrProvider != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
poolImage = adapter.getSystemFilterPoolImage(pool); poolImage = adapter.getSystemFilterPoolImage(pool);
} }
if (poolImage == null) if (poolImage == null)
@ -158,7 +158,7 @@ public class SystemFilterUIHelpers
poolMgrProvider = filter.getProvider(); poolMgrProvider = filter.getProvider();
if (poolMgrProvider != null) if (poolMgrProvider != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
filterImage = adapter.getSystemFilterImage(filter); filterImage = adapter.getSystemFilterImage(filter);
} }
if (filterImage == null) if (filterImage == null)

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java
View file

@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -312,7 +312,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction
ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
if ((mgrs == null) || (mgrs.length == 0)) if ((mgrs == null) || (mgrs.length == 0))

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterPoolAction.java
View file

@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
@ -299,7 +299,7 @@ public class SystemFilterCopyFilterPoolAction extends SystemBaseCopyAction
veryRootElement.setDeletable(false); veryRootElement.setDeletable(false);
ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
if ((mgrs == null) || (mgrs.length == 0)) if ((mgrs == null) || (mgrs.length == 0))

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterStringAction.java
View file

@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -388,7 +388,7 @@ public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction
ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
if ((mgrs == null) || (mgrs.length == 0)) if ((mgrs == null) || (mgrs.length == 0))

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterAction.java
View file

@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -315,7 +315,7 @@ public class SystemFilterMoveFilterAction extends SystemBaseCopyAction
ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
if ((mgrs == null) || (mgrs.length == 0)) if ((mgrs == null) || (mgrs.length == 0))

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterPoolAction.java
View file

@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
@ -342,7 +342,7 @@ public class SystemFilterMoveFilterPoolAction extends SystemBaseCopyAction
ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
if ((mgrs == null) || (mgrs.length == 0)) if ((mgrs == null) || (mgrs.length == 0))

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterStringAction.java
View file

@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -386,7 +386,7 @@ public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction
ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class);
ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage();
if ((mgrs == null) || (mgrs.length == 0)) if ((mgrs == null) || (mgrs.length == 0))

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java
View file

@ -21,7 +21,7 @@ import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystem; import org.eclipse.rse.core.subsystems.SubSystem;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.ISystemVerifyListener; import org.eclipse.rse.ui.ISystemVerifyListener;
import org.eclipse.rse.ui.widgets.IServerLauncherForm; import org.eclipse.rse.ui.widgets.IServerLauncherForm;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
@ -73,7 +73,7 @@ public class ServerLauncherPropertyPage extends SystemBasePropertyPage implement
factory =_factory; factory =_factory;
} }
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class);
_form = adapter.getServerLauncherForm(factory, getShell(), getMessageLine()); _form = adapter.getServerLauncherForm(factory, getShell(), getMessageLine());
// Create property page UI // Create property page UI

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java
View file

@ -18,7 +18,7 @@ package org.eclipse.rse.ui.propertypages;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider; import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider; import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider;
@ -220,7 +220,7 @@ public class SystemChangeFilterPropertyPage extends SystemBasePropertyPage
changeFilterPane.setSystemFilterPoolManagerProvider(selectedFilter.getProvider()); changeFilterPane.setSystemFilterPoolManagerProvider(selectedFilter.getProvider());
ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemConfiguration(selectedFilter); ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemConfiguration(selectedFilter);
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssf.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class);
adapter.customizeChangeFilterPropertyPage(ssf, this, selectedFilter, shell); adapter.customizeChangeFilterPropertyPage(ssf, this, selectedFilter, shell);
changeFilterPane.setInputObject(getElement()); changeFilterPane.setInputObject(getElement());

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java
View file

@ -20,7 +20,7 @@ import java.util.Vector;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -230,7 +230,7 @@ public class SystemFilterStringPropertyPage extends SystemBasePropertyPage imple
// edit pane // edit pane
ISubSystemConfiguration factory = (ISubSystemConfiguration)filter.getProvider(); ISubSystemConfiguration factory = (ISubSystemConfiguration)filter.getProvider();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class);
adapter.customizeFilterStringPropertyPage(factory, this, filterstring, getShell()); adapter.customizeFilterStringPropertyPage(factory, this, filterstring, getShell());
if (editPane == null) if (editPane == null)
{ {

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java
View file

@ -17,7 +17,7 @@
package org.eclipse.rse.ui.propertypages; package org.eclipse.rse.ui.propertypages;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.ISystemMessages;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.SystemWidgetHelpers;
@ -53,7 +53,7 @@ public class SystemSubSystemPropertyPageCore extends SystemBasePropertyPage
if (element instanceof ISubSystem) if (element instanceof ISubSystem)
{ {
ISubSystemConfiguration factory = ((ISubSystem)element).getSubSystemConfiguration(); ISubSystemConfiguration factory = ((ISubSystem)element).getSubSystemConfiguration();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class);
form = adapter.getSubSystemPropertyPageCoreFrom(factory, this, this); form = adapter.getSubSystemPropertyPageCoreFrom(factory, this, this);
} }
else else

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

@ -35,7 +35,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.core.subsystems.AbstractResource;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemMessageObject; import org.eclipse.rse.model.ISystemMessageObject;
import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.model.ISystemPromptableObject;
@ -307,7 +307,7 @@ public abstract class AbstractSystemViewAdapter
if (ss != null) if (ss != null)
{ {
ISubSystemConfiguration ssf = ss.getSubSystemConfiguration(); ISubSystemConfiguration ssf = ss.getSubSystemConfiguration();
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssf.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class);
adapter.addCommonRemoteActions(ssf, menu, selection, shell, menuGroup, ss); adapter.addCommonRemoteActions(ssf, menu, selection, shell, menuGroup, ss);
} }
} }

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java
View file

@ -34,7 +34,7 @@ import org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -90,7 +90,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.PropertyPage; import org.eclipse.ui.dialogs.PropertyPage;
public class SubsystemConfigurationAdapter implements ISubsystemConfigurationAdapter, ISystemNewFilterActionConfigurator public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAdapter, ISystemNewFilterActionConfigurator
{ {
protected Hashtable imageTable = null; protected Hashtable imageTable = null;
@ -99,7 +99,7 @@ public class SubsystemConfigurationAdapter implements ISubsystemConfigurationAda
private IAction[] filterPoolActions = null; private IAction[] filterPoolActions = null;
private IAction[] filterPoolReferenceActions = null; private IAction[] filterPoolReferenceActions = null;
private IAction[] filterActions = null; private IAction[] filterActions = null;
public SubsystemConfigurationAdapter() public SubSystemConfigurationAdapter()
{ {
} }

8
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapterFactory.java
View file

@ -19,20 +19,20 @@ package org.eclipse.rse.ui.view;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
public class SubsystemConfigurationAdapterFactory implements IAdapterFactory public class SubSystemConfigurationAdapterFactory implements IAdapterFactory
{ {
private ISubsystemConfigurationAdapter ssFactoryAdapter = new SubsystemConfigurationAdapter(); private ISubSystemConfigurationAdapter ssFactoryAdapter = new SubSystemConfigurationAdapter();
/** /**
* @see IAdapterFactory#getAdapterList() * @see IAdapterFactory#getAdapterList()
*/ */
public Class[] getAdapterList() public Class[] getAdapterList()
{ {
return new Class[] {ISubsystemConfigurationAdapter.class}; return new Class[] {ISubSystemConfigurationAdapter.class};
} }
/** /**
* Called by our plugin's startup method to register our adaptable object types * Called by our plugin's startup method to register our adaptable object types

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

@ -20,7 +20,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolReference; import org.eclipse.rse.filters.ISystemFilterPoolReference;
@ -134,7 +134,7 @@ public class SystemViewAPIProviderForFilters
{ {
children = new SystemMessageObject[1]; children = new SystemMessageObject[1];
try { try {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssf.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class);
ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell());
if (newFilter == null) if (newFilter == null)
{ {

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

@ -285,7 +285,7 @@ public class SystemViewAdapterFactory implements IAdapterFactory
* This method returns the RSE adapter for subsystems * This method returns the RSE adapter for subsystems
* @return SystemViewSubSystemAdapter * @return SystemViewSubSystemAdapter
*/ */
public SystemViewSubSystemAdapter getSubsystemAdapter() public SystemViewSubSystemAdapter getSubSystemAdapter()
{ {
return subsystemAdapter; return subsystemAdapter;
} }

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

@ -26,7 +26,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -84,7 +84,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement
return; return;
ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(filter); ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(filter);
ssFactory.setConnection(null); ssFactory.setConnection(null);
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell); IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell);
if (actions != null) if (actions != null)
{ {
@ -112,7 +112,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement
ISystemFilter filter = getFilter(element); ISystemFilter filter = getFilter(element);
if (filter.getProvider() != null) if (filter.getProvider() != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)filter.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)filter.getProvider().getAdapter(ISubSystemConfigurationAdapter.class);
filterImage = adapter.getSystemFilterImage(filter); filterImage = adapter.getSystemFilterImage(filter);
} }
if (filterImage == null) if (filterImage == null)

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

@ -23,7 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.ui.ISystemIconConstants; import org.eclipse.rse.ui.ISystemIconConstants;
@ -69,7 +69,7 @@ public class SystemViewFilterPoolAdapter extends AbstractSystemViewAdapter imple
// return; // does not make sense adding unique actions per multi-selection // return; // does not make sense adding unique actions per multi-selection
ISystemFilterPool pool = ((ISystemFilterPool)selection.getFirstElement()); ISystemFilterPool pool = ((ISystemFilterPool)selection.getFirstElement());
ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(pool); ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(pool);
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell); IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell);
if (actions != null) if (actions != null)
{ {
@ -93,7 +93,7 @@ public class SystemViewFilterPoolAdapter extends AbstractSystemViewAdapter imple
if (pool.getProvider() != null) if (pool.getProvider() != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)pool.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)pool.getProvider().getAdapter(ISubSystemConfigurationAdapter.class);
poolImage = adapter.getSystemFilterPoolImage(pool); poolImage = adapter.getSystemFilterPoolImage(pool);
} }
if (poolImage == null) if (poolImage == null)

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

@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
import org.eclipse.rse.filters.ISystemFilterPoolReference; import org.eclipse.rse.filters.ISystemFilterPoolReference;
@ -72,7 +72,7 @@ public class SystemViewFilterPoolReferenceAdapter
Object element = selection.getFirstElement(); Object element = selection.getFirstElement();
ISystemFilterPool pool = getFilterPool(element); ISystemFilterPool pool = getFilterPool(element);
ISubSystemConfiguration ssFactory = getSubSystemConfiguration(pool); ISubSystemConfiguration ssFactory = getSubSystemConfiguration(pool);
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell); IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell);
if (actions != null) if (actions != null)
@ -120,7 +120,7 @@ public class SystemViewFilterPoolReferenceAdapter
ISystemFilterPool pool = getFilterPool(element); ISystemFilterPool pool = getFilterPool(element);
if (pool.getProvider() != null) if (pool.getProvider() != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)pool.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)pool.getProvider().getAdapter(ISubSystemConfigurationAdapter.class);
poolImage = adapter.getSystemFilterPoolImage(pool); poolImage = adapter.getSystemFilterPoolImage(pool);
} }
if (poolImage == null) if (poolImage == null)

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

@ -30,7 +30,7 @@ import org.eclipse.rse.core.SystemPreferencesManager;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.SubSystemHelpers; import org.eclipse.rse.core.subsystems.SubSystemHelpers;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterContainerReference; import org.eclipse.rse.filters.ISystemFilterContainerReference;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
@ -91,7 +91,7 @@ public class SystemViewFilterReferenceAdapter
IHost currentConnection = currentSubSystem.getHost(); IHost currentConnection = currentSubSystem.getHost();
ssFactory.setConnection(currentConnection); ssFactory.setConnection(currentConnection);
ssFactory.setCurrentSelection(selection.toArray()); ssFactory.setCurrentSelection(selection.toArray());
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell); IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell);
if (actions != null) if (actions != null)
@ -140,7 +140,7 @@ public class SystemViewFilterReferenceAdapter
if (filter.getProvider() != null) // getProvider() returns the subsystem factory if (filter.getProvider() != null) // getProvider() returns the subsystem factory
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)filter.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)filter.getProvider().getAdapter(ISubSystemConfigurationAdapter.class);
filterImage = adapter.getSystemFilterImage(filter); filterImage = adapter.getSystemFilterImage(filter);
} }
if (filterImage == null) if (filterImage == null)
@ -261,7 +261,7 @@ public class SystemViewFilterReferenceAdapter
children = new SystemMessageObject[1]; children = new SystemMessageObject[1];
try try
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssf.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class);
ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell());
if (newFilter == null) if (newFilter == null)

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

@ -20,7 +20,7 @@ import java.util.Vector;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.filters.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManager;
@ -90,7 +90,7 @@ public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter imp
ISystemFilterString filterString = getFilterString(element); ISystemFilterString filterString = getFilterString(element);
if (filterString.getProvider() != null) if (filterString.getProvider() != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)filterString.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)filterString.getProvider().getAdapter(ISubSystemConfigurationAdapter.class);
filterImage = adapter.getSystemFilterStringImage(filterString); filterImage = adapter.getSystemFilterStringImage(filterString);
} }
if (filterImage == null) if (filterImage == null)

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

@ -25,7 +25,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.subsystems.IConnectorService; import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.rse.ui.SystemMenuManager; import org.eclipse.rse.ui.SystemMenuManager;
@ -80,7 +80,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
Object element = selection.getFirstElement(); Object element = selection.getFirstElement();
ISubSystem ss = (ISubSystem)element; ISubSystem ss = (ISubSystem)element;
ISubSystemConfiguration ssFactory = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemConfiguration(ss); ISubSystemConfiguration ssFactory = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemConfiguration(ss);
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class);
IAction[] actions = adapter.getSubSystemActions(ssFactory, ss,shell); IAction[] actions = adapter.getSubSystemActions(ssFactory, ss,shell);
if (actions != null) if (actions != null)

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java
View file

@ -25,7 +25,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPerspectiveHelpers; import org.eclipse.rse.core.SystemPerspectiveHelpers;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.model.DummyHost; import org.eclipse.rse.model.DummyHost;
import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemProfile; import org.eclipse.rse.model.ISystemProfile;
@ -445,7 +445,7 @@ public class RSEDefaultNewConnectionWizardDelegate extends RSENewConnectionWizar
ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, true); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, true);
for (int idx=0; idx<factories.length; idx++) for (int idx=0; idx<factories.length; idx++)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)factories[idx].getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factories[idx].getAdapter(ISubSystemConfigurationAdapter.class);
IWizardPage[] pages = adapter.getNewConnectionWizardPages(factories[idx], getWizard()); IWizardPage[] pages = adapter.getNewConnectionWizardPages(factories[idx], getWizard());
if (pages != null) if (pages != null)

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemNewConnectionWizard.java
View file

@ -25,7 +25,7 @@ import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPerspectiveHelpers; import org.eclipse.rse.core.SystemPerspectiveHelpers;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.model.DummyHost; import org.eclipse.rse.model.DummyHost;
import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.IHost;
import org.eclipse.rse.model.ISystemProfile; import org.eclipse.rse.model.ISystemProfile;
@ -428,7 +428,7 @@ public class SystemNewConnectionWizard
ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, true); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, true);
for (int idx=0; idx<factories.length; idx++) for (int idx=0; idx<factories.length; idx++)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)factories[idx].getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factories[idx].getAdapter(ISubSystemConfigurationAdapter.class);
IWizardPage[] pages = adapter.getNewConnectionWizardPages(factories[idx], this); IWizardPage[] pages = adapter.getNewConnectionWizardPages(factories[idx], this);
if (pages != null) if (pages != null)

4
rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java
View file

@ -40,7 +40,7 @@ import org.eclipse.rse.core.subsystems.IConnectorService;
import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy; import org.eclipse.rse.core.subsystems.ISubSystemConfigurationProxy;
import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager;
import org.eclipse.rse.filters.ISystemFilterReference; import org.eclipse.rse.filters.ISystemFilterReference;
@ -855,7 +855,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents
ISubSystemConfiguration factory = proxies[idx].getSubSystemConfiguration(); ISubSystemConfiguration factory = proxies[idx].getSubSystemConfiguration();
if (factory != null) if (factory != null)
{ {
ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class);
adapter.renameSubSystemProfile(factory,oldName, newName); adapter.renameSubSystemProfile(factory,oldName, newName);
} }
} }

8
rse/plugins/org.eclipse.rse.ui/persistence/org/eclipse/rse/internal/persistence/dom/RSEDOMImporter.java
View file

@ -244,7 +244,7 @@ public class RSEDOMImporter implements IRSEDOMImporter
String type = subSystemNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue(); String type = subSystemNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_TYPE).getValue();
boolean isHidden = getBooleanValue(subSystemNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_HIDDEN).getValue()); boolean isHidden = getBooleanValue(subSystemNode.getAttribute(IRSEDOMConstants.ATTRIBUTE_HIDDEN).getValue());
ISubSystem subSystem = null; ISubSystem subSystem = null;
ISubSystemConfiguration factory = getSubsystemConfiguration(type); ISubSystemConfiguration factory = getSubSystemConfiguration(type);
if (factory != null) if (factory != null)
{ {
if (factory instanceof IServiceSubSystemConfiguration) if (factory instanceof IServiceSubSystemConfiguration)
@ -395,7 +395,7 @@ public class RSEDOMImporter implements IRSEDOMImporter
// create the filter pool and set it's attributes // create the filter pool and set it's attributes
try try
{ {
ISubSystemConfiguration factory = getSubsystemConfiguration(id); ISubSystemConfiguration factory = getSubSystemConfiguration(id);
if (factory != null) if (factory != null)
{ {
ISystemFilterPoolManager mgr = factory.getFilterPoolManager(profile); ISystemFilterPoolManager mgr = factory.getFilterPoolManager(profile);
@ -467,7 +467,7 @@ public class RSEDOMImporter implements IRSEDOMImporter
ISystemFilterPoolReference filterPoolReference = null; ISystemFilterPoolReference filterPoolReference = null;
String subsystemName = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_REF_ID).getValue(); String subsystemName = node.getAttribute(IRSEDOMConstants.ATTRIBUTE_REF_ID).getValue();
String filterPoolName = node.getName(); String filterPoolName = node.getName();
ISubSystemConfiguration configuration = getSubsystemConfiguration(subsystemName); ISubSystemConfiguration configuration = getSubSystemConfiguration(subsystemName);
if (configuration != null) { if (configuration != null) {
ISystemProfile profile = subsystem.getSystemProfile(); // DWD are there cases where this may be null? ISystemProfile profile = subsystem.getSystemProfile(); // DWD are there cases where this may be null?
ISystemFilterPoolManager filterPoolManager = configuration.getFilterPoolManager(profile); ISystemFilterPoolManager filterPoolManager = configuration.getFilterPoolManager(profile);
@ -542,7 +542,7 @@ public class RSEDOMImporter implements IRSEDOMImporter
* @param subsystemName the name to look up * @param subsystemName the name to look up
* @return the subsystem configuration matching the name * @return the subsystem configuration matching the name
*/ */
private ISubSystemConfiguration getSubsystemConfiguration(String subsystemName) private ISubSystemConfiguration getSubSystemConfiguration(String subsystemName)
{ {
return RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(subsystemName); return RSEUIPlugin.getTheSystemRegistry().getSubSystemConfiguration(subsystemName);
} }

4
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java
View file

@ -253,7 +253,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
final public String getUserId() { final public String getUserId() {
String result = getLocalUserId(); String result = getLocalUserId();
if (result == null) { if (result == null) {
result = getSubsystemUserId(); result = getSubSystemUserId();
} }
return result; return result;
} }
@ -270,7 +270,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
/** /**
* @return the userId from the primary subsystem. * @return the userId from the primary subsystem.
*/ */
private String getSubsystemUserId() { private String getSubSystemUserId() {
ISubSystem ss = getPrimarySubSystem(); ISubSystem ss = getPrimarySubSystem();
String result = ss.getUserId(); String result = ss.getUserId();
return result; return result;

2
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java
View file

@ -377,7 +377,7 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide
public ISubSystem createSubSystem(IHost conn, boolean creatingConnection, ISystemNewConnectionWizardPage[] yourNewConnectionWizardPages); public ISubSystem createSubSystem(IHost conn, boolean creatingConnection, ISystemNewConnectionWizardPage[] yourNewConnectionWizardPages);
// used in the case where newsubsystems are added after a connection exists // used in the case where newsubsystems are added after a connection exists
public ISubSystem createSubsystemAfterTheFact(IHost conn); public ISubSystem createSubSystemAfterTheFact(IHost conn);
public ISubSystem createSubSystemInternal(IHost conn); public ISubSystem createSubSystemInternal(IHost conn);

10
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java
View file

@ -1204,7 +1204,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
ISubSystem subsys = createSubSystemInternal(conn); ISubSystem subsys = createSubSystemInternal(conn);
if (subsys != null) if (subsys != null)
{ {
internalInitializeNewSubsystem(subsys, conn); internalInitializeNewSubSystem(subsys, conn);
if (supportsFilters()) if (supportsFilters())
{ {
// We create a filter pool reference manager object to manage the filter pool references // We create a filter pool reference manager object to manage the filter pool references
@ -1265,7 +1265,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
ISubSystem subsys = createSubSystemInternal(newConnection); ISubSystem subsys = createSubSystemInternal(newConnection);
if (subsys != null) if (subsys != null)
{ {
internalInitializeNewSubsystem(subsys, newConnection); internalInitializeNewSubSystem(subsys, newConnection);
// copy common data // copy common data
subsys.setName(oldSubsystem.getName()); // just in case it was changed subsys.setName(oldSubsystem.getName()); // just in case it was changed
subsys.addPropertySets(oldSubsystem.getPropertySets()); subsys.addPropertySets(oldSubsystem.getPropertySets());
@ -1374,7 +1374,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
* @param ss The new subsystem * @param ss The new subsystem
* @param conn The new connection containing this new subsystem * @param conn The new connection containing this new subsystem
*/ */
private void internalInitializeNewSubsystem(ISubSystem subsys, IHost conn) private void internalInitializeNewSubSystem(ISubSystem subsys, IHost conn)
{ {
subsys.setSubSystemConfiguration(this); subsys.setSubSystemConfiguration(this);
subsys.setHost(conn); subsys.setHost(conn);
@ -2818,12 +2818,12 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
} }
// used in the case where newsubsystems are added after a connection exists // used in the case where newsubsystems are added after a connection exists
public ISubSystem createSubsystemAfterTheFact(IHost conn) public ISubSystem createSubSystemAfterTheFact(IHost conn)
{ {
ISubSystem subsys = createSubSystemInternal(conn); ISubSystem subsys = createSubSystemInternal(conn);
if (subsys != null) if (subsys != null)
{ {
internalInitializeNewSubsystem(subsys, conn); internalInitializeNewSubSystem(subsys, conn);
if (supportsFilters()) if (supportsFilters())
{ {
// We create a filter pool reference manager object to manage the filter pool references // We create a filter pool reference manager object to manage the filter pool references

2
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubsystemConfigurationAdapter.java → rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubSystemConfigurationAdapter.java
View file

@ -43,7 +43,7 @@ import org.eclipse.swt.widgets.Shell;
* Defines the interface that must be implemented for adapters of for subsystem configurations. * Defines the interface that must be implemented for adapters of for subsystem configurations.
* This adapter is used when creating wizard pages for new connections. * This adapter is used when creating wizard pages for new connections.
*/ */
public interface ISubsystemConfigurationAdapter public interface ISubSystemConfigurationAdapter
{ {
/** /**