diff --git a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml index 0841893dc37..6efc48e85cf 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml +++ b/rse/examples/org.eclipse.rse.examples.daytime/plugin.xml @@ -45,7 +45,7 @@ Martin Oberhuber (Wind River) - initial API and implementation iconlive="icons/full/obj16/daytimelive_obj.gif" icon="icons/full/obj16/daytime_obj.gif" category="daytime" - class="org.eclipse.rse.examples.daytime.subsystems.DaytimeSubsystemConfiguration" + class="org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration" vendor="Wind River Systems" id="daytime.tcp"> diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystemConfiguration.java similarity index 95% rename from rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java rename to rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystemConfiguration.java index 9d430b3b9a7..052db784f17 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubsystemConfiguration.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/subsystems/DaytimeSubSystemConfiguration.java @@ -29,17 +29,17 @@ import org.eclipse.rse.model.IHost; 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. * It gives the RSE framework basic configuration data about enabled * or disabled options, and is responsible for instanciating the actual * 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(); - public DaytimeSubsystemConfiguration() { + public DaytimeSubSystemConfiguration() { super(); } diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java index e2148abcb43..a9071c4eb2d 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java @@ -21,17 +21,17 @@ import java.util.Vector; import org.eclipse.jface.wizard.IWizard; 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; -public class DaytimeSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter +public class DaytimeSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter { Vector _additionalActions; /* * (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) { diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java index 7e1034de805..55aa80b3513 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java @@ -2,12 +2,12 @@ package org.eclipse.rse.examples.daytime.ui; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterManager; -import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; -import org.eclipse.rse.examples.daytime.subsystems.DaytimeSubsystemConfiguration; +import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; +import org.eclipse.rse.examples.daytime.subsystems.DaytimeSubSystemConfiguration; public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new DaytimeSubSystemConfigurationAdapter(); + private ISubSystemConfigurationAdapter ssFactoryAdapter = new DaytimeSubSystemConfigurationAdapter(); /* * (non-Javadoc) @@ -15,7 +15,7 @@ public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFact */ 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) { - 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) { Object adapter = null; - if (adaptableObject instanceof DaytimeSubsystemConfiguration) + if (adaptableObject instanceof DaytimeSubSystemConfiguration) adapter = ssFactoryAdapter; return adapter; diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java index e41ddf77e1b..dfe984df5b0 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapter.java @@ -23,7 +23,7 @@ import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.ui.filters.actions.SystemChangeFilterAction; 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 samples.RSESamplesPlugin; @@ -32,7 +32,7 @@ import samples.RSESamplesPlugin; * Adds functionality to the basic SubSystemConfiguration. */ 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. - * @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) { diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java index 2dce7bfbfb3..eb7accb4b76 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java +++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/subsystems/DeveloperSubSystemConfigurationAdapterFactory.java @@ -18,7 +18,7 @@ package samples.subsystems; import org.eclipse.core.runtime.IAdapterFactory; 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 @@ -27,14 +27,14 @@ import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; public class DeveloperSubSystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssConfigAdapter = new DeveloperSubSystemConfigurationAdapter(); + private ISubSystemConfigurationAdapter ssConfigAdapter = new DeveloperSubSystemConfigurationAdapter(); /** * @see IAdapterFactory#getAdapterList() */ public Class[] getAdapterList() { - return new Class[] {ISubsystemConfigurationAdapter.class}; + return new Class[] {ISubSystemConfigurationAdapter.class}; } /** diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java index fa09cf4ce0a..815d02980c0 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/Activator.java @@ -24,7 +24,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.files.ui.resources.SystemRemoteEditManager; 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.SystemViewSearchResultAdapterFactory; import org.eclipse.rse.files.ui.view.SystemViewSearchResultSetAdapterFactory; @@ -83,7 +83,7 @@ public class Activator extends AbstractUIPlugin { svsraf = new SystemViewSearchResultAdapterFactory(); svsraf.registerWithManager(manager); - RemoteFileSubsystemConfigurationAdapterFactory rfssfaf = new RemoteFileSubsystemConfigurationAdapterFactory(); + RemoteFileSubSystemConfigurationAdapterFactory rfssfaf = new RemoteFileSubSystemConfigurationAdapterFactory(); rfssfaf.registerWithManager(manager); // universal temp file listener diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java index f705391ce75..ccacc8e04f8 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java @@ -39,13 +39,13 @@ import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; import org.eclipse.rse.ui.RSEUIPlugin; 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.swt.dnd.Clipboard; import org.eclipse.swt.widgets.Shell; -public class RemoteFileSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter +public class RemoteFileSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter { SystemNewFileFilterAction _newFileFilterAction; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapterFactory.java similarity index 88% rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapterFactory.java index 657dfa79d14..8b9ff9d5808 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapterFactory.java @@ -18,21 +18,21 @@ package org.eclipse.rse.files.ui.view; import org.eclipse.core.runtime.IAdapterFactory; 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; -public class RemoteFileSubsystemConfigurationAdapterFactory implements IAdapterFactory +public class RemoteFileSubSystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteFileSubSystemConfigurationAdapter(); + private ISubSystemConfigurationAdapter ssFactoryAdapter = new RemoteFileSubSystemConfigurationAdapter(); /** * @see IAdapterFactory#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 diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/ProcessesPlugin.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/ProcessesPlugin.java index 77de157e7a4..164cf5a2e07 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/ProcessesPlugin.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/ProcessesPlugin.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; 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.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessageFile; @@ -66,7 +66,7 @@ public class ProcessesPlugin extends SystemBasePlugin { svpaf = new SystemViewProcessAdapterFactory(); svpaf.registerWithManager(manager); - RemoteProcessSubsystemConfigurationAdapterFactory rpssfaf = new RemoteProcessSubsystemConfigurationAdapterFactory(); + RemoteProcessSubSystemConfigurationAdapterFactory rpssfaf = new RemoteProcessSubSystemConfigurationAdapterFactory(); rpssfaf.registerWithManager(manager); } diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java index 42bb6900ed0..e53d141129f 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java @@ -24,11 +24,11 @@ import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.processes.ui.actions.SystemNewProcessFilterAction; 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; -public class RemoteProcessSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter +public class RemoteProcessSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter { SystemNewProcessFilterAction _newProcessFilterAction; diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapterFactory.java similarity index 88% rename from rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java rename to rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapterFactory.java index 59f6f359a68..56381ce1ab5 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapterFactory.java @@ -18,21 +18,21 @@ package org.eclipse.rse.processes.ui.view; import org.eclipse.core.runtime.IAdapterFactory; 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; -public class RemoteProcessSubsystemConfigurationAdapterFactory implements IAdapterFactory +public class RemoteProcessSubSystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteProcessSubSystemConfigurationAdapter(); + private ISubSystemConfigurationAdapter ssFactoryAdapter = new RemoteProcessSubSystemConfigurationAdapter(); /** * @see IAdapterFactory#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 diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java index 9e569c02166..ccff01a9a6a 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/Activator.java @@ -19,7 +19,7 @@ package org.eclipse.rse.shells.ui; import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.Platform; 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.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -53,7 +53,7 @@ public class Activator extends AbstractUIPlugin { _svoaf = new SystemViewOutputAdapterFactory(); _svoaf.registerWithManager(manager); - ShellServiceSubsystemConfigurationAdapterFactory fac = new ShellServiceSubsystemConfigurationAdapterFactory(); + ShellServiceSubSystemConfigurationAdapterFactory fac = new ShellServiceSubSystemConfigurationAdapterFactory(); fac.registerWithManager(manager); } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java index f0de78dccca..a1e47ccce69 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java @@ -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.ui.ISystemIconConstants; 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; -public class ShellServiceSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter +public class ShellServiceSubSystemConfigurationAdapter extends SubSystemConfigurationAdapter { protected IAction _exportShellHistoryAction; protected IAction _exportShellOutputAction; diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapterFactory.java similarity index 88% rename from rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java rename to rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapterFactory.java index 9fb43f9840a..7349e50ac3a 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapterFactory.java @@ -18,22 +18,22 @@ package org.eclipse.rse.shells.ui.view; import org.eclipse.core.runtime.IAdapterFactory; 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.ShellServiceSubSystemConfiguration; -public class ShellServiceSubsystemConfigurationAdapterFactory implements IAdapterFactory +public class ShellServiceSubSystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new ShellServiceSubSystemConfigurationAdapter(); + private ISubSystemConfigurationAdapter ssFactoryAdapter = new ShellServiceSubSystemConfigurationAdapter(); /** * @see IAdapterFactory#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 diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java index 1ac5efe7623..7f07f691d63 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemViewRemoteOutputAdapter.java @@ -35,7 +35,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.IRemoteLineReference; 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.resources.RemoteSourceLookupDirector; import org.eclipse.rse.files.ui.resources.SystemEditableRemoteFile; @@ -215,7 +215,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu _shellActions.add(new Separator()); - ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); + ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class); _exportShellOutputAction = factoryAdapter.getCommandShellOutputExportAction(shell); _shellActions.add(_exportShellOutputAction); @@ -821,7 +821,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu { IRemoteCommandShell command = (IRemoteCommandShell) element; IRemoteCmdSubSystemConfiguration factory = command.getCommandSubSystem().getParentRemoteCmdSubSystemConfiguration(); - ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); + ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class); ImageDescriptor imageDescriptor = null; if (command.isActive()) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java index dbee4d17300..04c254b6763 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/RSEUIPlugin.java @@ -58,7 +58,7 @@ import org.eclipse.rse.ui.internal.RSESystemTypeAdapterFactory; import org.eclipse.rse.ui.internal.RSEUIRegistry; import org.eclipse.rse.ui.propertypages.RemoteSystemsPreferencePage; 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.team.SystemTeamViewResourceAdapterFactory; import org.osgi.framework.Bundle; @@ -488,7 +488,7 @@ public class RSEUIPlugin extends SystemBasePlugin // DKM // for subsystem factories - SubsystemConfigurationAdapterFactory ssfaf = new SubsystemConfigurationAdapterFactory(); + SubSystemConfigurationAdapterFactory ssfaf = new SubSystemConfigurationAdapterFactory(); ssfaf.registerWithManager(manager); RSESystemTypeAdapterFactory rseSysTypeFactory = new RSESystemTypeAdapterFactory(); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterUIHelpers.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterUIHelpers.java index 36d7af86098..e16c8cc9423 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterUIHelpers.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/SystemFilterUIHelpers.java @@ -18,7 +18,7 @@ package org.eclipse.rse.ui.filters; import java.util.Vector; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -121,7 +121,7 @@ public class SystemFilterUIHelpers poolMgrProvider = poolMgr.getProvider(); if (poolMgrProvider != null) { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); poolMgrImage = adapter.getSystemFilterPoolManagerImage(); } if (poolMgrImage == null) @@ -140,7 +140,7 @@ public class SystemFilterUIHelpers poolMgrProvider = pool.getProvider(); if (poolMgrProvider != null) { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); poolImage = adapter.getSystemFilterPoolImage(pool); } if (poolImage == null) @@ -158,7 +158,7 @@ public class SystemFilterUIHelpers poolMgrProvider = filter.getProvider(); if (poolMgrProvider != null) { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); filterImage = adapter.getSystemFilterImage(filter); } if (filterImage == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java index 3dee13c30f0..25ec6d6fb97 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterAction.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -312,7 +312,7 @@ public class SystemFilterCopyFilterAction extends SystemBaseCopyAction ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); if ((mgrs == null) || (mgrs.length == 0)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterPoolAction.java index d3d152d077f..d50aaa52bb7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterPoolAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterPoolAction.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; 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.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider; @@ -299,7 +299,7 @@ public class SystemFilterCopyFilterPoolAction extends SystemBaseCopyAction veryRootElement.setDeletable(false); ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); if ((mgrs == null) || (mgrs.length == 0)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterStringAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterStringAction.java index 6accda0964e..f686b2388e9 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterStringAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterCopyFilterStringAction.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -388,7 +388,7 @@ public class SystemFilterCopyFilterStringAction extends SystemBaseCopyAction ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); if ((mgrs == null) || (mgrs.length == 0)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterAction.java index ffd557a0b47..30ad5f139a2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterAction.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -315,7 +315,7 @@ public class SystemFilterMoveFilterAction extends SystemBaseCopyAction ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); if ((mgrs == null) || (mgrs.length == 0)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterPoolAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterPoolAction.java index 28004d51afd..9c5c4eef329 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterPoolAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterPoolAction.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; 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.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolManagerProvider; @@ -342,7 +342,7 @@ public class SystemFilterMoveFilterPoolAction extends SystemBaseCopyAction ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); if ((mgrs == null) || (mgrs.length == 0)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterStringAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterStringAction.java index f61955509fb..fe4e2884900 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterStringAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/filters/actions/SystemFilterMoveFilterStringAction.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -386,7 +386,7 @@ public class SystemFilterMoveFilterStringAction extends SystemBaseCopyAction ISystemFilterPoolManager[] mgrs = poolMgrProvider.getSystemFilterPoolManagers(); - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)poolMgrProvider.getAdapter(ISubSystemConfigurationAdapter.class); ImageDescriptor image = adapter.getSystemFilterPoolManagerImage(); if ((mgrs == null) || (mgrs.length == 0)) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java index 1ac8093227f..43acd85d77c 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerLauncherPropertyPage.java @@ -21,7 +21,7 @@ import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; 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.widgets.IServerLauncherForm; import org.eclipse.swt.widgets.Composite; @@ -73,7 +73,7 @@ public class ServerLauncherPropertyPage extends SystemBasePropertyPage implement factory =_factory; } - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)factory.getAdapter(ISubSystemConfigurationAdapter.class); _form = adapter.getServerLauncherForm(factory, getShell(), getMessageLine()); // Create property page UI diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java index af905fd8008..21327e4503e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java @@ -18,7 +18,7 @@ package org.eclipse.rse.ui.propertypages; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.SubSystemConfiguration; 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.ISystemFilterPoolManagerProvider; import org.eclipse.rse.filters.ISystemFilterPoolReferenceManagerProvider; @@ -220,7 +220,7 @@ public class SystemChangeFilterPropertyPage extends SystemBasePropertyPage changeFilterPane.setSystemFilterPoolManagerProvider(selectedFilter.getProvider()); 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); changeFilterPane.setInputObject(getElement()); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java index c670d4debcc..8935eb050c5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java @@ -20,7 +20,7 @@ import java.util.Vector; import org.eclipse.rse.core.SystemBasePlugin; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -230,7 +230,7 @@ public class SystemFilterStringPropertyPage extends SystemBasePropertyPage imple // edit pane 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()); if (editPane == null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java index 86e8d244c10..50b2dea7b10 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java @@ -17,7 +17,7 @@ package org.eclipse.rse.ui.propertypages; 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.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.ui.ISystemMessages; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemWidgetHelpers; @@ -53,7 +53,7 @@ public class SystemSubSystemPropertyPageCore extends SystemBasePropertyPage if (element instanceof ISubSystem) { 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); } else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java index 5300e324a30..dcaefecc28d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.java @@ -35,7 +35,7 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.AbstractResource; 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.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemMessageObject; import org.eclipse.rse.model.ISystemPromptableObject; @@ -307,7 +307,7 @@ public abstract class AbstractSystemViewAdapter if (ss != null) { 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); } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java similarity index 99% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java index 719c25b1107..d49f2056bd4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapter.java @@ -34,7 +34,7 @@ import org.eclipse.rse.core.servicesubsystem.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.core.subsystems.util.ISubsystemConfigurationAdapter; +import org.eclipse.rse.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -90,7 +90,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.dialogs.PropertyPage; -public class SubsystemConfigurationAdapter implements ISubsystemConfigurationAdapter, ISystemNewFilterActionConfigurator +public class SubSystemConfigurationAdapter implements ISubSystemConfigurationAdapter, ISystemNewFilterActionConfigurator { protected Hashtable imageTable = null; @@ -99,7 +99,7 @@ public class SubsystemConfigurationAdapter implements ISubsystemConfigurationAda private IAction[] filterPoolActions = null; private IAction[] filterPoolReferenceActions = null; private IAction[] filterActions = null; - public SubsystemConfigurationAdapter() + public SubSystemConfigurationAdapter() { } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapterFactory.java similarity index 86% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapterFactory.java index dfb02229972..37651c43b9e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubSystemConfigurationAdapterFactory.java @@ -19,20 +19,20 @@ package org.eclipse.rse.ui.view; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterManager; 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() */ 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 diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java index 8ea89739da6..f6fc3145dbf 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAPIProviderForFilters.java @@ -20,7 +20,7 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolReference; @@ -134,7 +134,7 @@ public class SystemViewAPIProviderForFilters { children = new SystemMessageObject[1]; try { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssf.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class); ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); if (newFilter == null) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAdapterFactory.java index 23404c4f3d9..7790a39ccb5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewAdapterFactory.java @@ -285,7 +285,7 @@ public class SystemViewAdapterFactory implements IAdapterFactory * This method returns the RSE adapter for subsystems * @return SystemViewSubSystemAdapter */ - public SystemViewSubSystemAdapter getSubsystemAdapter() + public SystemViewSubSystemAdapter getSubSystemAdapter() { return subsystemAdapter; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java index f46db1bb451..114fe2638ec 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterAdapter.java @@ -26,7 +26,7 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -84,7 +84,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement return; ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(filter); ssFactory.setConnection(null); - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssFactory.getAdapter(ISubSystemConfigurationAdapter.class); IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell); if (actions != null) { @@ -112,7 +112,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement ISystemFilter filter = getFilter(element); if (filter.getProvider() != null) { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)filter.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)filter.getProvider().getAdapter(ISubSystemConfigurationAdapter.class); filterImage = adapter.getSystemFilterImage(filter); } if (filterImage == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolAdapter.java index 44fd11edc7a..c8cc2aa3e1b 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolAdapter.java @@ -23,7 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; 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.ISystemFilterPoolManager; 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 ISystemFilterPool pool = ((ISystemFilterPool)selection.getFirstElement()); 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); if (actions != null) { @@ -93,7 +93,7 @@ public class SystemViewFilterPoolAdapter extends AbstractSystemViewAdapter imple if (pool.getProvider() != null) { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)pool.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)pool.getProvider().getAdapter(ISubSystemConfigurationAdapter.class); poolImage = adapter.getSystemFilterPoolImage(pool); } if (poolImage == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java index 55ff989feb8..7061392455a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterPoolReferenceAdapter.java @@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; 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.ISystemFilterPoolManager; import org.eclipse.rse.filters.ISystemFilterPoolReference; @@ -72,7 +72,7 @@ public class SystemViewFilterPoolReferenceAdapter Object element = selection.getFirstElement(); ISystemFilterPool pool = getFilterPool(element); 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); if (actions != null) @@ -120,7 +120,7 @@ public class SystemViewFilterPoolReferenceAdapter ISystemFilterPool pool = getFilterPool(element); if (pool.getProvider() != null) { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)pool.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)pool.getProvider().getAdapter(ISubSystemConfigurationAdapter.class); poolImage = adapter.getSystemFilterPoolImage(pool); } if (poolImage == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java index 1c6338916fc..11c5aff2e8e 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterReferenceAdapter.java @@ -30,7 +30,7 @@ import org.eclipse.rse.core.SystemPreferencesManager; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; 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.ISystemFilterContainerReference; import org.eclipse.rse.filters.ISystemFilterPool; @@ -91,7 +91,7 @@ public class SystemViewFilterReferenceAdapter IHost currentConnection = currentSubSystem.getHost(); ssFactory.setConnection(currentConnection); 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); if (actions != null) @@ -140,7 +140,7 @@ public class SystemViewFilterReferenceAdapter 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); } if (filterImage == null) @@ -261,7 +261,7 @@ public class SystemViewFilterReferenceAdapter children = new SystemMessageObject[1]; try { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssf.getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)ssf.getAdapter(ISubSystemConfigurationAdapter.class); ISystemFilter newFilter = adapter.createFilterByPrompting(ssf, fRef, getShell()); if (newFilter == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java index 2d72a1fc130..e6fbe60a002 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewFilterStringAdapter.java @@ -20,7 +20,7 @@ import java.util.Vector; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.resource.ImageDescriptor; 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.ISystemFilterPool; import org.eclipse.rse.filters.ISystemFilterPoolManager; @@ -90,7 +90,7 @@ public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter imp ISystemFilterString filterString = getFilterString(element); if (filterString.getProvider() != null) { - ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)filterString.getProvider().getAdapter(ISubsystemConfigurationAdapter.class); + ISubSystemConfigurationAdapter adapter = (ISubSystemConfigurationAdapter)filterString.getProvider().getAdapter(ISubSystemConfigurationAdapter.class); filterImage = adapter.getSystemFilterStringImage(filterString); } if (filterImage == null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java index 41ccafe2c48..160846efeac 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java @@ -25,7 +25,7 @@ import org.eclipse.rse.core.SystemBasePlugin; 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.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.model.ISystemRegistry; import org.eclipse.rse.ui.RSEUIPlugin; import org.eclipse.rse.ui.SystemMenuManager; @@ -80,7 +80,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter Object element = selection.getFirstElement(); ISubSystem ss = (ISubSystem)element; 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); if (actions != null) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java index 35b543f26c1..6ca85a256ca 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/RSEDefaultNewConnectionWizardDelegate.java @@ -25,7 +25,7 @@ import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemPerspectiveHelpers; 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.core.subsystems.util.ISubSystemConfigurationAdapter; import org.eclipse.rse.model.DummyHost; import org.eclipse.rse.model.IHost; import org.eclipse.rse.model.ISystemProfile; @@ -445,7 +445,7 @@ public class RSEDefaultNewConnectionWizardDelegate extends RSENewConnectionWizar ISubSystemConfiguration[] factories = sr.getSubSystemConfigurationsBySystemType(systemType, true); for (int idx=0; idx