From 27746a536eb3d45418cc7ed97e6018c888048f89 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 31 Jul 2006 16:21:36 +0000 Subject: [PATCH] SubSystemFactory -> SubSystemConfiguration Fix for Defect 150496 --- .../daytime/model/DaytimeResourceAdapter.java | 2 +- .../ui/DaytimeNewConnectionWizardPage.java | 29 ++++++++ .../DaytimeSubSystemConfigurationAdapter.java | 72 +++++++++++++++++++ ...eSubSystemConfigurationAdapterFactory.java | 41 +++++++++++ .../model/DeveloperResourceAdapter.java | 4 +- .../samples/model/TeamResourceAdapter.java | 4 +- ...eveloperSubSystemConfigurationAdapter.java | 4 +- .../dstore/DStoreConnectorService.java | 4 +- ... => IUniversalSubSystemConfiguration.java} | 2 +- .../plugin.xml | 4 +- .../org/eclipse/rse/files/ui/Activator.java | 4 +- .../ui/SystemFileFilterStringEditPane.java | 28 ++++---- ...actRemoteFilePopupMenuExtensionAction.java | 6 +- .../ui/actions/SystemAddToArchiveAction.java | 2 +- .../files/ui/actions/SystemExtractAction.java | 2 +- .../ui/actions/SystemNewFileFilterAction.java | 2 +- .../FileServicesPropertyPage.java | 6 +- ...RemoteFilePropertyPageExtensionAction.java | 4 +- .../rse/files/ui/resources/CombineForm.java | 2 +- .../rse/files/ui/resources/ExtractToForm.java | 2 +- .../resources/SystemEditableRemoteFile.java | 2 +- .../UniversalFileTransferUtility.java | 10 +-- .../rse/files/ui/search/SystemSearchPage.java | 2 +- ...oteFileSubSystemConfigurationAdapter.java} | 4 +- ...SubsystemConfigurationAdapterFactory.java} | 4 +- .../ui/view/SystemViewRemoteFileAdapter.java | 28 ++++---- .../SystemViewRemoteSearchResultAdapter.java | 2 +- ...ystemViewRemoteSearchResultSetAdapter.java | 2 +- .../SystemQualifiedRemoteFolderCombo.java | 2 +- .../ui/widgets/SystemRemoteFolderCombo.java | 4 +- .../SystemSelectRemoteFileOrFolderForm.java | 4 +- .../files/ui/wizards/SystemNewFileWizard.java | 2 +- .../rse/processes/ui/ProcessesPlugin.java | 4 +- .../ui/SystemProcessFilterStringEditPane.java | 6 +- .../ProcessServicesPropertyPage.java | 6 +- ...ProcessSubSystemConfigurationAdapter.java} | 4 +- ...SubsystemConfigurationAdapterFactory.java} | 4 +- .../view/SystemViewRemoteProcessAdapter.java | 2 +- .../org/eclipse/rse/shells/ui/Activator.java | 4 +- .../rse/shells/ui/RemoteCommandHelpers.java | 2 +- .../ui/SystemRemoteCommandEntryForm.java | 8 +-- .../ShellServicesPropertyPage.java | 6 +- ...ServiceSubSystemConfigurationAdapter.java} | 4 +- ...SubsystemConfigurationAdapterFactory.java} | 4 +- .../ui/view/SystemCommandsViewPart.java | 2 +- .../view/SystemViewRemoteOutputAdapter.java | 10 +-- ...ubSystemConfigurationAPIProviderImpl.java} | 6 +- .../core/model/RemoteFileFilterString.java | 4 +- .../files/core/model/RemoteFileUtility.java | 2 +- .../FileServiceSubSystem.java | 4 +- .../core/subsystems/IRemoteFileSubSystem.java | 14 ++-- .../IRemoteFileSubSystemConfiguration.java | 2 +- .../files/core/subsystems/RemoteFile.java | 16 ++--- .../core/subsystems/RemoteFileSubSystem.java | 52 +++++++------- .../core/util/ValidatorFileUniqueName.java | 4 +- .../LocalFileSubSystemConfiguration.java | 2 +- .../subsystem/RemoteProcessSubSystem.java | 4 +- .../RemoteProcessSubSystemConfiguration.java | 2 +- .../impl/RemoteProcessSubSystemImpl.java | 4 +- .../ProcessServiceSubSystem.java | 2 +- .../ProcessServiceSubSystemConfiguration.java | 8 +-- .../DStoreProcessSubSystemConfiguration.java | 8 +-- .../LocalProcessSubSystemConfiguration.java | 6 +- .../shells/subsystems/RemoteCmdSubSystem.java | 8 +-- .../core/model/RemoteCommandFilterString.java | 2 +- .../model/RemoteCommandShellOperation.java | 2 +- .../core/subsystems/IRemoteCmdSubSystem.java | 4 +- .../IRemoteCmdSubSystemConfiguration.java | 2 +- .../IShellServiceSubSystemConfiguration.java | 4 +- .../ShellServiceSubSystem.java | 2 +- .../rse/internal/ui/view/SystemView.java | 2 +- .../UI/org/eclipse/rse/ui/RSEUIPlugin.java | 18 ++--- ...ystemAbstractPopupMenuExtensionAction.java | 14 ++-- .../dialogs/SystemTestFilterStringDialog.java | 2 +- .../ISystemConnectionWizardPropertyPage.java | 2 +- .../ServerConnectionSecurityPropertyPage.java | 2 +- .../ServerLauncherPropertyPage.java | 2 +- .../propertypages/ServicesPropertyPage.java | 4 +- ...emAbstractPropertyPageExtensionAction.java | 10 +-- .../SystemChangeFilterPropertyPage.java | 2 +- .../SystemFilterStringPropertyPage.java | 2 +- ...ewSubSystemConfigurationPropertyPage.java} | 18 ++--- .../ui/view/AbstractSystemViewAdapter.java | 2 +- .../ui/view/ISystemRemoteElementAdapter.java | 2 +- ...ava => SubsystemConfigurationAdapter.java} | 16 ++--- ...SubsystemConfigurationAdapterFactory.java} | 4 +- ...stemSelectRemoteObjectAPIProviderImpl.java | 8 +-- .../org/eclipse/rse/ui/view/SystemView.java | 2 +- .../view/SystemViewAPIProviderForFilters.java | 2 +- .../rse/ui/view/SystemViewAdapterFactory.java | 16 ++--- .../rse/ui/view/SystemViewFilterAdapter.java | 6 +- .../ui/view/SystemViewFilterPoolAdapter.java | 6 +- .../SystemViewFilterPoolReferenceAdapter.java | 10 +-- .../SystemViewFilterReferenceAdapter.java | 24 +++---- .../view/SystemViewFilterStringAdapter.java | 4 +- .../ui/view/SystemViewScratchpadAdapter.java | 4 +- .../ui/view/SystemViewSubSystemAdapter.java | 8 +-- .../ui/view/search/SystemSearchTableView.java | 2 +- .../team/SystemTeamViewCategoryAdapter.java | 12 ++-- .../team/SystemTeamViewContentProvider.java | 12 ++-- .../rse/ui/view/team/SystemTeamViewPart.java | 2 +- ...eamViewSubSystemConfigurationAdapter.java} | 40 +++++------ ...emTeamViewSubSystemConfigurationNode.java} | 16 ++--- .../rse/ui/widgets/SystemHostCombo.java | 2 +- ...AbstractSystemNewConnectionWizardPage.java | 2 +- .../ISystemNewConnectionWizardPage.java | 2 +- .../wizards/SubSystemServiceWizardPage.java | 2 +- .../SystemSubSystemsPropertiesWizardPage.java | 2 +- .../rse/internal/model/SystemRegistry.java | 32 ++++----- ...=> ISubSystemConfigurationCategories.java} | 2 +- .../eclipse/rse/model/ISystemRegistry.java | 8 +-- .../eclipse/rse/model/SystemStartHere.java | 20 +++--- .../SubSystemConfigurationProxy.java | 2 +- .../IServiceSubSystemConfiguration.java | 4 +- .../subsystems/AbstractConnectorService.java | 12 ++-- .../AbstractConnectorServiceManager.java | 2 +- .../rse/core/subsystems/ISubSystem.java | 2 +- .../subsystems/ISubSystemConfiguration.java | 8 +-- .../ISubSystemConfigurationProxy.java | 4 +- .../rse/core/subsystems/SubSystem.java | 14 ++-- .../subsystems/SubSystemConfiguration.java | 48 ++++++------- .../rse/core/subsystems/SubSystemHelpers.java | 20 +++--- .../SystemPopupMenuActionContributor.java | 8 +-- .../rse/core/SystemPropertyPageExtension.java | 8 +-- .../rse/core/SystemRemoteObjectMatcher.java | 6 +- .../rse/core/SystemResourceManager.java | 10 +-- 126 files changed, 579 insertions(+), 437 deletions(-) create mode 100644 rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java create mode 100644 rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java create mode 100644 rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java rename rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/{IUniversalSubSystemFactory.java => IUniversalSubSystemConfiguration.java} (95%) rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/{RemoteFileSubSystemFactoryAdapter.java => RemoteFileSubSystemConfigurationAdapter.java} (97%) rename rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/{RemoteFileSubsystemFactoryAdapterFactory.java => RemoteFileSubsystemConfigurationAdapterFactory.java} (94%) rename rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/{RemoteProcessSubSystemFactoryAdapter.java => RemoteProcessSubSystemConfigurationAdapter.java} (93%) rename rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/{RemoteProcessSubsystemFactoryAdapterFactory.java => RemoteProcessSubsystemConfigurationAdapterFactory.java} (93%) rename rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/{ShellServiceSubSystemFactoryAdapter.java => ShellServiceSubSystemConfigurationAdapter.java} (96%) rename rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/{ShellServiceSubsystemFactoryAdapterFactory.java => ShellServiceSubsystemConfigurationAdapterFactory.java} (94%) rename rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/{SystemFileSubSystemFactoryAPIProviderImpl.java => SystemFileSubSystemConfigurationAPIProviderImpl.java} (94%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/{SystemTeamViewSubSystemFactoryPropertyPage.java => SystemTeamViewSubSystemConfigurationPropertyPage.java} (86%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/{SubsystemFactoryAdapter.java => SubsystemConfigurationAdapter.java} (98%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/{SubsystemFactoryAdapterFactory.java => SubsystemConfigurationAdapterFactory.java} (94%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/{SystemTeamViewSubSystemFactoryAdapter.java => SystemTeamViewSubSystemConfigurationAdapter.java} (85%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/{SystemTeamViewSubSystemFactoryNode.java => SystemTeamViewSubSystemConfigurationNode.java} (86%) rename rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/{ISubSystemFactoryCategories.java => ISubSystemConfigurationCategories.java} (96%) diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java index 31801b00e11..719fe30f94e 100644 --- a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java @@ -91,7 +91,7 @@ public class DaytimeResourceAdapter extends AbstractSystemViewAdapter implements return "root"; //$NON-NLS-1$ } - public String getSubSystemFactoryId(Object element) { + public String getSubSystemConfigurationId(Object element) { // as declared in extension in plugin.xml return "daytime.tcp"; //$NON-NLS-1$ } diff --git a/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java new file mode 100644 index 00000000000..1b4732cfd44 --- /dev/null +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java @@ -0,0 +1,29 @@ +package org.eclipse.rse.examples.daytime.ui; + +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; +import org.eclipse.rse.ui.wizards.AbstractSystemNewConnectionWizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Text; + +public class DaytimeNewConnectionWizardPage extends + AbstractSystemNewConnectionWizardPage { + + + public DaytimeNewConnectionWizardPage(IWizard wizard, ISubSystemConfiguration parentConfig) + { + super(wizard, parentConfig); + } + + public Control createContents(Composite parent) { + Text field = new Text(parent, SWT.NONE); + field.setText("this is a test"); + + + // TODO Auto-generated method stub + return field; + } + +} 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 new file mode 100644 index 00000000000..4ec385f549b --- /dev/null +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapter.java @@ -0,0 +1,72 @@ +/******************************************************************************** + * Copyright (c) 2006 IBM Corporation. All rights reserved. + * This program and the accompanying materials are made available under the terms + * of the Eclipse Public License v1.0 which accompanies this distribution, and is + * available at http://www.eclipse.org/legal/epl-v10.html + * + * Initial Contributors: + * The following IBM employees contributed to the Remote System Explorer + * component that contains this file: David McKnight, Kushal Munir, + * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, + * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. + * + * Contributors: + * {Name} (company) - description of contribution. + ********************************************************************************/ + +package org.eclipse.rse.examples.daytime.ui; + +import java.util.Vector; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.rse.core.SystemBasePlugin; +import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; + +import org.eclipse.rse.filters.ISystemFilter; +import org.eclipse.rse.filters.ISystemFilterPool; +import org.eclipse.rse.model.ISystemRegistry; +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.wizards.ISystemNewConnectionWizardPage; +import org.eclipse.swt.dnd.Clipboard; +import org.eclipse.swt.widgets.Shell; + + +public class DaytimeSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter +{ + + + + Vector _additionalActions; + + // ----------------------------------- + // WIZARD PAGE CONTRIBUTION METHODS... (defects 43194 and 42780) + // ----------------------------------- + /** + * Optionally return one or more wizard pages to append to the New Connection Wizard if + * the user selects a system type that this subsystem factory supports. + *

+ * Tip: consider extending AbstractSystemWizardPage for your wizard page class. + */ + public ISystemNewConnectionWizardPage[] getNewConnectionWizardPages(ISubSystemConfiguration factory, IWizard wizard) + { + ISystemNewConnectionWizardPage[] basepages = super.getNewConnectionWizardPages(factory, wizard); + + if (true) + { + DaytimeNewConnectionWizardPage page = new DaytimeNewConnectionWizardPage(wizard, factory); + ISystemNewConnectionWizardPage[] newPages = new ISystemNewConnectionWizardPage[basepages.length + 1]; + newPages[0] = page; + for (int i = 0; i < basepages.length; i++) + { + newPages[i+1] = basepages[i]; + } + basepages = newPages; + } + return basepages; + } + + +} \ No newline at end of file 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 new file mode 100644 index 00000000000..1e9212c81f5 --- /dev/null +++ b/rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeSubSystemConfigurationAdapterFactory.java @@ -0,0 +1,41 @@ +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; + +public class DaytimeSubSystemConfigurationAdapterFactory implements IAdapterFactory { + + + private ISubsystemConfigurationAdapter ssFactoryAdapter = new DaytimeSubSystemConfigurationAdapter(); + + /** + * @see IAdapterFactory#getAdapterList() + */ + public Class[] getAdapterList() + { + return new Class[] {ISubsystemConfigurationAdapter.class}; + } + /** + * Called by our plugin's startup method to register our adaptable object types + * with the platform. We prefer to do it here to isolate/encapsulate all factory + * logic in this one place. + */ + public void registerWithManager(IAdapterManager manager) + { + manager.registerAdapters(this, DaytimeSubsystemConfiguration.class); + } + /** + * @see IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class) + */ + public Object getAdapter(Object adaptableObject, Class adapterType) + { + Object adapter = null; + if (adaptableObject instanceof DaytimeSubsystemConfiguration) + adapter = ssFactoryAdapter; + + return adapter; + } + +} diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java index 5e311893abb..40cf4c3ddfd 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java @@ -150,9 +150,9 @@ public class DeveloperResourceAdapter extends AbstractSystemViewAdapter } /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemFactoryId(java.lang.Object) + * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object) */ - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { return "samples.subsystems.factory"; // as declared in extension in plugin.xml //$NON-NLS-1$ } diff --git a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java index 912ebc1087a..85d00aeb433 100644 --- a/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java +++ b/rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java @@ -151,9 +151,9 @@ public class TeamResourceAdapter extends AbstractSystemViewAdapter implements } /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemFactoryId(java.lang.Object) + * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object) */ - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { return "samples.subsystems.factory"; // as declared in extension in plugin.xml //$NON-NLS-1$ } 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 99e53a8a5ec..a0871f03028 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.SubsystemFactoryAdapter; +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 - SubsystemFactoryAdapter + SubsystemConfigurationAdapter { /** diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index 8fa08498cb4..a3b052726ed 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -346,7 +346,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements return (IIBMServerLauncher)sl; } else - //return ((SubSystemFactoryImpl)ss.getParentSubSystemFactory()).getDefaultIBMServerLauncher(ss); + //return ((SubSystemConfigurationImpl)ss.getParentSubSystemConfiguration()).getDefaultIBMServerLauncher(ss); return null; // should never happen! } @@ -440,7 +440,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements /** * Return the remote server launcher, which implements IServerLauncher. * This is called by the default implementation of connect, if - * subsystem.getParentSubSystemFactory().supportsServerLaunchProperties returns true. + * subsystem.getParentSubSystemConfiguration().supportsServerLaunchProperties returns true. */ public IServerLauncher getRemoteServerLauncher() { diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemFactory.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java similarity index 95% rename from rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemFactory.java rename to rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java index 9db520b9aa0..95e52a03576 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemFactory.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java @@ -18,7 +18,7 @@ package org.eclipse.rse.connectorservice.dstore; /** * Simply a tag to indicate this factory is one our universal subsystem factories. */ -public interface IUniversalSubSystemFactory +public interface IUniversalSubSystemConfiguration { diff --git a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml index ee75fad99f0..d593c813fca 100644 --- a/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml +++ b/rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml @@ -33,7 +33,7 @@ Contributors: - - --> + 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 67ff24f5937..fa09cf4ce0a 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.RemoteFileSubsystemFactoryAdapterFactory; +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); - RemoteFileSubsystemFactoryAdapterFactory rfssfaf = new RemoteFileSubsystemFactoryAdapterFactory(); + 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/SystemFileFilterStringEditPane.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java index 8acda113517..1c6599ba6c0 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java @@ -86,7 +86,7 @@ public class SystemFileFilterStringEditPane protected boolean skipUniquenessChecking; protected boolean calledFromVerify; protected boolean dontStealFocus; - protected RemoteFileSubSystemConfiguration inputSubsystemFactory = null; + protected RemoteFileSubSystemConfiguration inputSubsystemConfiguration = null; // actions protected SystemTestFilterStringAction testAction = null; @@ -268,15 +268,15 @@ public class SystemFileFilterStringEditPane folderCombo.setFocus(); if (refProvider != null) - inputSubsystemFactory = (RemoteFileSubSystemConfiguration)((ISubSystem)refProvider).getSubSystemConfiguration(); + inputSubsystemConfiguration = (RemoteFileSubSystemConfiguration)((ISubSystem)refProvider).getSubSystemConfiguration(); else if (provider != null) - inputSubsystemFactory = (RemoteFileSubSystemConfiguration)provider; - pathValidator = inputSubsystemFactory.getPathValidator(); - fileValidator = inputSubsystemFactory.getFileFilterStringValidator(); + inputSubsystemConfiguration = (RemoteFileSubSystemConfiguration)provider; + pathValidator = inputSubsystemConfiguration.getPathValidator(); + fileValidator = inputSubsystemConfiguration.getFileFilterStringValidator(); if (refProvider != null) folderCombo.setSystemConnection(((ISubSystem)refProvider).getHost()); - else if (inputSubsystemFactory != null) - folderCombo.setSystemTypes(inputSubsystemFactory.getSystemTypes()); + else if (inputSubsystemConfiguration != null) + folderCombo.setSystemTypes(inputSubsystemConfiguration.getSystemTypes()); folderCombo.setSubSystem((IRemoteFileSubSystem)refProvider); folderCombo.setTextLimit(filterPathLength); textFile.setTextLimit(filterFileLength); @@ -335,7 +335,7 @@ public class SystemFileFilterStringEditPane if (inputFilterString != null) { - RemoteFileFilterString rffs = new RemoteFileFilterString(inputSubsystemFactory, inputFilterString); + RemoteFileFilterString rffs = new RemoteFileFilterString(inputSubsystemConfiguration, inputFilterString); String defaultPath = rffs.getPath(); folderCombo.setText((defaultPath==null) ? "" : defaultPath); String defaultFile = rffs.getFile(); @@ -397,11 +397,11 @@ public class SystemFileFilterStringEditPane String folderText = folderCombo.getText().trim(); - if (inputSubsystemFactory != null) { + if (inputSubsystemConfiguration != null) { // KM: defect 53009. // if input subsystem factory is Unix, then we can not allow empty path - if (inputSubsystemFactory.isUnixStyle()) { + if (inputSubsystemConfiguration.isUnixStyle()) { return folderText.length() > 0 && filterGiven; } // otherwise, if it is Windows @@ -603,9 +603,9 @@ public class SystemFileFilterStringEditPane // If the input subsystem factory is Unix, we do not allow empty folder path. // Note that for Windows, it is perfectly valid to have an empty folder path, // which indicates that the filter will resolve to show all the drives - if (inputSubsystemFactory != null) { + if (inputSubsystemConfiguration != null) { - if (inputSubsystemFactory.isUnixStyle()) { + if (inputSubsystemConfiguration.isUnixStyle()) { // let error message come from path validator if (pathValidator != null) { @@ -666,7 +666,7 @@ public class SystemFileFilterStringEditPane boolean showFilesOnly = filesOnlyCheckBox.getSelection(); boolean showSubDirs = !showFilesOnly; //subdirCheckBox.getSelection(); boolean showFiles = true; //fileCheckBox.getSelection(); - RemoteFileFilterString rffs = new RemoteFileFilterString(inputSubsystemFactory, folder, file); + RemoteFileFilterString rffs = new RemoteFileFilterString(inputSubsystemConfiguration, folder, file); rffs.setShowSubDirs(showSubDirs); rffs.setShowFiles(showFiles); //System.out.println("internalGetFilterString: showSubDirs = " + showSubDirs + ", showFiles = " + showFiles); @@ -795,7 +795,7 @@ public class SystemFileFilterStringEditPane // KM: defect 53009. // check if subsystem factory is non Unix and we're in new mode - if (newMode && inputSubsystemFactory != null && !inputSubsystemFactory.isUnixStyle()) { + if (newMode && inputSubsystemConfiguration != null && !inputSubsystemConfiguration.isUnixStyle()) { // check that folder combo is empty String folderComboText = folderCombo.getText().trim(); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAbstractRemoteFilePopupMenuExtensionAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAbstractRemoteFilePopupMenuExtensionAction.java index ec30b372201..236025d0feb 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAbstractRemoteFilePopupMenuExtensionAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAbstractRemoteFilePopupMenuExtensionAction.java @@ -37,7 +37,7 @@ import org.eclipse.ui.IObjectActionDelegate; *

  • {@link #getSelectedRemoteFiles()} *
  • {@link #getFirstSelectedRemoteFile()} *
  • {@link #getRemoteFileSubSystem()} - *
  • {@link #getRemoteFileSubSystemFactory()} + *
  • {@link #getRemoteFileSubSystemConfiguration()} * *

    * See also the convenience methods available in the parent class {@link SystemAbstractPopupMenuExtensionAction} @@ -133,9 +133,9 @@ public abstract class SystemAbstractRemoteFilePopupMenuExtensionAction * selected remote objects were resolved. This has some useful methods in it, * including isUnixStyle() indicating if this remote file system is unix or windows. */ - public IRemoteFileSubSystemConfiguration getRemoteFileSubSystemFactory() + public IRemoteFileSubSystemConfiguration getRemoteFileSubSystemConfiguration() { - return (IRemoteFileSubSystemConfiguration)getSubSystemFactory(); + return (IRemoteFileSubSystemConfiguration)getSubSystemConfiguration(); } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java index 792a1718b5d..c8fff27b39f 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java @@ -180,7 +180,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction { return; } - if (!destinationArchive.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) + if (!destinationArchive.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) { return; } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractAction.java index f90a95ed2f0..bb9f6cbdfcd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractAction.java @@ -193,7 +193,7 @@ public class SystemExtractAction extends SystemBaseAction if (selected != null && selected instanceof IRemoteFile) { IRemoteFile file = (IRemoteFile) selected; - if (file.isArchive() && file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) + if (file.isArchive() && file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) { _selected.add(file); enable = true; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterAction.java index 688136c187d..5f5dc584978 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterAction.java @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Shell; public class SystemNewFileFilterAction extends SystemNewFilterAction { - //private RemoteFileSubSystemFactory inputSubsystemFactory; + //private RemoteFileSubSystemConfiguration inputSubsystemConfiguration; /** * Constructor diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/FileServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/FileServicesPropertyPage.java index 446b4158baa..d2ee67f68a4 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/FileServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/FileServicesPropertyPage.java @@ -46,7 +46,7 @@ public class FileServicesPropertyPage extends ServicesPropertyPage FileServiceSubSystem subSystem = getFileServiceSubSystem(); IHost host = subSystem.getHost(); - _currentFactory = (IFileServiceSubSystemConfiguration)subSystem.getParentRemoteFileSubSystemFactory(); + _currentFactory = (IFileServiceSubSystemConfiguration)subSystem.getParentRemoteFileSubSystemConfiguration(); IFileServiceSubSystemConfiguration[] factories = getFileServiceSubSystemFactories(host.getSystemType()); @@ -84,12 +84,12 @@ public class FileServicesPropertyPage extends ServicesPropertyPage } - protected IServiceSubSystemConfiguration getCurrentServiceSubSystemFactory() + protected IServiceSubSystemConfiguration getCurrentServiceSubSystemConfiguration() { return _currentFactory; } - public void setSubSystemFactory(ISubSystemConfiguration factory) + public void setSubSystemConfiguration(ISubSystemConfiguration factory) { _currentFactory = (IFileServiceSubSystemConfiguration)factory; } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemAbstractRemoteFilePropertyPageExtensionAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemAbstractRemoteFilePropertyPageExtensionAction.java index 38f359907a1..d4628c6f74b 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemAbstractRemoteFilePropertyPageExtensionAction.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/SystemAbstractRemoteFilePropertyPageExtensionAction.java @@ -111,9 +111,9 @@ public abstract class SystemAbstractRemoteFilePropertyPageExtensionAction * selected remote objects were resolved. This has some useful methods in it, * including isUnixStyle() indicating if this remote file system is unix or windows. */ - public IRemoteFileSubSystemConfiguration getRemoteFileSubSystemFactory() + public IRemoteFileSubSystemConfiguration getRemoteFileSubSystemConfiguration() { - return (IRemoteFileSubSystemConfiguration)getSubSystemFactory(); + return (IRemoteFileSubSystemConfiguration)getSubSystemConfiguration(); } } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java index 5134c717e46..1a8b9337745 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java @@ -374,7 +374,7 @@ public class CombineForm extends SystemSelectRemoteFileOrFolderForm setAutoExpandDepth(0); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection); - IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration(); RemoteFileFilterString rffs = new RemoteFileFilterString(ssf); rffs.setShowFiles(fileMode); // no files if in folders mode rffs.setShowSubDirs(!fileMode || !filesOnlyMode); // yes folders, always, for now diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java index 991ec495e26..2ef3f2e8d87 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java @@ -260,7 +260,7 @@ public class ExtractToForm extends SystemSelectRemoteFileOrFolderForm setAutoExpandDepth(0); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection); - IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration(); RemoteFileFilterString rffs = new RemoteFileFilterString(ssf); rffs.setShowFiles(fileMode); // no files if in folders mode rffs.setShowSubDirs(!fileMode || !filesOnlyMode); // yes folders, always, for now diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java index ce96f7101d0..0b2aaeb4ced 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java @@ -1194,7 +1194,7 @@ public class SystemEditableRemoteFile implements ISystemEditableRemoteObject, IP SystemIFileProperties properties = new SystemIFileProperties(file); - String profileID = subsystem.getParentRemoteFileSubSystemFactory().getEditorProfileID(); + String profileID = subsystem.getParentRemoteFileSubSystemConfiguration().getEditorProfileID(); properties.setEditorProfileType(profileID); // need this to get a reference back to the object diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java index 2e76e4122c6..ac7ae699822 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java @@ -564,7 +564,7 @@ public class UniversalFileTransferUtility public static SystemRemoteResourceSet copyWorkspaceResourcesToRemote(SystemWorkspaceResourceSet workspaceSet, IRemoteFile targetFolder, IProgressMonitor monitor, boolean checkForCollisions) { boolean doSuperTransferPreference = RSEUIPlugin.getDefault().getPreferenceStore().getBoolean(ISystemPreferencesConstants.DOSUPERTRANSFER) - && targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + && targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); IRemoteFileSubSystem targetFS = targetFolder.getParentRemoteFileSubSystem(); SystemRemoteResourceSet resultSet = new SystemRemoteResourceSet(targetFS); @@ -593,7 +593,7 @@ public class UniversalFileTransferUtility return null; } boolean isTargetArchive = targetFolder.isArchive(); - if (isTargetArchive && !targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) return null; + if (isTargetArchive && !targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) return null; StringBuffer newPathBuf = new StringBuffer(targetFolder.getAbsolutePath()); if (isTargetArchive) { @@ -829,7 +829,7 @@ public class UniversalFileTransferUtility } boolean isTargetArchive = targetFolder.isArchive(); - if (isTargetArchive && !targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) return null; + if (isTargetArchive && !targetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) return null; StringBuffer newPathBuf = new StringBuffer(targetFolder.getAbsolutePath()); if (isTargetArchive) { @@ -970,7 +970,7 @@ public class UniversalFileTransferUtility public static void compressedCopyWorkspaceResourceToRemote(IContainer directory, IRemoteFile newTargetFolder, IProgressMonitor monitor) throws Exception { - if (!newTargetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) return; + if (!newTargetFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) return; if (ArchiveHandlerManager.isVirtual(newTargetFolder.getAbsolutePath())) { return; @@ -1102,7 +1102,7 @@ public class UniversalFileTransferUtility public static IResource compressedCopyRemoteResourceToWorkspace(IRemoteFile directory, IProgressMonitor monitor) throws Exception { - if (!directory.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) return null; + if (!directory.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) return null; IRemoteFile destinationArchive = null; IRemoteFile cpdest = null; File dest = null; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java index 05593fba26a..74dcef203c9 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java @@ -841,7 +841,7 @@ public class SystemSearchPage extends DialogPage implements ISearchPage { if (obj instanceof IRemoteFile) { IRemoteFile remoteFile = (IRemoteFile)obj; - boolean supportsArchiveManagement = remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); // if it's a file, but not an archive, get the file name, connection info, and parent folder name if (remoteFile.isFile() && (!remoteFile.isArchive() && !supportsArchiveManagement)) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemFactoryAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java similarity index 97% rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemFactoryAdapter.java rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemConfigurationAdapter.java index d431caf56e3..f705391ce75 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubSystemFactoryAdapter.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.SubsystemFactoryAdapter; +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 RemoteFileSubSystemFactoryAdapter extends SubsystemFactoryAdapter +public class RemoteFileSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter { SystemNewFileFilterAction _newFileFilterAction; diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemFactoryAdapterFactory.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java similarity index 94% rename from rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemFactoryAdapterFactory.java rename to rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java index c3e45d71143..657dfa79d14 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemFactoryAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java @@ -22,10 +22,10 @@ import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration; -public class RemoteFileSubsystemFactoryAdapterFactory implements IAdapterFactory +public class RemoteFileSubsystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteFileSubSystemFactoryAdapter(); + private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteFileSubSystemConfigurationAdapter(); /** * @see IAdapterFactory#getAdapterList() diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java index 1365be3014c..6454efa4ac1 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java @@ -280,8 +280,8 @@ public class SystemViewRemoteFileAdapter isVirtual = firstFile instanceof IVirtualRemoteFile; canEdit = firstFile.canRead(); - supportsSearch = firstFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsSearch(); - supportsArchiveManagement = firstFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + supportsSearch = firstFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsSearch(); + supportsArchiveManagement = firstFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); } else return; @@ -751,7 +751,7 @@ public class SystemViewRemoteFileAdapter public boolean hasChildren(Object element) { IRemoteFile file = (IRemoteFile) element; - boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); boolean hasChildren = false; if (file instanceof IVirtualRemoteFile) { @@ -796,7 +796,7 @@ public class SystemViewRemoteFileAdapter { file = (IRemoteFile) propertySourceInput; - boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); boolean isArchive = file != null && file.isArchive() && supportsArchiveManagement; boolean isVirtual = file != null && file instanceof IVirtualRemoteFile && supportsArchiveManagement; @@ -1228,7 +1228,7 @@ public class SystemViewRemoteFileAdapter if (element instanceof IRemoteFile) { IRemoteFile file = (IRemoteFile) element; - boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); return file.canRead() && file.canWrite() && (file.isDirectory() || file.isRoot() || (file.isArchive() && supportsArchiveManagement)); } @@ -1247,7 +1247,7 @@ public class SystemViewRemoteFileAdapter if (target instanceof IRemoteFile) { IRemoteFile targetFile = (IRemoteFile) target; - boolean supportsArchiveManagement = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); if (!targetFile.isFile() || (targetFile.isArchive() && supportsArchiveManagement)) { targetFile.canWrite(); @@ -1288,7 +1288,7 @@ public class SystemViewRemoteFileAdapter if (target instanceof IRemoteFile) { IRemoteFile targetFile = (IRemoteFile) target; - boolean supportsArchiveManagement = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = targetFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); if (!targetFile.isFile() || (targetFile.isArchive() && supportsArchiveManagement)) { // get properties @@ -1775,7 +1775,7 @@ public class SystemViewRemoteFileAdapter } /* DKM - not sure what this is doing here... * maybe there used to be a check for an archive - if (!srcFileOrFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) + if (!srcFileOrFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) { SystemMessage errorMessage = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_ERROR_ARCHIVEMANAGEMENT_NOTSUPPORTED); resultSet.setMessage(errorMessage); @@ -2449,9 +2449,9 @@ public class SystemViewRemoteFileAdapter { IRemoteFile file = (IRemoteFile) element; if (file.isDirectory()) - return file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().getFolderNameValidator(); + return file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().getFolderNameValidator(); else - return file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().getFileNameValidator(); + return file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().getFileNameValidator(); } return null; } @@ -2469,7 +2469,7 @@ public class SystemViewRemoteFileAdapter if (element instanceof IRemoteFile) { IRemoteFile file = (IRemoteFile) element; - if (file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().isUnixStyle()) + if (file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().isUnixStyle()) return newName; else return newName.toUpperCase(); @@ -2491,7 +2491,7 @@ public class SystemViewRemoteFileAdapter if (element instanceof IRemoteFile) { IRemoteFile file = (IRemoteFile) element; - if (file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().isUnixStyle()) + if (file.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().isUnixStyle()) return getName(element).equals(newName); else return getName(element).equalsIgnoreCase(newName); @@ -2548,7 +2548,7 @@ public class SystemViewRemoteFileAdapter * Return the subsystem factory id that owns this remote object * The value must not be translated, so that property pages registered via xml can subset by it. */ - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { IRemoteFile file = (IRemoteFile) element; return file.getParentRemoteFileSubSystem().getSubSystemConfiguration().getId(); @@ -2725,7 +2725,7 @@ public class SystemViewRemoteFileAdapter remoteFile.getParentRemoteFileSubSystem().getCommandSubSystem()); } */ - else if (!remoteFile.isArchive() || !remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement()) + else if (!remoteFile.isArchive() || !remoteFile.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement()) { // only handle double click if object is a file ISystemEditableRemoteObject editable = getEditableRemoteObject(remoteFile); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java index 2b9cacfe558..87d27c226dd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java @@ -299,7 +299,7 @@ public class SystemViewRemoteSearchResultAdapter extends AbstractSystemViewAdapt * Return the subsystem factory id that owns this remote object * The value must not be translated, so that property pages registered via xml can subset by it. */ - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { return null; } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java index 6ddfa96d3f3..e0ad4879cb0 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java @@ -179,7 +179,7 @@ public class SystemViewRemoteSearchResultSetAdapter extends AbstractSystemViewAd return null; } - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { return null; } diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java index 64a2d77f52d..b29478381cd 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java @@ -77,7 +77,7 @@ public class SystemQualifiedRemoteFolderCombo extends Composite private SystemHistoryCombo folderCombo = null; private Button browseButton = null; //private RemoteFileSubSystem subsystem = null; - //private RemoteFileSubSystemFactory subsystemFactory = null; + //private RemoteFileSubSystemConfiguration subsystemFactory = null; //private String subsystemFactoryID = null; //private IRemoteFile[] folders = null; private Hashtable resolvedFolders = new Hashtable(); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java index 6491a35a4b1..03b368f0f8a 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemRemoteFolderCombo.java @@ -69,7 +69,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo private SystemHistoryCombo folderCombo = null; private Button browseButton = null; //private RemoteFileSubSystem subsystem = null; - //private RemoteFileSubSystemFactory subsystemFactory = null; + //private RemoteFileSubSystemConfiguration subsystemFactory = null; private String[] systemTypes = null; private IHost connection = null; private boolean showNewConnectionPrompt = true; @@ -146,7 +146,7 @@ public class SystemRemoteFolderCombo extends Composite implements ISystemCombo /** * Set the input system connection to restrict the browse button to this connection only. - * Either call this or setSubSystemFactoryId. + * Either call this or setSubSystemConfigurationId. */ public void setSystemConnection(IHost connection) { diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java index 7865419a25d..8f2b76fc81f 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemSelectRemoteFileOrFolderForm.java @@ -288,7 +288,7 @@ public class SystemSelectRemoteFileOrFolderForm setAutoExpandDepth(1); ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); IRemoteFileSubSystem ss = RemoteFileUtility.getFileSubSystem(connection); - IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = ss.getParentRemoteFileSubSystemConfiguration(); RemoteFileFilterString rffs = new RemoteFileFilterString(ssf); rffs.setShowFiles(fileMode); // no files if in folders mode rffs.setShowSubDirs(!fileMode || !filesOnlyMode); // yes folders, always, for now @@ -397,7 +397,7 @@ public class SystemSelectRemoteFileOrFolderForm parentFolder = null; if (parentFolder != null) { - IRemoteFileSubSystemConfiguration ssf = selection.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = selection.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration(); boolean isUnix = ssf.isUnixStyle(); if (isUnix) setRestrictFolders(parentFolder.isRoot()); diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizard.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizard.java index e5ecdffe925..14a8c248d91 100644 --- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizard.java +++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizard.java @@ -331,7 +331,7 @@ public class SystemNewFileWizard { ISystemFilter filter = filterRef.getReferencedFilter(); IRemoteFileSubSystem parentSubSystem = (IRemoteFileSubSystem)filterRef.getSubSystem(); - IRemoteFileSubSystemConfiguration parentFactory = parentSubSystem.getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration parentFactory = parentSubSystem.getParentRemoteFileSubSystemConfiguration(); String[] filterStrings = filter.getFilterStrings(); RemoteFileFilterString rffs = null; Vector v = new Vector(); 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 98170e7bf30..77de157e7a4 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.RemoteProcessSubsystemFactoryAdapterFactory; +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); - RemoteProcessSubsystemFactoryAdapterFactory rpssfaf = new RemoteProcessSubsystemFactoryAdapterFactory(); + RemoteProcessSubsystemConfigurationAdapterFactory rpssfaf = new RemoteProcessSubsystemConfigurationAdapterFactory(); rpssfaf.registerWithManager(manager); } diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java index a952b3d4b9c..ee2f24c6225 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java @@ -88,7 +88,7 @@ public class SystemProcessFilterStringEditPane extends protected boolean skipUniquenessChecking; protected boolean calledFromVerify; protected boolean dontStealFocus; - protected IRemoteProcessSubSystemConfiguration inputSubsystemFactory = null; + protected IRemoteProcessSubSystemConfiguration inputSubsystemConfiguration = null; // actions protected SystemTestFilterStringAction testAction = null; @@ -223,9 +223,9 @@ public class SystemProcessFilterStringEditPane extends txtExeName.setFocus(); if (refProvider != null) - inputSubsystemFactory = (IRemoteProcessSubSystemConfiguration)((ISubSystem)refProvider).getSubSystemConfiguration(); + inputSubsystemConfiguration = (IRemoteProcessSubSystemConfiguration)((ISubSystem)refProvider).getSubSystemConfiguration(); else if (provider != null) - inputSubsystemFactory = (IRemoteProcessSubSystemConfiguration)provider; + inputSubsystemConfiguration = (IRemoteProcessSubSystemConfiguration)provider; IStructuredContentProvider p = new SystemProcessStatesContentProvider(); chkStatus.setContentProvider(p); diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/propertypages/ProcessServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/propertypages/ProcessServicesPropertyPage.java index b3c61dacd89..08966d237dd 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/propertypages/ProcessServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/propertypages/ProcessServicesPropertyPage.java @@ -44,7 +44,7 @@ public class ProcessServicesPropertyPage extends ServicesPropertyPage ProcessServiceSubSystem subSystem = getProcessServiceSubSystem(); IHost host = subSystem.getHost(); - _currentFactory = (IProcessServiceSubSystemConfiguration)subSystem.getParentRemoteProcessSubSystemFactory(); + _currentFactory = (IProcessServiceSubSystemConfiguration)subSystem.getParentRemoteProcessSubSystemConfiguration(); IProcessServiceSubSystemConfiguration[] factories = getProcessServiceSubSystemFactories(host.getSystemType()); @@ -81,12 +81,12 @@ public class ProcessServicesPropertyPage extends ServicesPropertyPage return (IProcessServiceSubSystemConfiguration[])results.toArray(new IProcessServiceSubSystemConfiguration[results.size()]); } - protected IServiceSubSystemConfiguration getCurrentServiceSubSystemFactory() + protected IServiceSubSystemConfiguration getCurrentServiceSubSystemConfiguration() { return _currentFactory; } - public void setSubSystemFactory(ISubSystemConfiguration factory) + public void setSubSystemConfiguration(ISubSystemConfiguration factory) { _currentFactory = (IProcessServiceSubSystemConfiguration)factory; } diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemFactoryAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java similarity index 93% rename from rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemFactoryAdapter.java rename to rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemConfigurationAdapter.java index c46e026ed95..42bb6900ed0 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubSystemFactoryAdapter.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.SubsystemFactoryAdapter; +import org.eclipse.rse.ui.view.SubsystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; -public class RemoteProcessSubSystemFactoryAdapter extends SubsystemFactoryAdapter +public class RemoteProcessSubSystemConfigurationAdapter extends SubsystemConfigurationAdapter { SystemNewProcessFilterAction _newProcessFilterAction; diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemFactoryAdapterFactory.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java similarity index 93% rename from rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemFactoryAdapterFactory.java rename to rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java index 41dd39d0b59..59f6f359a68 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemFactoryAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java @@ -22,10 +22,10 @@ import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; import org.eclipse.rse.subsystems.processes.core.subsystem.IRemoteProcessSubSystemConfiguration; -public class RemoteProcessSubsystemFactoryAdapterFactory implements IAdapterFactory +public class RemoteProcessSubsystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteProcessSubSystemFactoryAdapter(); + private ISubsystemConfigurationAdapter ssFactoryAdapter = new RemoteProcessSubSystemConfigurationAdapter(); /** * @see IAdapterFactory#getAdapterList() diff --git a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java index de0fc6c1ded..70e49e7a60a 100644 --- a/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java +++ b/rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java @@ -460,7 +460,7 @@ public class SystemViewRemoteProcessAdapter extends AbstractSystemViewAdapter * Return the subsystem factory id that owns this remote object * The value must not be translated, so that property pages registered via xml can subset by it. */ - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { IRemoteProcess process = (IRemoteProcess) element; return process.getParentRemoteProcessSubSystem().getSubSystemConfiguration().getId(); 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 7cac312a411..9e569c02166 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.ShellServiceSubsystemFactoryAdapterFactory; +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); - ShellServiceSubsystemFactoryAdapterFactory fac = new ShellServiceSubsystemFactoryAdapterFactory(); + ShellServiceSubsystemConfigurationAdapterFactory fac = new ShellServiceSubsystemConfigurationAdapterFactory(); fac.registerWithManager(manager); } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java index 7629569b2e6..d33b4de1c2c 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java @@ -135,7 +135,7 @@ public class RemoteCommandHelpers showInView(defaultShell, isCompile, cmdString); - IRemoteFileSubSystemConfiguration fileSSF = RemoteFileUtility.getFileSubSystemFactory(cmdSubSystem.getHost().getSystemType()); + IRemoteFileSubSystemConfiguration fileSSF = RemoteFileUtility.getFileSubSystemConfiguration(cmdSubSystem.getHost().getSystemType()); IRemoteFile pwd = ((RemoteCommandShell)defaultShell).getWorkingDirectory(); if (pwd == null || !pwd.getAbsolutePath().equals(path)) { diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java index 8862e29e04a..15049c63394 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java @@ -17,7 +17,7 @@ package org.eclipse.rse.shells.ui; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.ISubSystemFactoryCategories; +import org.eclipse.rse.model.ISubSystemConfigurationCategories; import org.eclipse.rse.model.ISystemResourceChangeEvent; import org.eclipse.rse.model.ISystemResourceChangeEvents; import org.eclipse.rse.subsystems.files.core.model.ISystemRemoteCommand; @@ -68,7 +68,7 @@ public class SystemRemoteCommandEntryForm extends Composite gridData.grabExcessVerticalSpace = false; setLayoutData(gridData); - sysConnCombo = new SystemHostCombo(this, SWT.NULL, null, false, ISubSystemFactoryCategories.SUBSYSTEM_CATEGORY_CMDS, false); + sysConnCombo = new SystemHostCombo(this, SWT.NULL, null, false, ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, false); sysConnCombo.setWidthHint(100); sysConnCombo.addSelectionListener( new SelectionAdapter() { @@ -134,7 +134,7 @@ public class SystemRemoteCommandEntryForm extends Composite IHost sysConn = sysConnCombo.getHost(); if ( sysConn != null ) { - //SubSystem[] cmdSubSystems = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemsBySubSystemFactoryCategory(ISubSystemFactoryCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); + //SubSystem[] cmdSubSystems = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); IRemoteCmdSubSystem[] cmdSubSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn); IRemoteCmdSubSystem currSubSystem = null; String subSystemName = subSysCombo.getText(); @@ -208,7 +208,7 @@ public class SystemRemoteCommandEntryForm extends Composite IHost sysConn = sysConnCombo.getHost(); if ( sysConn != null ) { - //subSystems = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemsBySubSystemFactoryCategory(ISubSystemFactoryCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); + //subSystems = RSEUIPlugin.getDefault().getSystemRegistry().getSubSystemsBySubSystemConfigurationCategory(ISubSystemConfigurationCategories.SUBSYSTEM_CATEGORY_CMDS, sysConn); subSystems = RemoteCommandHelpers.getCmdSubSystems(sysConn); for (int i = 0; i < subSystems.length; i++) { diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java index bbde67c93c4..78f62b11f17 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java @@ -58,7 +58,7 @@ public class ShellServicesPropertyPage extends ServicesPropertyPage else { host = subSystem.getHost(); - _currentFactory = (IShellServiceSubSystemConfiguration)subSystem.getParentRemoteCmdSubSystemFactory(); + _currentFactory = (IShellServiceSubSystemConfiguration)subSystem.getParentRemoteCmdSubSystemConfiguration(); factories = getShellServiceSubSystemFactories(host.getSystemType()); } @@ -97,12 +97,12 @@ public class ShellServicesPropertyPage extends ServicesPropertyPage } - protected IServiceSubSystemConfiguration getCurrentServiceSubSystemFactory() + protected IServiceSubSystemConfiguration getCurrentServiceSubSystemConfiguration() { return _currentFactory; } - public void setSubSystemFactory(ISubSystemConfiguration factory) + public void setSubSystemConfiguration(ISubSystemConfiguration factory) { _currentFactory = (IShellServiceSubSystemConfiguration)factory; } diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemFactoryAdapter.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java similarity index 96% rename from rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemFactoryAdapter.java rename to rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemConfigurationAdapter.java index 8061d28e193..f0de78dccca 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubSystemFactoryAdapter.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.SubsystemFactoryAdapter; +import org.eclipse.rse.ui.view.SubsystemConfigurationAdapter; import org.eclipse.swt.widgets.Shell; -public class ShellServiceSubSystemFactoryAdapter extends SubsystemFactoryAdapter +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/ShellServiceSubsystemFactoryAdapterFactory.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java similarity index 94% rename from rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemFactoryAdapterFactory.java rename to rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java index 1f4edbaf657..9fb43f9840a 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemFactoryAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java @@ -23,10 +23,10 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.IShell import org.eclipse.rse.subsystems.shells.core.subsystems.servicesubsystem.ShellServiceSubSystemConfiguration; -public class ShellServiceSubsystemFactoryAdapterFactory implements IAdapterFactory +public class ShellServiceSubsystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new ShellServiceSubSystemFactoryAdapter(); + private ISubsystemConfigurationAdapter ssFactoryAdapter = new ShellServiceSubSystemConfigurationAdapter(); /** * @see IAdapterFactory#getAdapterList() diff --git a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java index 8b5f8e8946d..3c3ad9c0b55 100644 --- a/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java +++ b/rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java @@ -399,7 +399,7 @@ public class SystemCommandsViewPart IRemoteCommandShell cmdShell = (IRemoteCommandShell)_folder.getInput(); SystemViewRemoteOutputAdapter adapter = (SystemViewRemoteOutputAdapter)((IAdaptable)cmdShell).getAdapter(ISystemViewElementAdapter.class); - _shellActions = adapter.getShellActions(cmdShell.getCommandSubSystem().getParentRemoteCmdSubSystemFactory()); + _shellActions = adapter.getShellActions(cmdShell.getCommandSubSystem().getParentRemoteCmdSubSystemConfiguration()); } else if (_shellActions != null) { 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 6788dd9630b..1ac5efe7623 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 @@ -182,7 +182,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu } menu.add(ISystemContextMenuConstants.GROUP_OPEN,_showInShellView); - getShellActions(cmdShell.getCommandSubSystem().getParentRemoteCmdSubSystemFactory()); + getShellActions(cmdShell.getCommandSubSystem().getParentRemoteCmdSubSystemConfiguration()); menu.add(ISystemContextMenuConstants.GROUP_CHANGE, _terminateShellAction); menu.add(ISystemContextMenuConstants.GROUP_CHANGE, _terminateRemoveShellAction); @@ -215,7 +215,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu _shellActions.add(new Separator()); - ShellServiceSubSystemFactoryAdapter factoryAdapter = (ShellServiceSubSystemFactoryAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); + ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); _exportShellOutputAction = factoryAdapter.getCommandShellOutputExportAction(shell); _shellActions.add(_exportShellOutputAction); @@ -632,7 +632,7 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu * Return the subsystem factory id that owns this remote object * The value must not be translated, so that property pages registered via xml can subset by it. */ - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { return null; } @@ -820,8 +820,8 @@ implements ISystemViewElementAdapter, ISystemRemoteElementAdapter, ISystemOutpu else if (element instanceof IRemoteCommandShell) { IRemoteCommandShell command = (IRemoteCommandShell) element; - IRemoteCmdSubSystemConfiguration factory = command.getCommandSubSystem().getParentRemoteCmdSubSystemFactory(); - ShellServiceSubSystemFactoryAdapter factoryAdapter = (ShellServiceSubSystemFactoryAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); + IRemoteCmdSubSystemConfiguration factory = command.getCommandSubSystem().getParentRemoteCmdSubSystemConfiguration(); + ShellServiceSubSystemConfigurationAdapter factoryAdapter = (ShellServiceSubSystemConfigurationAdapter)factory.getAdapter(ISubsystemConfigurationAdapter.class); ImageDescriptor imageDescriptor = null; if (command.isActive()) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemFactoryAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemConfigurationAPIProviderImpl.java similarity index 94% rename from rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemFactoryAPIProviderImpl.java rename to rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemConfigurationAPIProviderImpl.java index d491c76ffec..99f27420857 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemFactoryAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemConfigurationAPIProviderImpl.java @@ -28,7 +28,7 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConf * It is used when the intial connections are to be subset to those that support a particular remote file subsystem factory, * and subsystems shown within those connections are to be subset to only those from this subsystem factory. */ -public class SystemFileSubSystemFactoryAPIProviderImpl +public class SystemFileSubSystemConfigurationAPIProviderImpl extends SystemFileAPIProviderImpl implements ISystemFileAPIProvider { @@ -42,7 +42,7 @@ public class SystemFileSubSystemFactoryAPIProviderImpl * @param subsystemFactory The remote file subsystem factory. Users will drill down from connections that support this factory. * @param directoryMode true if you only want to traverse directories, false for both files and directories. */ - public SystemFileSubSystemFactoryAPIProviderImpl(IRemoteFileSubSystemConfiguration subsystemFactory, boolean directoryMode) + public SystemFileSubSystemConfigurationAPIProviderImpl(IRemoteFileSubSystemConfiguration subsystemFactory, boolean directoryMode) { super(directoryMode); this.subsystemFactory = subsystemFactory; @@ -51,7 +51,7 @@ public class SystemFileSubSystemFactoryAPIProviderImpl /** * Get the input subsystem object. */ - public IRemoteFileSubSystemConfiguration getSubSystemFactory() + public IRemoteFileSubSystemConfiguration getSubSystemConfiguration() { return subsystemFactory; } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java index bcd52e5d87b..422f5f2c088 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java @@ -51,7 +51,7 @@ public class RemoteFileFilterString implements Cloneable protected String path, file; protected String[] types; protected boolean subdirs, files, filterByTypes; - //private RemoteFileSubSystemFactory subsysFactory; + //private RemoteFileSubSystemConfiguration subsysFactory; protected String PATH_SEP = java.io.File.separator; public static final char TYPE_SEP = ','; public static final String TYPE_SEP_STRING = ","; @@ -103,7 +103,7 @@ public class RemoteFileFilterString implements Cloneable parse(path, input); } - public void setSubSystemFactory(IRemoteFileSubSystemConfiguration subsysFactory) + public void setSubSystemConfiguration(IRemoteFileSubSystemConfiguration subsysFactory) { PATH_SEP = subsysFactory.getSeparator(); } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java index 8113de3f374..2f89405b1f3 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java @@ -63,7 +63,7 @@ public class RemoteFileUtility return (IRemoteFileSubSystem[])results.toArray(new IRemoteFileSubSystem[results.size()]); } - public static IRemoteFileSubSystemConfiguration getFileSubSystemFactory(String systemType) + public static IRemoteFileSubSystemConfiguration getFileSubSystemConfiguration(String systemType) { ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISubSystemConfiguration[] sses = sr.getSubSystemConfigurationsBySystemType(systemType); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java index a156d7818e9..2551b1a04d6 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java @@ -701,7 +701,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I { if (_languageUtilityFactory == null) { - _languageUtilityFactory = ((IFileServiceSubSystemConfiguration)getParentRemoteFileSubSystemFactory()).getLanguageUtilityFactory(this); + _languageUtilityFactory = ((IFileServiceSubSystemConfiguration)getParentRemoteFileSubSystemConfiguration()).getLanguageUtilityFactory(this); } return _languageUtilityFactory; } @@ -735,7 +735,7 @@ public final class FileServiceSubSystem extends RemoteFileSubSystem implements I ISearchService searchService = getSearchService(); if (searchService != null) { - IFileServiceSubSystemConfiguration factory = (IFileServiceSubSystemConfiguration)getParentRemoteFileSubSystemFactory(); + IFileServiceSubSystemConfiguration factory = (IFileServiceSubSystemConfiguration)getParentRemoteFileSubSystemConfiguration(); if (factory != null) { return factory.createSearchConfiguration(getHost(), resultSet, searchTarget, searchString); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java index fdcfb55dc5a..ea6055d9d21 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java @@ -51,9 +51,9 @@ public interface IRemoteFileSubSystem extends ISubSystem{ // ---------------------- /** - * Return parent subsystem factory, cast to a RemoteFileSubSystemFactory + * Return parent subsystem factory, cast to a RemoteFileSubSystemConfiguration */ - public IRemoteFileSubSystemConfiguration getParentRemoteFileSubSystemFactory(); + public IRemoteFileSubSystemConfiguration getParentRemoteFileSubSystemConfiguration(); /** * Return true if file names are case-sensitive. Used when doing name or type filtering */ @@ -65,35 +65,35 @@ public interface IRemoteFileSubSystem extends ISubSystem{ /** * Return in string format the character used to separate folders. Eg, "\" or "/". *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getSeparator() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getSeparator() */ public String getSeparator(); /** * Return in character format the character used to separate folders. Eg, "\" or "/" *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getSeparatorChar() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getSeparatorChar() */ public char getSeparatorChar(); /** * Return in string format the character used to separate paths. Eg, ";" or ":" *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getPathSeparator() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getPathSeparator() */ public String getPathSeparator(); /** * Return in char format the character used to separate paths. Eg, ";" or ":" *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getPathSeparatorChar() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getPathSeparatorChar() */ public char getPathSeparatorChar(); /** * Return as a string the line separator. *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getLineSeparator() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getLineSeparator() */ public String getLineSeparator(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystemConfiguration.java index 454ac993fc5..7a6a3c097da 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystemConfiguration.java @@ -26,7 +26,7 @@ import org.eclipse.rse.ui.validators.ValidatorFolderName; * Specialization for file subsystem factories. */ /** - * @lastgen interface RemoteFileSubSystemFactory extends SubSystemFactory {} + * @lastgen interface RemoteFileSubSystemConfiguration extends SubSystemConfiguration {} */ public interface IRemoteFileSubSystemConfiguration extends ISubSystemConfiguration diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java index 3a604689666..e03a63b20f1 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java @@ -147,13 +147,13 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable /** * Return the parent subsystem factory */ - public IRemoteFileSubSystemConfiguration getParentRemoteFileSubSystemFactory() + public IRemoteFileSubSystemConfiguration getParentRemoteFileSubSystemConfiguration() { IRemoteFileSubSystem ss = _context.getParentRemoteFileSubSystem(); if (ss == null) return null; else - return ss.getParentRemoteFileSubSystemFactory(); + return ss.getParentRemoteFileSubSystemConfiguration(); } public void setParentRemoteFile(IRemoteFile parentFile) @@ -233,7 +233,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable */ public char getSeparatorChar() { - IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemConfiguration(); if (ssf != null) return ssf.getSeparatorChar(); else @@ -245,7 +245,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable */ public String getSeparator() { - IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemConfiguration(); if (ssf != null) return ssf.getSeparator(); else @@ -256,7 +256,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable */ public String getLineSeparator() { - IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemConfiguration(); if (ssf != null) return ssf.getLineSeparator(); else @@ -268,7 +268,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable */ public boolean isUnix() { - IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration ssf = getParentRemoteFileSubSystemConfiguration(); if (ssf != null) return ssf.isUnixStyle(); else @@ -687,7 +687,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable for (int i = 0; i < filesAndFolders.length; i++) { IRemoteFile fileOrFolder = (IRemoteFile)filesAndFolders[i]; - boolean supportsArchiveManagement = fileOrFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = fileOrFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); if (fileOrFolder.isFile() || (fileOrFolder.isArchive() && supportsArchiveManagement)) { results.add(fileOrFolder); @@ -702,7 +702,7 @@ public abstract class RemoteFile implements IRemoteFile, IAdaptable, Comparable for (int i = 0; i < filesAndFolders.length; i++) { IRemoteFile fileOrFolder = (IRemoteFile)filesAndFolders[i]; - boolean supportsArchiveManagement = fileOrFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement(); + boolean supportsArchiveManagement = fileOrFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement(); if (!fileOrFolder.isFile() || (fileOrFolder.isArchive() && supportsArchiveManagement)) { results.add(fileOrFolder); diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java index e49c6d27820..b7ad4528a59 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java @@ -137,10 +137,10 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi } /** - * Return parent subsystem factory, cast to a RemoteFileSubSystemFactory + * Return parent subsystem factory, cast to a RemoteFileSubSystemConfiguration * Assumes {@link #setSubSystemConfiguration(ISubSystemConfiguration)} has already been called. */ - public IRemoteFileSubSystemConfiguration getParentRemoteFileSubSystemFactory() + public IRemoteFileSubSystemConfiguration getParentRemoteFileSubSystemConfiguration() { return (IRemoteFileSubSystemConfiguration) super.getSubSystemConfiguration(); } @@ -176,7 +176,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi protected RemoteFileFilterString getFilterStringListRoots() { if (FILTERSTRING_LISTROOTS == null) - FILTERSTRING_LISTROOTS = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory()); + FILTERSTRING_LISTROOTS = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration()); return FILTERSTRING_LISTROOTS; } protected RemoteFileContext getDefaultContext() @@ -206,47 +206,47 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi /** * Return in string format the character used to separate folders. Eg, "\" or "/". *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getSeparator() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getSeparator() */ public String getSeparator() { - return getParentRemoteFileSubSystemFactory().getSeparator(); + return getParentRemoteFileSubSystemConfiguration().getSeparator(); } /** * Return in character format the character used to separate folders. Eg, "\" or "/" *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getSeparatorChar() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getSeparatorChar() */ public char getSeparatorChar() { - return getParentRemoteFileSubSystemFactory().getSeparatorChar(); + return getParentRemoteFileSubSystemConfiguration().getSeparatorChar(); } /** * Return in string format the character used to separate paths. Eg, ";" or ":" *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getPathSeparator() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getPathSeparator() */ public String getPathSeparator() { - return getParentRemoteFileSubSystemFactory().getPathSeparator(); + return getParentRemoteFileSubSystemConfiguration().getPathSeparator(); } /** * Return in char format the character used to separate paths. Eg, ";" or ":" *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getPathSeparatorChar() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getPathSeparatorChar() */ public char getPathSeparatorChar() { - return getParentRemoteFileSubSystemFactory().getPathSeparatorChar(); + return getParentRemoteFileSubSystemConfiguration().getPathSeparatorChar(); } /** * Return as a string the line separator. *
    - * Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getLineSeparator() + * Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getLineSeparator() */ public String getLineSeparator() { - return getParentRemoteFileSubSystemFactory().getLineSeparator(); + return getParentRemoteFileSubSystemConfiguration().getLineSeparator(); } @@ -281,7 +281,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi */ public boolean doesFilterStringMatch(String filterString, String remoteObjectAbsoluteName, boolean caseSensitive) { - RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), filterString); + RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), filterString); // ok, this is a tweak: if the absolute name has " -folder" at the end, that means it is a folder... if (remoteObjectAbsoluteName.endsWith(" -folder")) { @@ -313,7 +313,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi } // trick: use filter string code to parse remote absolute name - RemoteFileFilterString rmtName = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), remoteObjectAbsoluteName); + RemoteFileFilterString rmtName = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), remoteObjectAbsoluteName); boolean pathMatch = false; if (caseSensitive) pathMatch = container.equals(rmtName.getPath()); @@ -352,7 +352,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi */ public boolean doesFilterStringListContentsOf(ISystemFilterString filterString, String remoteObjectAbsoluteName) { - RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), filterString.getString()); + RemoteFileFilterString rffs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), filterString.getString()); String container = rffs.getPath(); if (container == null) return false; @@ -463,17 +463,17 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi else { // for defect 42095, we filter out redundancies... - RemoteFileFilterString currFS = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), allFilterStrings[currFilterStringIndex]); + RemoteFileFilterString currFS = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), allFilterStrings[currFilterStringIndex]); String currPath = currFS.getPath(); if (currPath == null) currPath = ""; boolean matchingPaths = false; - boolean caseSensitive = getParentRemoteFileSubSystemFactory().isCaseSensitive(); + boolean caseSensitive = getParentRemoteFileSubSystemConfiguration().isCaseSensitive(); // test if we are listing in the same folder as any previous filter string... // ... if we are not, we can save time and skip the redundancy checking.. for (int idx = 0; idx < currFilterStringIndex; idx++) { - RemoteFileFilterString prevFS = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), allFilterStrings[idx]); + RemoteFileFilterString prevFS = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), allFilterStrings[idx]); String prevPath = prevFS.getPath(); if (prevPath == null) prevPath = ""; @@ -549,7 +549,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi { this.monitor = monitor; boolean debugMode = false; - IRemoteFileSubSystemConfiguration rfssf = getParentRemoteFileSubSystemFactory(); + IRemoteFileSubSystemConfiguration rfssf = getParentRemoteFileSubSystemConfiguration(); boolean windows = !rfssf.isUnixStyle(); if (debugMode) SystemBasePlugin.logInfo("INTERNALRESOLVEFILTERSTRING: INPUT FILTERSTRING: " + filterString); @@ -721,7 +721,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi // this is all for defect 42095. Phil RemoteFileFilterString[] allFilterStrings = ((IRemoteFile) parent).getAllFilterStrings(); if (allFilterStrings == null) - fs = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), "*"); + fs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), "*"); else { boolean onlyOne = (allFilterStrings.length == 1); @@ -764,7 +764,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi } else { - fs = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), filterString); + fs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), filterString); } if (fs != null) { @@ -836,7 +836,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi */ public IRemoteFile[] listFolders(IRemoteFile parent, String fileNameFilter) { - RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory()); + RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration()); filterString.setPath(parent.getAbsolutePath()); filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter); filterString.setShowFiles(false); @@ -863,7 +863,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi */ public IRemoteFile[] listFiles(IRemoteFile parent, String fileNameFilter) { - RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory()); + RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration()); filterString.setPath(parent.getAbsolutePath()); filterString.setFile((fileNameFilter == null) ? "*" : fileNameFilter); filterString.setShowFiles(true); @@ -894,7 +894,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi { - RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory()); + RemoteFileFilterString filterString = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration()); filterString.setPath(parent.getAbsolutePath()); if (fileNameFilter == null) fileNameFilter = "*"; @@ -1678,7 +1678,7 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi public Object getTargetForFilter(ISystemFilterReference filterRef) { String firstFilterString = ((ISystemFilterReference)filterRef).getReferencedFilter().getFilterStrings()[0]; - RemoteFileFilterString fs = new RemoteFileFilterString(getParentRemoteFileSubSystemFactory(), firstFilterString); + RemoteFileFilterString fs = new RemoteFileFilterString(getParentRemoteFileSubSystemConfiguration(), firstFilterString); try { // change target to be referenced remote folder diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java index 41554a168fb..31db6cd6d60 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java @@ -124,7 +124,7 @@ public class ValidatorFileUniqueName protected ValidatorFileName getFileNameValidator() { if (fileNameValidator == null) - fileNameValidator = parentFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().getFileNameValidator();; + fileNameValidator = parentFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().getFileNameValidator();; return fileNameValidator; } /** @@ -134,7 +134,7 @@ public class ValidatorFileUniqueName protected ValidatorFolderName getFolderNameValidator() { if (folderNameValidator == null) - folderNameValidator = parentFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().getFolderNameValidator(); + folderNameValidator = parentFolder.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().getFolderNameValidator(); return folderNameValidator; } diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java index 42f974db580..90b4ea144f2 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java @@ -158,7 +158,7 @@ public class LocalFileSubSystemConfiguration extends FileServiceSubSystemConfigu } /* (non-Javadoc) - * @see com.ibm.etools.systems.subsystems.SubSystemFactory#supportsFileTypes() + * @see com.ibm.etools.systems.subsystems.SubSystemConfiguration#supportsFileTypes() */ public boolean supportsFileTypes() { return false; diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/RemoteProcessSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/RemoteProcessSubSystem.java index 2d80b3b509c..ee4e42019df 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/RemoteProcessSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/RemoteProcessSubSystem.java @@ -34,9 +34,9 @@ public interface RemoteProcessSubSystem extends ISubSystem // ---------------------- /** - * Return parent subsystem factory, cast to a RemoteProcessSubSystemFactory + * Return parent subsystem factory, cast to a RemoteProcessSubSystemConfiguration */ - public IRemoteProcessSubSystemConfiguration getParentRemoteProcessSubSystemFactory(); + public IRemoteProcessSubSystemConfiguration getParentRemoteProcessSubSystemConfiguration(); /** * Return true if names are case-sensitive. Used when doing name or type filtering diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java index 76856ce3969..b404984ffcd 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java @@ -30,7 +30,7 @@ import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorServerPortInput; /** - * The implementation of the RemoteProcessSubSystemFactory interface + * The implementation of the RemoteProcessSubSystemConfiguration interface * Contains information about what features the subsystem supports * @author mjberger * diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java index ab7b1e817e7..6cb0e21b116 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java @@ -55,9 +55,9 @@ public abstract class RemoteProcessSubSystemImpl extends SubSystem implements } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.core.subsystem.RemoteProcessSubSystem#getParentRemoteProcessSubSystemFactory() + * @see org.eclipse.rse.subsystems.processes.core.subsystem.RemoteProcessSubSystem#getParentRemoteProcessSubSystemConfiguration() */ - public IRemoteProcessSubSystemConfiguration getParentRemoteProcessSubSystemFactory() + public IRemoteProcessSubSystemConfiguration getParentRemoteProcessSubSystemConfiguration() { return (IRemoteProcessSubSystemConfiguration) super.getSubSystemConfiguration(); } diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java index d3c01a8a906..30f950941fb 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java @@ -146,7 +146,7 @@ public class ProcessServiceSubSystem extends RemoteProcessSubSystemImpl implemen } /* (non-Javadoc) - * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystem#switchServiceFactory(org.eclipse.rse.core.servicesubsystem.IServiceSubSystemFactory) + * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystem#switchServiceFactory(org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration) */ public void switchServiceFactory(IServiceSubSystemConfiguration fact) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java index 71a5dd11d0b..9ea8a6c995c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java @@ -42,7 +42,7 @@ public abstract class ProcessServiceSubSystemConfiguration extends RemoteProcess } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemFactory#getProcessService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#getProcessService(org.eclipse.rse.model.IHost) */ public IProcessService getProcessService(IHost host) { @@ -56,7 +56,7 @@ public abstract class ProcessServiceSubSystemConfiguration extends RemoteProcess } /* (non-Javadoc) - * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystemFactory#getServiceType() + * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration#getServiceType() */ public final Class getServiceType() { @@ -64,7 +64,7 @@ public abstract class ProcessServiceSubSystemConfiguration extends RemoteProcess } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.SubSystemFactory#supportsServerLaunchProperties(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.model.IHost) */ public boolean supportsServerLaunchProperties(IHost host) { @@ -72,7 +72,7 @@ public abstract class ProcessServiceSubSystemConfiguration extends RemoteProcess } /* (non-Javadoc) - * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystemFactory#getService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.servicesubsystem.IServiceSubSystemConfiguration#getService(org.eclipse.rse.model.IHost) */ public IService getService(IHost host) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java index ee52b1ebb78..206697d9dd1 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java @@ -47,7 +47,7 @@ public class DStoreProcessSubSystemConfiguration extends ProcessServiceSubSystem } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.SubSystemFactory#createSubSystemInternal(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#createSubSystemInternal(org.eclipse.rse.model.IHost) */ public ISubSystem createSubSystemInternal(IHost host) { @@ -85,7 +85,7 @@ public class DStoreProcessSubSystemConfiguration extends ProcessServiceSubSystem } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemFactory#createProcessService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#createProcessService(org.eclipse.rse.model.IHost) */ public IProcessService createProcessService(IHost host) { @@ -94,7 +94,7 @@ public class DStoreProcessSubSystemConfiguration extends ProcessServiceSubSystem } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemFactory#getHostProcessAdapter() + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#getHostProcessAdapter() */ public IHostProcessToRemoteProcessAdapter getHostProcessAdapter() { @@ -106,7 +106,7 @@ public class DStoreProcessSubSystemConfiguration extends ProcessServiceSubSystem } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemFactory#getConnectorService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.model.IHost) */ public IConnectorService getConnectorService(IHost host) { diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java index e2fb487d42f..4c2a5ca293b 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java @@ -86,7 +86,7 @@ public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemC } /* (non-Javadoc) - * @see org.eclipse.rse.core.subsystems.ISubSystemFactory#getConnectorService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.model.IHost) */ public IConnectorService getConnectorService(IHost host) { @@ -94,7 +94,7 @@ public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemC } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemFactory#createProcessService(org.eclipse.rse.model.IHost) + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#createProcessService(org.eclipse.rse.model.IHost) */ public IProcessService createProcessService(IHost host) { @@ -103,7 +103,7 @@ public class LocalProcessSubSystemConfiguration extends ProcessServiceSubSystemC } /* (non-Javadoc) - * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemFactory#getHostProcessAdapter() + * @see org.eclipse.rse.subsystems.processes.servicesubsystem.IProcessServiceSubSystemConfiguration#getHostProcessAdapter() */ public IHostProcessToRemoteProcessAdapter getHostProcessAdapter() { diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java index 9a759f1414e..760ec9bf7cc 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java @@ -78,9 +78,9 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd } /** - * Return parent subsystem factory, cast to a RemoteCmdSubSystemFactory + * Return parent subsystem factory, cast to a RemoteCmdSubSystemConfiguration */ - public IRemoteCmdSubSystemConfiguration getParentRemoteCmdSubSystemFactory() + public IRemoteCmdSubSystemConfiguration getParentRemoteCmdSubSystemConfiguration() { return (IRemoteCmdSubSystemConfiguration) super.getSubSystemConfiguration(); } @@ -146,7 +146,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd * a pair of String arrays: the first is the environment variable names, the * second is the corresponding environment variable values. *

    - * Note, this calls getParentSubSystemFactory().saveSubSystem(this) for you. + * Note, this calls getParentSubSystemConfiguration().saveSubSystem(this) for you. */ public void setEnvironmentVariableList(String[] envVarNames, String[] envVarValues) { @@ -181,7 +181,7 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd { /* * FIXME RemoteSystemEnvVar rsev = - * SubSystemFactoryImpl.getSSMOFfactory().createRemoteSystemEnvVar(); + * SubSystemConfigurationImpl.getSSMOFfactory().createRemoteSystemEnvVar(); * rsev.setName(name); rsev.setValue(value); * addEnvironmentVariable(rsev); */ diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java index 65e42be0d96..64006f4d653 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java @@ -85,7 +85,7 @@ public class RemoteCommandFilterString implements Cloneable this(subsysFactory); } - public void setSubSystemFactory(IRemoteCmdSubSystemConfiguration subsysFactory) + public void setSubSystemConfiguration(IRemoteCmdSubSystemConfiguration subsysFactory) { } diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java index 50cfade6c3a..c2976e7575c 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java @@ -88,7 +88,7 @@ public abstract class RemoteCommandShellOperation implements ISystemResourceChan _cmdSubSystem = cmdSubSystem; _shell = shell; _commandStack = new Stack(); - _cmdSeparator = _cmdSubSystem.getParentRemoteCmdSubSystemFactory().getCommandSeparator(); + _cmdSeparator = _cmdSubSystem.getParentRemoteCmdSubSystemConfiguration().getCommandSeparator(); } public void setWorkingDirectory(IRemoteFile pwd) diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java index f43164e299e..7199bce7ec3 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java @@ -35,9 +35,9 @@ public interface IRemoteCmdSubSystem extends ISubSystem{ /** - * Return parent subsystem factory, cast to a RemoteCmdSubSystemFactory + * Return parent subsystem factory, cast to a RemoteCmdSubSystemConfiguration */ - public IRemoteCmdSubSystemConfiguration getParentRemoteCmdSubSystemFactory(); + public IRemoteCmdSubSystemConfiguration getParentRemoteCmdSubSystemConfiguration(); /** * Execute a remote command. This is only applicable if the subsystem factory reports diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystemConfiguration.java index c3b2a4ba8eb..20e6123cb07 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystemConfiguration.java @@ -22,7 +22,7 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; // /** - * @lastgen interface RemoteCmdSubSystemFactory extends SubSystemFactory {} + * @lastgen interface RemoteCmdSubSystemConfiguration extends SubSystemConfiguration {} */ public interface IRemoteCmdSubSystemConfiguration extends ISubSystemConfiguration { diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/IShellServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/IShellServiceSubSystemConfiguration.java index 6121e3b6898..9439ce2ed61 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/IShellServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/IShellServiceSubSystemConfiguration.java @@ -26,7 +26,7 @@ import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystemConf /** - * @lastgen interface DefaultCmdSubSystemFactory extends RemoteCmdSubSystemFactory {} + * @lastgen interface DefaultCmdSubSystemConfiguration extends RemoteCmdSubSystemConfiguration {} */ public interface IShellServiceSubSystemConfiguration extends IRemoteCmdSubSystemConfiguration, IServiceSubSystemConfiguration { @@ -34,4 +34,4 @@ public interface IShellServiceSubSystemConfiguration extends IRemoteCmdSubSystem public IShellService createShellService(IHost host); public IServiceCommandShell createRemoteCommandShell(IRemoteCmdSubSystem cmdSS, IHostShell hostShell); -} //DefaultCmdSubSystemFactory \ No newline at end of file +} //DefaultCmdSubSystemConfiguration \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java index 0fcaf21c2bb..8d286823abc 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java @@ -183,7 +183,7 @@ public final class ShellServiceSubSystem extends RemoteCmdSubSystem implements I protected IServiceCommandShell createRemoteCommandShell(IRemoteCmdSubSystem cmdSS, IHostShell hostShell) { - IShellServiceSubSystemConfiguration config = (IShellServiceSubSystemConfiguration)getParentRemoteCmdSubSystemFactory(); + IShellServiceSubSystemConfiguration config = (IShellServiceSubSystemConfiguration)getParentRemoteCmdSubSystemConfiguration(); return config.createRemoteCommandShell(cmdSS, hostShell); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index 9ed8d09332d..c7b7ed7c772 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -1198,7 +1198,7 @@ public class SystemView extends TreeViewer implements ISystemTree, else { logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------"); - logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemFactoryId(firstSelection)); + logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection)); logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection)); logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection)); logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection)); 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 1f551c7a7eb..39752cb8115 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.SubsystemFactoryAdapterFactory; +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; @@ -514,7 +514,7 @@ public class RSEUIPlugin extends SystemBasePlugin // DKM // for subsystem factories - SubsystemFactoryAdapterFactory ssfaf = new SubsystemFactoryAdapterFactory(); + SubsystemConfigurationAdapterFactory ssfaf = new SubsystemConfigurationAdapterFactory(); ssfaf.registerWithManager(manager); RSESystemTypeAdapterFactory rseSysTypeFactory = new RSESystemTypeAdapterFactory(); @@ -714,7 +714,7 @@ public class RSEUIPlugin extends SystemBasePlugin { for (int idx=0; idx < proxies.length; idx++) { - //System.out.println("In shutdown. proxy " + proxies[idx].getId() + " active? " + proxies[idx].isSubSystemFactoryActive()); + //System.out.println("In shutdown. proxy " + proxies[idx].getId() + " active? " + proxies[idx].isSubSystemConfigurationActive()); if (proxies[idx].isSubSystemConfigurationActive()) { ISubSystemConfiguration ssf = proxies[idx].getSubSystemConfiguration(); @@ -784,16 +784,16 @@ public class RSEUIPlugin extends SystemBasePlugin // and then just used later by subsystems. The system types do not // appear until there is a subsystem factory that is registered for // this type. - boolean usedBySubSystemFactory = false; - for (int proxyIdx=0; !usedBySubSystemFactory && (proxyIdx{@link #getRemoteAdapter(Object)} * *

  • {@link #getSubSystem()} - *
  • {@link #getSubSystemFactory()} + *
  • {@link #getSubSystemConfiguration()} *
  • {@link #getSystemConnection()} * *
  • {@link #getRemoteObjectName(Object obj, ISystemRemoteElementAdapter adapter)} - *
  • {@link #getRemoteObjectSubSystemFactoryId(Object obj, ISystemRemoteElementAdapter adapter)} + *
  • {@link #getRemoteObjectSubSystemConfigurationId(Object obj, ISystemRemoteElementAdapter adapter)} *
  • {@link #getRemoteObjectTypeCategory(Object obj, ISystemRemoteElementAdapter adapter)} *
  • {@link #getRemoteObjectType(Object obj, ISystemRemoteElementAdapter adapter)} *
  • {@link #getRemoteObjectSubType(Object obj, ISystemRemoteElementAdapter adapter)} @@ -283,11 +283,11 @@ public abstract class SystemAbstractPopupMenuExtensionAction implements IObjectA } /** * Returns the id of the subsystem factory of the given remote object, given its remote object adapter. - * Same as adapter.getSubSystemFactoryId(obj); + * Same as adapter.getSubSystemConfigurationId(obj); */ - public String getRemoteObjectSubSystemFactoryId(Object obj, ISystemRemoteElementAdapter adapter) + public String getRemoteObjectSubSystemConfigurationId(Object obj, ISystemRemoteElementAdapter adapter) { - return adapter.getSubSystemFactoryId(obj); + return adapter.getSubSystemConfigurationId(obj); } /** * Returns the type category of the given remote object, given its remote object adapter. @@ -335,7 +335,7 @@ public abstract class SystemAbstractPopupMenuExtensionAction implements IObjectA /** * Returns the subsystem factory which owns the subsystem from which the selected remote objects were resolved */ - public ISubSystemConfiguration getSubSystemFactory() + public ISubSystemConfiguration getSubSystemConfiguration() { ISubSystem ss = getSubSystem(); if (ss != null) @@ -380,7 +380,7 @@ public abstract class SystemAbstractPopupMenuExtensionAction implements IObjectA System.out.println("REMOTE INFORMATION FOR FIRST SELECTION"); System.out.println("--------------------------------------"); System.out.println("Remote object name................: " + getRemoteObjectName(obj,adapter)); - System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemFactoryId(obj,adapter)); + System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemConfigurationId(obj,adapter)); System.out.println("Remote object type category.......: " + getRemoteObjectTypeCategory(obj,adapter)); System.out.println("Remote object type ...............: " + getRemoteObjectType(obj,adapter)); System.out.println("Remote object subtype ............: " + getRemoteObjectSubType(obj,adapter)); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java index 11bad746334..03a92224735 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java @@ -174,7 +174,7 @@ public class SystemTestFilterStringDialog { this.subsystem = subsystem; this.filterString = filterString; - //this.subsystemFactoryId = subsystem.getParentSubSystemFactory().getId(); + //this.subsystemFactoryId = subsystem.getParentSubSystemConfiguration().getId(); inputProvider.setSubSystem(subsystem); inputProvider.setFilterString(filterString); tree.reset(inputProvider); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ISystemConnectionWizardPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ISystemConnectionWizardPropertyPage.java index 09c86635a80..8c4ca3085e4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ISystemConnectionWizardPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ISystemConnectionWizardPropertyPage.java @@ -26,7 +26,7 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; public interface ISystemConnectionWizardPropertyPage { public boolean applyValues(IConnectorService subsystem); - public void setSubSystemFactory(ISubSystemConfiguration factory); + public void setSubSystemConfiguration(ISubSystemConfiguration factory); public void setHostname(String hostname); public void setSystemType(String systemType); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerConnectionSecurityPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerConnectionSecurityPropertyPage.java index 7f1f6be7410..25f6ff9caee 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerConnectionSecurityPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerConnectionSecurityPropertyPage.java @@ -101,7 +101,7 @@ public class ServerConnectionSecurityPropertyPage extends SystemBasePropertyPage return true; } - public void setSubSystemFactory(ISubSystemConfiguration factory) + public void setSubSystemConfiguration(ISubSystemConfiguration factory) { } 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 41e174ede95..1ac8093227f 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 @@ -95,7 +95,7 @@ public class ServerLauncherPropertyPage extends SystemBasePropertyPage implement return true; } - public void setSubSystemFactory(ISubSystemConfiguration factory) + public void setSubSystemConfiguration(ISubSystemConfiguration factory) { _factory = factory; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java index b2e6e8ca8a9..ef96b8da129 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServicesPropertyPage.java @@ -64,7 +64,7 @@ public abstract class ServicesPropertyPage extends SystemBasePropertyPage } protected abstract ServiceElement[] getServiceElements(); - protected abstract IServiceSubSystemConfiguration getCurrentServiceSubSystemFactory(); + protected abstract IServiceSubSystemConfiguration getCurrentServiceSubSystemConfiguration(); public boolean performOk() { @@ -97,7 +97,7 @@ public abstract class ServicesPropertyPage extends SystemBasePropertyPage FactoryServiceElement selectedService = (FactoryServiceElement)_form.getSelectedService(); IServiceSubSystemConfiguration factory = (IServiceSubSystemConfiguration)selectedService.getFactory(); - IServiceSubSystemConfiguration currentFactory = getCurrentServiceSubSystemFactory(); + IServiceSubSystemConfiguration currentFactory = getCurrentServiceSubSystemConfiguration(); if (factory != currentFactory) { getServiceSubSystem().switchServiceFactory(factory); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java index a30a1f46950..eda944aee54 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java @@ -134,9 +134,9 @@ public abstract class SystemAbstractPropertyPageExtensionAction /** * Returns the id of the subsystem factory of the input remote object. */ - public String getRemoteObjectSubSystemFactoryId() + public String getRemoteObjectSubSystemConfigurationId() { - return getRemoteAdapter().getSubSystemFactoryId(getRemoteObject()); + return getRemoteAdapter().getSubSystemConfigurationId(getRemoteObject()); } /** * Returns the type category of the input remote object @@ -176,7 +176,7 @@ public abstract class SystemAbstractPropertyPageExtensionAction /** * Returns the subsystem factory which owns the subsystem from which the input remote object was resolved */ - public ISubSystemConfiguration getSubSystemFactory() + public ISubSystemConfiguration getSubSystemConfiguration() { ISubSystem ss = getSubSystem(); if (ss != null) @@ -209,7 +209,7 @@ public abstract class SystemAbstractPropertyPageExtensionAction Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns); //System.out.println("Remote object name................: " + getRemoteObjectName()); - //System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemFactoryId()); + //System.out.println("Remote object subsystem factory id: " + getRemoteObjectSubSystemConfigurationId()); //System.out.println("Remote object type category.......: " + getRemoteObjectTypeCategory()); //System.out.println("Remote object type ...............: " + getRemoteObjectType()); //System.out.println("Remote object subtype ............: " + getRemoteObjectSubType()); @@ -219,7 +219,7 @@ public abstract class SystemAbstractPropertyPageExtensionAction SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectName())); SystemWidgetHelpers.createLabel(composite_prompts, "Remote object subsystem factory id: "); - SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubSystemFactoryId())); + SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectSubSystemConfigurationId())); SystemWidgetHelpers.createLabel(composite_prompts, "Remote object type category: "); SystemWidgetHelpers.createLabel(composite_prompts, checkForNull(getRemoteObjectTypeCategory())); 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 d89baa89266..6f96277ffa1 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 @@ -219,7 +219,7 @@ public class SystemChangeFilterPropertyPage extends SystemBasePropertyPage } changeFilterPane.setSystemFilterPoolManagerProvider(selectedFilter.getProvider()); - ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemFactory(selectedFilter); + ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemConfiguration(selectedFilter); ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssf.getAdapter(ISubsystemConfigurationAdapter.class); adapter.customizeChangeFilterPropertyPage(ssf, this, selectedFilter, shell); 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 a92ebdba500..5e76ab91215 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 @@ -74,7 +74,7 @@ public class SystemFilterStringPropertyPage extends SystemBasePropertyPage imple RSEUIPlugin sp = RSEUIPlugin.getDefault(); } - // configuration methods, called by customizeFilterStringPropertyPage in SubSystemFactoryImpl... + // configuration methods, called by customizeFilterStringPropertyPage in SubSystemConfigurationImpl... /** * Configuration method
    diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemFactoryPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java similarity index 86% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemFactoryPropertyPage.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java index 13e7d45dc31..d71d64a9984 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemFactoryPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java @@ -22,7 +22,7 @@ import org.eclipse.rse.ui.SystemPropertyResources; import org.eclipse.rse.ui.SystemResources; import org.eclipse.rse.ui.SystemWidgetHelpers; import org.eclipse.rse.ui.view.SystemViewResources; -import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemFactoryNode; +import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationNode; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; @@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Label; * The property page for subsystem factory nodes in the Team view. * This is an output-only page. */ -public class SystemTeamViewSubSystemFactoryPropertyPage extends SystemBasePropertyPage +public class SystemTeamViewSubSystemConfigurationPropertyPage extends SystemBasePropertyPage implements ISystemMessages { @@ -43,7 +43,7 @@ public class SystemTeamViewSubSystemFactoryPropertyPage extends SystemBaseProper /** * Constructor for SystemFilterPropertyPage */ - public SystemTeamViewSubSystemFactoryPropertyPage() + public SystemTeamViewSubSystemConfigurationPropertyPage() { super(); } @@ -95,11 +95,11 @@ public class SystemTeamViewSubSystemFactoryPropertyPage extends SystemBaseProper /** * Get the input team view subsystem factory node */ - protected ISubSystemConfiguration getSubSystemFactory() + protected ISubSystemConfiguration getSubSystemConfiguration() { Object element = getElement(); - SystemTeamViewSubSystemFactoryNode ssfNode = (SystemTeamViewSubSystemFactoryNode)element; - return ssfNode.getSubSystemFactory(); + SystemTeamViewSubSystemConfigurationNode ssfNode = (SystemTeamViewSubSystemConfigurationNode)element; + return ssfNode.getSubSystemConfiguration(); } /** @@ -108,15 +108,15 @@ public class SystemTeamViewSubSystemFactoryPropertyPage extends SystemBaseProper protected void doInitializeFields() { initDone = true; - ISubSystemConfiguration ssf = getSubSystemFactory(); - ISubSystemConfigurationProxy proxy = ssf.getSubSystemFactoryProxy(); + ISubSystemConfiguration ssf = getSubSystemConfiguration(); + ISubSystemConfigurationProxy proxy = ssf.getSubSystemConfigurationProxy(); // populate GUI... labelName.setText(ssf.getName()); labelId.setText(proxy.getId()); labelVendor.setText(proxy.getVendor()); String systypes = ""; String[] types = ssf.getSystemTypes(); - if (ssf.getSubSystemFactoryProxy().supportsAllSystemTypes()) + if (ssf.getSubSystemConfigurationProxy().supportsAllSystemTypes()) { systypes = SystemResources.TERM_ALL; } 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 3f6d4e06f19..f61910aca3d 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 @@ -1400,7 +1400,7 @@ public abstract class AbstractSystemViewAdapter return false; String[] values = tokenize(value); //System.out.println("Nbr of values: " + (values.length)); - //System.out.println("Comparing against: " + (ss.getParentSubSystemFactory().getId())); + //System.out.println("Comparing against: " + (ss.getParentSubSystemConfiguration().getId())); boolean ok = false; for (int idx=0; !ok && (idx 0 ) @@ -605,7 +605,7 @@ public class SubsystemFactoryAdapter implements ISubsystemConfigurationAdapter, ISystemFilterPoolReferenceManager refMgr = selectedSubSystem.getSystemFilterPoolReferenceManager(); ISystemFilterPool[] refdPools = refMgr.getReferencedSystemFilterPools(); if (refdPools.length == 0) - SystemBasePlugin.logInfo("SubSystemFactoryImpl::getSubSystemActions - getReferencedSystemFilterPools returned array of length zero."); + SystemBasePlugin.logInfo("SubSystemConfigurationImpl::getSubSystemActions - getReferencedSystemFilterPools returned array of length zero."); // so there already exists references to more than one filter pool, but it might simply be a reference // to the default filter pool in the user's profile and another to reference to the default filter pool in // the team profile... let's see... diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemFactoryAdapterFactory.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java similarity index 94% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemFactoryAdapterFactory.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java index 8a674d1d211..dfb02229972 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemFactoryAdapterFactory.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java @@ -22,10 +22,10 @@ import org.eclipse.rse.core.subsystems.ISubSystemConfiguration; import org.eclipse.rse.core.subsystems.util.ISubsystemConfigurationAdapter; -public class SubsystemFactoryAdapterFactory implements IAdapterFactory +public class SubsystemConfigurationAdapterFactory implements IAdapterFactory { - private ISubsystemConfigurationAdapter ssFactoryAdapter = new SubsystemFactoryAdapter(); + private ISubsystemConfigurationAdapter ssFactoryAdapter = new SubsystemConfigurationAdapter(); /** * @see IAdapterFactory#getAdapterList() diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java index ea9049b0f5c..872229c27a5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemSelectRemoteObjectAPIProviderImpl.java @@ -278,7 +278,7 @@ public class SystemSelectRemoteObjectAPIProviderImpl { /** FIXME - can't be coupled with IRemoteFile RemoteFileFilterString rffs = - new RemoteFileFilterString((IRemoteFileSubSystemFactory)getSubSystemFactory(selectedObject), inputFilterString); + new RemoteFileFilterString((IRemoteFileSubSystemConfiguration)getSubSystemConfiguration(selectedObject), inputFilterString); rffs.setFile(filterSuffix); result = rffs.toString(); */ @@ -296,11 +296,11 @@ public class SystemSelectRemoteObjectAPIProviderImpl */ public boolean filtersNeedDecoration(Object selectedObject) { - ISubSystemConfiguration ssf = getSubSystemFactory(selectedObject); + ISubSystemConfiguration ssf = getSubSystemConfiguration(selectedObject); if (ssf == null) return false; /** FIXME - can't be coupled with IRemoteFile - return ((ssf instanceof IRemoteFileSubSystemFactory) && (filterSuffix != null)); + return ((ssf instanceof IRemoteFileSubSystemConfiguration) && (filterSuffix != null)); */ return false; @@ -309,7 +309,7 @@ public class SystemSelectRemoteObjectAPIProviderImpl /** * get subsystem factory from filter or filter string */ - private ISubSystemConfiguration getSubSystemFactory(Object selectedObject) + private ISubSystemConfiguration getSubSystemConfiguration(Object selectedObject) { if (selectedObject instanceof ISystemFilterReference) { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java index 9ed8d09332d..c7b7ed7c772 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java @@ -1198,7 +1198,7 @@ public class SystemView extends TreeViewer implements ISystemTree, else { logMyDebugMessage(this.getClass().getName(),": -----------------------------------------------------------"); - logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemFactoryId(firstSelection)); + logMyDebugMessage(this.getClass().getName(),": REMOTE SSFID.......: " + element.getSubSystemConfigurationId(firstSelection)); logMyDebugMessage(this.getClass().getName(),": REMOTE NAME........: " + element.getName(firstSelection)); logMyDebugMessage(this.getClass().getName(),": REMOTE TYPECATEGORY: " + element.getRemoteTypeCategory(firstSelection)); logMyDebugMessage(this.getClass().getName(),": REMOTE TYPE........: " + element.getRemoteType(firstSelection)); 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 cbaac13522f..8ea89739da6 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 @@ -127,7 +127,7 @@ public class SystemViewAPIProviderForFilters //Object[] children = fRef.getChildren(getShell()); ISystemFilter referencedFilter = fRef.getReferencedFilter(); - ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemFactory(referencedFilter); + ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemConfiguration(referencedFilter); boolean promptable = referencedFilter.isPromptable(); //System.out.println("Promptable? " + promptable); if (promptable) 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 6379ac107c6..23404c4f3d9 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 @@ -33,8 +33,8 @@ import org.eclipse.rse.model.ISystemPromptableObject; import org.eclipse.rse.ui.view.team.SystemTeamViewCategoryAdapter; import org.eclipse.rse.ui.view.team.SystemTeamViewCategoryNode; import org.eclipse.rse.ui.view.team.SystemTeamViewProfileAdapter; -import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemFactoryAdapter; -import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemFactoryNode; +import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationAdapter; +import org.eclipse.rse.ui.view.team.SystemTeamViewSubSystemConfigurationNode; import org.eclipse.ui.IActionFilter; import org.eclipse.ui.model.IWorkbenchAdapter; import org.eclipse.ui.progress.IDeferredWorkbenchAdapter; @@ -60,7 +60,7 @@ public class SystemViewAdapterFactory implements IAdapterFactory private SystemViewNewConnectionPromptAdapter newConnPromptAdapter = new SystemViewNewConnectionPromptAdapter(); private SystemTeamViewProfileAdapter profileAdapter= new SystemTeamViewProfileAdapter(); private SystemTeamViewCategoryAdapter categoryAdapter; - private SystemTeamViewSubSystemFactoryAdapter subsysFactoryAdapter; + private SystemTeamViewSubSystemConfigurationAdapter subsysFactoryAdapter; private SystemViewFilterStringAdapter filterStringAdapter = new SystemViewFilterStringAdapter(); @@ -97,7 +97,7 @@ public class SystemViewAdapterFactory implements IAdapterFactory manager.registerAdapters(this, ISystemMessageObject.class); manager.registerAdapters(this, ISystemPromptableObject.class); manager.registerAdapters(this, SystemTeamViewCategoryNode.class); - manager.registerAdapters(this, SystemTeamViewSubSystemFactoryNode.class); + manager.registerAdapters(this, SystemTeamViewSubSystemConfigurationNode.class); // FIXME - UDAs no longer in core //manager.registerAdapters(this, SystemTeamViewCompileTypeNode.class); @@ -145,8 +145,8 @@ public class SystemViewAdapterFactory implements IAdapterFactory } else if (adaptableObject instanceof SystemTeamViewCategoryNode) adapter = getCategoryAdapter(); - else if (adaptableObject instanceof SystemTeamViewSubSystemFactoryNode) - adapter = getSubSystemFactoryAdapter(); + else if (adaptableObject instanceof SystemTeamViewSubSystemConfigurationNode) + adapter = getSubSystemConfigurationAdapter(); /** FIXME - UDAs no longer in core else if (adaptableObject instanceof SystemTeamViewCompileTypeNode) @@ -302,10 +302,10 @@ public class SystemViewAdapterFactory implements IAdapterFactory /** * Return adapter for subsystem factory nodes in team view */ - public SystemTeamViewSubSystemFactoryAdapter getSubSystemFactoryAdapter() + public SystemTeamViewSubSystemConfigurationAdapter getSubSystemConfigurationAdapter() { if (subsysFactoryAdapter == null) - subsysFactoryAdapter = new SystemTeamViewSubSystemFactoryAdapter(); + subsysFactoryAdapter = new SystemTeamViewSubSystemConfigurationAdapter(); return subsysFactoryAdapter; } 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 c7c15198642..f46db1bb451 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 @@ -82,7 +82,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement ISystemFilter filter = (ISystemFilter)selection.getFirstElement(); if (filter.isTransient()) return; - ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemFactory(filter); + ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(filter); ssFactory.setConnection(null); ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); IAction[] actions = adapter.getFilterActions(ssFactory, filter, shell); @@ -152,7 +152,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement ISystemFilter filter = getFilter(element); if (filter.isTransient()) return SystemResources.RESID_PP_FILTER_TYPE_VALUE; - ISubSystemConfiguration ssParentFactory = SubSystemHelpers.getParentSubSystemFactory(filter); + ISubSystemConfiguration ssParentFactory = SubSystemHelpers.getParentSubSystemConfiguration(filter); return ssParentFactory.getTranslatedFilterTypeProperty(filter); } @@ -548,7 +548,7 @@ public class SystemViewFilterAdapter extends AbstractSystemViewAdapter implement else if (name.equalsIgnoreCase("showChangeFilterStringPropertyPage")) { ISystemFilter filter = getFilter(target); - ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemFactory(filter); + ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemConfiguration(filter); if (value.equals("true")) return ssf.showChangeFilterStringsPropertyPage(filter); else 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 717930f9a56..44fd11edc7a 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 @@ -39,7 +39,7 @@ import org.eclipse.ui.views.properties.PropertyDescriptor; /** * Adapter for displaying SystemFilterPool objects in tree views. * These are the masters, and only shown in work-with for the master. - * These are children of SubSystemFactory objects + * These are children of SubSystemConfiguration objects */ public class SystemViewFilterPoolAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter { @@ -68,7 +68,7 @@ public class SystemViewFilterPoolAdapter extends AbstractSystemViewAdapter imple //if (selection.size() != 1) // return; // does not make sense adding unique actions per multi-selection ISystemFilterPool pool = ((ISystemFilterPool)selection.getFirstElement()); - ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemFactory(pool); + ISubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(pool); ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell); if (actions != null) @@ -143,7 +143,7 @@ public class SystemViewFilterPoolAdapter extends AbstractSystemViewAdapter imple { ISystemFilterPool fp = (ISystemFilterPool)element; // hmm, this will only work if a given factory only has one subsystem object... - ISubSystemConfiguration ssParentFactory = SubSystemHelpers.getParentSubSystemFactory(fp); + ISubSystemConfiguration ssParentFactory = SubSystemHelpers.getParentSubSystemConfiguration(fp); return ssParentFactory.getSubSystems(false)[0]; } 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 f8f237727ab..55ff989feb8 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 @@ -71,7 +71,7 @@ public class SystemViewFilterPoolReferenceAdapter // return; // does not make sense adding unique actions per multi-selection Object element = selection.getFirstElement(); ISystemFilterPool pool = getFilterPool(element); - ISubSystemConfiguration ssFactory = getSubSystemFactory(pool); + ISubSystemConfiguration ssFactory = getSubSystemConfiguration(pool); ISubsystemConfigurationAdapter adapter = (ISubsystemConfigurationAdapter)ssFactory.getAdapter(ISubsystemConfigurationAdapter.class); IAction[] actions = adapter.getFilterPoolActions(ssFactory, pool, shell); @@ -95,9 +95,9 @@ public class SystemViewFilterPoolReferenceAdapter } } - private ISubSystemConfiguration getSubSystemFactory(ISystemFilterPool pool) + private ISubSystemConfiguration getSubSystemConfiguration(ISystemFilterPool pool) { - return SubSystemHelpers.getParentSubSystemFactory(pool); + return SubSystemHelpers.getParentSubSystemConfiguration(pool); } /** @@ -267,7 +267,7 @@ public class SystemViewFilterPoolReferenceAdapter ISystemFilterPool fp = getFilterPool(element); ISystemFilterPoolManager fpMgr = fp.getSystemFilterPoolManager(); fpMgr.deleteSystemFilterPool(fp); - //SubSystemFactory ssParentFactory = getSubSystemFactory(fp); + //SubSystemConfiguration ssParentFactory = getSubSystemConfiguration(fp); //ssParentFactory.deleteFilterPool(fp); return true; } @@ -293,7 +293,7 @@ public class SystemViewFilterPoolReferenceAdapter ISystemFilterPool fp = getFilterPool(element); ISystemFilterPoolManager fpMgr = fp.getSystemFilterPoolManager(); fpMgr.renameSystemFilterPool(fp,name); - //SubSystemFactory ssParentFactory = getSubSystemFactory(fp); + //SubSystemConfiguration ssParentFactory = getSubSystemConfiguration(fp); //ssParentFactory.renameFilterPool(fp,name); return true; } 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 18bce88d9aa..1c6338916fc 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 @@ -86,7 +86,7 @@ public class SystemViewFilterReferenceAdapter //if (selection.size() != 1) // return; // does not make sense adding unique actions per multi-selection ISystemFilter filter = getFilter(selection.getFirstElement()); - ISubSystemConfiguration ssFactory = getSubSystemFactory(filter); + ISubSystemConfiguration ssFactory = getSubSystemConfiguration(filter); ISubSystem currentSubSystem = (ISubSystem) getFilterReference(selection.getFirstElement()).getSubSystem(); IHost currentConnection = currentSubSystem.getHost(); ssFactory.setConnection(currentConnection); @@ -113,9 +113,9 @@ public class SystemViewFilterReferenceAdapter } } - private ISubSystemConfiguration getSubSystemFactory(ISystemFilter filter) + private ISubSystemConfiguration getSubSystemConfiguration(ISystemFilter filter) { - return SubSystemHelpers.getParentSubSystemFactory(filter); + return SubSystemHelpers.getParentSubSystemConfiguration(filter); } /** * Overridden from parent.
    @@ -188,7 +188,7 @@ public class SystemViewFilterReferenceAdapter public String getType(Object element) { ISystemFilter filter = getFilter(element); - ISubSystemConfiguration ssParentFactory = getSubSystemFactory(filter); + ISubSystemConfiguration ssParentFactory = getSubSystemConfiguration(filter); return ssParentFactory.getTranslatedFilterTypeProperty(filter); } @@ -253,7 +253,7 @@ public class SystemViewFilterReferenceAdapter boolean promptable = referencedFilter.isPromptable(); ISubSystem ss = fRef.getSubSystem(); - ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemFactory(referencedFilter); + ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemConfiguration(referencedFilter); // PROMPTING FILTER?... if (promptable) @@ -422,7 +422,7 @@ public class SystemViewFilterReferenceAdapter ISystemFilterReference fRef = getFilterReference(element); ISystemFilter referencedFilter = fRef.getReferencedFilter(); - ISubSystemConfiguration factory = getSubSystemFactory(referencedFilter); + ISubSystemConfiguration factory = getSubSystemConfiguration(referencedFilter); if (factory.supportsFilterChildren()) { int nbrNestedFilters = referencedFilter.getSystemFilterCount(); @@ -482,7 +482,7 @@ public class SystemViewFilterReferenceAdapter else if (name.equalsIgnoreCase("showChangeFilterStringPropertyPage")) { ISystemFilterReference ref = getFilterReference(target); - ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemFactory(ref.getReferencedFilter()); + ISubSystemConfiguration ssf = SubSystemHelpers.getParentSubSystemConfiguration(ref.getReferencedFilter()); if (value.equals("true")) return ssf.showChangeFilterStringsPropertyPage(ref.getReferencedFilter()); else @@ -682,7 +682,7 @@ public class SystemViewFilterReferenceAdapter public boolean showGenericShowInTableAction(Object element) { ISystemFilter filter = getFilter(element); - ISubSystemConfiguration ssParentFactory = getSubSystemFactory(filter); + ISubSystemConfiguration ssParentFactory = getSubSystemConfiguration(filter); return ssParentFactory.showGenericShowInTableOnFilter(); } @@ -692,7 +692,7 @@ public class SystemViewFilterReferenceAdapter public boolean showRefresh(Object element) { ISystemFilter filter = getFilter(element); - ISubSystemConfiguration ssParentFactory = getSubSystemFactory(filter); + ISubSystemConfiguration ssParentFactory = getSubSystemConfiguration(filter); return ssParentFactory.showRefreshOnFilter(); } @@ -797,7 +797,7 @@ public class SystemViewFilterReferenceAdapter ISystemFilterReference fRef = getFilterReference(element); if (fRef != null) { - if (getSubSystemFactory(fRef.getReferencedFilter()).supportsFilterStringExport()) + if (getSubSystemConfiguration(fRef.getReferencedFilter()).supportsFilterStringExport()) { return true; } @@ -813,7 +813,7 @@ public class SystemViewFilterReferenceAdapter ISystemFilterReference fRef = getFilterReference(element); if (fRef != null) { - ISubSystemConfiguration factory = getSubSystemFactory(fRef.getReferencedFilter()); + ISubSystemConfiguration factory = getSubSystemConfiguration(fRef.getReferencedFilter()); if (factory.supportsDropInFilters()) { // if the drop is handled by the subsystem rather than this adapter, this will be true. @@ -906,7 +906,7 @@ public class SystemViewFilterReferenceAdapter if (target instanceof ISystemFilterReference) { ISystemFilterReference filterRef = (ISystemFilterReference) target; - if (getSubSystemFactory(filterRef.getReferencedFilter()).supportsMultiStringFilters()) + if (getSubSystemConfiguration(filterRef.getReferencedFilter()).supportsMultiStringFilters()) { if (src instanceof ISystemFilterReference) { 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 f9b727de266..2d72a1fc130 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 @@ -62,7 +62,7 @@ public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter imp if (filterString.getParentSystemFilter().isTransient()) return; /* - SubSystemFactory ssFactory = SubSystemHelpers.getParentSubSystemFactory(filterString); + SubSystemConfiguration ssFactory = SubSystemHelpers.getParentSubSystemConfiguration(filterString); ssFactory.setConnection(null); IAction[] actions = ssFactory.getFilterActions(filter, shell); if (actions != null) @@ -131,7 +131,7 @@ public class SystemViewFilterStringAdapter extends AbstractSystemViewAdapter imp //SystemFilterString filterString = getFilterString(element); //if (filterString.getParentSystemFilter().isTransient()) return SystemResources.RESID_PP_FILTERSTRING_TYPE_VALUE; - //SubSystemFactory ssParentFactory = SubSystemHelpers.getParentSubSystemFactory(filterString.getParentSystemFilter()); + //SubSystemConfiguration ssParentFactory = SubSystemHelpers.getParentSubSystemConfiguration(filterString.getParentSystemFilter()); //return ssParentFactory.getTranslatedFilterStringTypeProperty(filterString); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewScratchpadAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewScratchpadAdapter.java index f34dada63f5..d82c8ee75d5 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewScratchpadAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewScratchpadAdapter.java @@ -196,9 +196,9 @@ public class SystemViewScratchpadAdapter extends AbstractSystemViewAdapter imple } /* (non-Javadoc) - * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemFactoryId(java.lang.Object) + * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object) */ - public String getSubSystemFactoryId(Object element) + public String getSubSystemConfigurationId(Object element) { // TODO Auto-generated method stub return 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 b9d3a095195..41ccafe2c48 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 @@ -303,7 +303,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter data.setLocalValue(localPort.toString()); else data.setLocalValue(null); // clear history - SubSystemFactory ssFactory = subsys.getParentSubSystemFactory(); + SubSystemConfiguration ssFactory = subsys.getParentSubSystemConfiguration(); boolean notApplicable = (!ssFactory.isPortEditable() && (iPort <= 0)); if (!notApplicable) { @@ -475,7 +475,7 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter portInteger = new Integer(port); else portInteger = new Integer(0); - SubSystemFactory ssFactory = subsys.getParentSubSystemFactory(); + SubSystemConfiguration ssFactory = subsys.getParentSubSystemConfiguration(); ssFactory.updateSubSystem((Shell)null, subsys, false, subsys.getLocalUserId(), true, portInteger); } */ @@ -579,9 +579,9 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter /** FIXME can't access specific subsystems from core anymore boolean supports = false; if (ss instanceof IRemoteFileSubSystem) - supports = ((IRemoteFileSubSystemFactory)ss.getParentSubSystemFactory()).supportsEnvironmentVariablesPropertyPage(); + supports = ((IRemoteFileSubSystemConfiguration)ss.getParentSubSystemConfiguration()).supportsEnvironmentVariablesPropertyPage(); else - supports = ((IRemoteCmdSubSystemFactory)ss.getParentSubSystemFactory()).supportsEnvironmentVariablesPropertyPage(); + supports = ((IRemoteCmdSubSystemConfiguration)ss.getParentSubSystemConfiguration()).supportsEnvironmentVariablesPropertyPage(); */ boolean supports = false; return supports ? value.equals("true") : value.equals("false"); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableView.java index 3db583a611e..b085866d86a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/search/SystemSearchTableView.java @@ -220,7 +220,7 @@ public class SystemSearchTableView extends SystemTableTreeView String childPath = adapt.getAbsoluteName(child); // find out if system is case sensitive - boolean isCaseSensitive = resourceSubSystem.getParentSubSystemFactory().isCaseSensitive(); + boolean isCaseSensitive = resourceSubSystem.getParentSubSystemConfiguration().isCaseSensitive(); boolean matches = false; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java index e0ef42a17fc..c6cabe4daa4 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java @@ -150,14 +150,14 @@ public class SystemTeamViewCategoryAdapter return profile.getHosts(); } else - return createSubSystemFactoryNodes(profile, category); + return createSubSystemConfigurationNodes(profile, category); } /** * Create subsystem factory child nodes for expanded category node */ - private SystemTeamViewSubSystemFactoryNode[] createSubSystemFactoryNodes(ISystemProfile profile, SystemTeamViewCategoryNode category) + private SystemTeamViewSubSystemConfigurationNode[] createSubSystemConfigurationNodes(ISystemProfile profile, SystemTeamViewCategoryNode category) { - SystemTeamViewSubSystemFactoryNode[] nodes = null; + SystemTeamViewSubSystemConfigurationNode[] nodes = null; ISystemRegistry sr = RSEUIPlugin.getTheSystemRegistry(); ISubSystemConfiguration[] factories = sr.getSubSystemConfigurations(); @@ -186,12 +186,12 @@ public class SystemTeamViewCategoryAdapter createNode = ssf.supportsTargets(); // && profile.getTargets(ssf).length > 0; } if (createNode) - v.addElement(new SystemTeamViewSubSystemFactoryNode(profile, category, factories[idx])); + v.addElement(new SystemTeamViewSubSystemConfigurationNode(profile, category, factories[idx])); } - nodes = new SystemTeamViewSubSystemFactoryNode[v.size()]; + nodes = new SystemTeamViewSubSystemConfigurationNode[v.size()]; for (int idx=0; idxBy subsystem factory. Only connections with subsystems owned by the given subsystem factory are listed. *
  • By subsystem factory category. Only connections which contain subsystems owned by subsystem factories which * are defined in their xml extension point as being of the given category are listed. - * For a list of pre-defined categories, see {@link org.eclipse.rse.model.ISubSystemFactoryCategories}. + * For a list of pre-defined categories, see {@link org.eclipse.rse.model.ISubSystemConfigurationCategories}. * */ public class SystemHostCombo extends Composite implements ISelectionProvider, ISystemCombo, diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemNewConnectionWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemNewConnectionWizardPage.java index 9a5cbf0a32b..fea2cbd5e7a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemNewConnectionWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/AbstractSystemNewConnectionWizardPage.java @@ -72,7 +72,7 @@ public abstract class AbstractSystemNewConnectionWizardPage extends AbstractSyst /** * Return the subsystem factory that supplied this page */ - public ISubSystemConfiguration getSubSystemFactory() + public ISubSystemConfiguration getSubSystemConfiguration() { return parentFactory; } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java index bdc9a0dddee..1d8d6881abb 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/ISystemNewConnectionWizardPage.java @@ -46,5 +46,5 @@ public interface ISystemNewConnectionWizardPage extends IWizardPage /** * Return the subsystem factory that supplied this page */ - public ISubSystemConfiguration getSubSystemFactory(); + public ISubSystemConfiguration getSubSystemConfiguration(); } \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java index 183a25e5087..bb6fc2eb858 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SubSystemServiceWizardPage.java @@ -78,7 +78,7 @@ public class SubSystemServiceWizardPage extends AbstractSystemNewConnectionWizar { - IServiceSubSystemConfiguration currentFactory = (IServiceSubSystemConfiguration)getSubSystemFactory(); + IServiceSubSystemConfiguration currentFactory = (IServiceSubSystemConfiguration)getSubSystemConfiguration(); String systemTypeStr = getMainPage().getSystemType(); IRSESystemType systemType = RSECorePlugin.getDefault().getRegistry().getSystemType(systemTypeStr); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java index 06075de05e1..63d34f06a81 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/wizards/SystemSubSystemsPropertiesWizardPage.java @@ -114,7 +114,7 @@ public class SystemSubSystemsPropertiesWizardPage if (page != null && page instanceof ISystemConnectionWizardPropertyPage) { ISystemConnectionWizardPropertyPage cpage = (ISystemConnectionWizardPropertyPage)page; - cpage.setSubSystemFactory(parentFactory); + cpage.setSubSystemConfiguration(parentFactory); CTabItem titem = new CTabItem(_folder, SWT.NULL, numAdded); titem.setData(page); diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java index 68bca632ca9..a21a05f9950 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/internal/model/SystemRegistry.java @@ -45,7 +45,7 @@ import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterPoolReferenceManager; import org.eclipse.rse.filters.ISystemFilterReference; import org.eclipse.rse.model.IHost; -import org.eclipse.rse.model.ISubSystemFactoryCategories; +import org.eclipse.rse.model.ISubSystemConfigurationCategories; import org.eclipse.rse.model.ISystemContainer; import org.eclipse.rse.model.ISystemHostPool; import org.eclipse.rse.model.ISystemModelChangeEvent; @@ -284,12 +284,12 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents for (int idx = 0; (!hasSubsystems) && (idx < subsystemFactoryProxies.length); idx++) { if (subsystemFactoryProxies[idx].appliesToSystemType(selectedConnection.getSystemType()) && - subsystemFactoryProxies[idx].isSubSystemFactoryActive()) + subsystemFactoryProxies[idx].isSubSystemConfigurationActive()) { - SubSystemFactory factory = subsystemFactoryProxies[idx].getSubSystemFactory(); + SubSystemConfiguration factory = subsystemFactoryProxies[idx].getSubSystemConfiguration(); if (factory != null) { - SubSystem[] sss = factory.getSubSystems(selectedConnection, SubSystemFactory.LAZILY); + SubSystem[] sss = factory.getSubSystems(selectedConnection, SubSystemConfiguration.LAZILY); if ((sss != null) && (sss.length>0)) hasSubsystems = true; } @@ -509,7 +509,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents /** * Return all subsystem factory proxies matching a subsystem factory category. - * @see ISubSystemFactoryCategories + * @see ISubSystemConfigurationCategories */ public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxiesByCategory(String factoryCategory) { @@ -560,7 +560,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents * in its plugin.xml file. Thus, it is effecient as it need not bring to life a * subsystem factory just to test its parent class type. * - * @see ISubSystemFactoryCategories + * @see ISubSystemConfigurationCategories */ public ISubSystemConfiguration[] getSubSystemConfigurationsByCategory(String factoryCategory) { @@ -711,9 +711,9 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents { for (int idx = 0; idx < subsystemFactoryProxies.length; idx++) { - if (subsystemFactoryProxies[idx].isSubSystemFactoryActive()) + if (subsystemFactoryProxies[idx].isSubSystemConfigurationActive()) { - SubSystemFactory factory = subsystemFactoryProxies[idx].getSubSystemFactory(); + SubSystemConfiguration factory = subsystemFactoryProxies[idx].getSubSystemConfiguration(); if ((factory!=null)&&factory.supportsFilters()) factory.setShowFilterStrings(show); } @@ -850,7 +850,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents // Hmm, in v4 we only did this for active factories. That can't be right, as it needs to be done // for EVERY factory. Hence this commented line of code, new for v5 (and to fix a bug I found in // profile renaming... the local connection's filter pool folder was not renamed). Phil... - //if (proxies[idx].isSubSystemFactoryActive()) + //if (proxies[idx].isSubSystemConfigurationActive()) ISubSystemConfiguration factory = proxies[idx].getSubSystemConfiguration(); if (factory != null) { @@ -1071,7 +1071,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents { for (int idx = 0; idx < subsystemFactoryProxies.length; idx++) { - //if (subsystemFactoryProxies[idx].isSubSystemFactoryActive()) // don't bother if not yet alive + //if (subsystemFactoryProxies[idx].isSubSystemConfigurationActive()) // don't bother if not yet alive { ISubSystemConfiguration factory = subsystemFactoryProxies[idx].getSubSystemConfiguration(); if (factory != null) @@ -1253,9 +1253,9 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents { String srcProfileName = absoluteSubSystemName.substring(0, profileDelim); String srcConnectionName = absoluteSubSystemName.substring(profileDelim + 1, connectionDelim); - String srcSubSystemFactoryId = absoluteSubSystemName.substring(connectionDelim + 1, absoluteSubSystemName.length()); + String srcSubSystemConfigurationId = absoluteSubSystemName.substring(connectionDelim + 1, absoluteSubSystemName.length()); - return getSubSystem(srcProfileName, srcConnectionName, srcSubSystemFactoryId); + return getSubSystem(srcProfileName, srcConnectionName, srcSubSystemConfigurationId); } return null; @@ -1441,7 +1441,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents * This looks for a match on the "category" of the subsystem factory's xml declaration * in its plugin.xml file. * - * @see org.eclipse.rse.model.ISubSystemFactoryCategories + * @see org.eclipse.rse.model.ISubSystemConfigurationCategories */ public ISubSystem[] getSubSystemsBySubSystemConfigurationCategory(String factoryCategory, IHost connection) { @@ -1697,7 +1697,7 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents * in its plugin.xml file. Thus, it is effecient as it need not bring to live a * subsystem factory just to test its parent class type. * - * @see ISubSystemFactoryCategories + * @see ISubSystemConfigurationCategories */ public IHost[] getHostsBySubSystemConfigurationCategory(String factoryCategory) { @@ -2207,14 +2207,14 @@ public class SystemRegistry implements ISystemRegistry, ISystemModelChangeEvents return null; int count = 0; for (int idx = 0; idx < allPages.length; idx++) - if (allPages[idx].getSubSystemFactory() == ssf) + if (allPages[idx].getSubSystemConfiguration() == ssf) ++count; if (count == 0) return null; ISystemNewConnectionWizardPage[] subPages = new ISystemNewConnectionWizardPage[count]; count = 0; for (int idx = 0; idx < allPages.length; idx++) - if (allPages[idx].getSubSystemFactory() == ssf) + if (allPages[idx].getSubSystemConfiguration() == ssf) subPages[count++] = allPages[idx]; return subPages; } diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISubSystemFactoryCategories.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISubSystemConfigurationCategories.java similarity index 96% rename from rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISubSystemFactoryCategories.java rename to rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISubSystemConfigurationCategories.java index a839c56cba7..d1a9572f717 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISubSystemFactoryCategories.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISubSystemConfigurationCategories.java @@ -19,7 +19,7 @@ package org.eclipse.rse.model; * Constants for pre-defined subsystem factory categories. * Use these in calls to {@link org.eclipse.rse.model.ISystemRegistry#getHostsBySubSystemConfigurationCategory(String)}. */ -public interface ISubSystemFactoryCategories +public interface ISubSystemConfigurationCategories { /** * Job subsystems diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java index 0e402d00636..0a0c5d2bee1 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/ISystemRegistry.java @@ -101,7 +101,7 @@ public interface ISystemRegistry extends ISystemViewInputProvider, ISchedulingRu public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxies(); /** * Return all subsystem factory proxies matching a subsystem factory category. - * @see ISubSystemFactoryCategories + * @see ISubSystemConfigurationCategories */ public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxiesByCategory(String factoryCategory); /** @@ -125,7 +125,7 @@ public interface ISystemRegistry extends ISystemViewInputProvider, ISchedulingRu * in its plugin.xml file. Thus, it is effecient as it need not bring to life a * subsystem factory just to test its parent class type. * - * @see ISubSystemFactoryCategories + * @see ISubSystemConfigurationCategories */ public ISubSystemConfiguration[] getSubSystemConfigurationsByCategory(String factoryCategory); /** @@ -314,7 +314,7 @@ public interface ISystemRegistry extends ISystemViewInputProvider, ISchedulingRu * This looks for a match on the "category" of the subsystem factory's xml declaration * in its plugin.xml file. * - * @see org.eclipse.rse.model.ISubSystemFactoryCategories + * @see org.eclipse.rse.model.ISubSystemConfigurationCategories */ public ISubSystem[] getSubSystemsBySubSystemConfigurationCategory(String factoryCategory, IHost connection); @@ -368,7 +368,7 @@ public interface ISystemRegistry extends ISystemViewInputProvider, ISchedulingRu * in its plugin.xml file. Thus, it is effecient as it need not bring to life a * subsystem factory just to test its parent class type. * - * @see org.eclipse.rse.model.ISubSystemFactoryCategories + * @see org.eclipse.rse.model.ISubSystemConfigurationCategories */ public IHost[] getHostsBySubSystemConfigurationCategory(String factoryCategory); /** diff --git a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemStartHere.java b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemStartHere.java index 1e6314edeea..140b3ffe71f 100644 --- a/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemStartHere.java +++ b/rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/model/SystemStartHere.java @@ -71,26 +71,26 @@ public class SystemStartHere /** * STEP 2c. Get all connections for your subsystem factory *

    - * SAME AS: getSystemRegistry().getConnectionsBySubSystemFactory(factory) + * SAME AS: getSystemRegistry().getConnectionsBySubSystemConfiguration(factory) * @param factory A subsystem factory object. * @see org.eclipse.rse.model.ISystemRegistry#getHostsBySubSystemConfiguration(ISubSystemConfiguration) - * @see #getConnectionsBySubSystemFactory(String) + * @see #getConnectionsBySubSystemConfiguration(String) */ - public static IHost[] getConnectionsBySubSystemFactory(ISubSystemConfiguration factory) + public static IHost[] getConnectionsBySubSystemConfiguration(ISubSystemConfiguration factory) { return getSystemRegistry().getHostsBySubSystemConfiguration(factory); } /** * STEP 2d. Get all connections for your subsystem factory, identified by factory Id. *

    - * SAME AS: getSystemRegistry().getConnectionsBySubSystemFactory(getSubSystemFactory(factoryId)) + * SAME AS: getSystemRegistry().getConnectionsBySubSystemConfiguration(getSubSystemConfiguration(factoryId)) * @param factoryId The id of the subsystem factory as given in its plugin.xml id attribute for the subsystemconfiguration extension point - * @see #getSubSystemFactory(String) - * @see #getConnectionsBySubSystemFactory(ISubSystemConfiguration) + * @see #getSubSystemConfiguration(String) + * @see #getConnectionsBySubSystemConfiguration(ISubSystemConfiguration) */ - public static IHost[] getConnectionsBySubSystemFactory(String factoryId) + public static IHost[] getConnectionsBySubSystemConfiguration(String factoryId) { - return getSystemRegistry().getHostsBySubSystemConfiguration(getSubSystemFactory(factoryId)); + return getSystemRegistry().getHostsBySubSystemConfiguration(getSubSystemConfiguration(factoryId)); } /** @@ -143,10 +143,10 @@ public class SystemStartHere /** * Miscallenous Helper. Return the subsystem factory object for the given subsystem factory Id *

    - * SAME AS: getSystemRegistry().getSubSystemFactory(factoryId) + * SAME AS: getSystemRegistry().getSubSystemConfiguration(factoryId) * @param factoryId The id of the subsystem factory as given in its plugin.xml id attribute for the subsystemconfiguration extension point */ - public static ISubSystemConfiguration getSubSystemFactory(String factoryId) + public static ISubSystemConfiguration getSubSystemConfiguration(String factoryId) { return getSystemRegistry().getSubSystemConfiguration(factoryId); } diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java index 5a9e4c8775b..d9a4e1b3988 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/SubSystemConfigurationProxy.java @@ -238,7 +238,7 @@ public class SubSystemConfigurationProxy implements ISubSystemConfigurationProxy object = (ISubSystemConfiguration)menuExtension.getConstructors()[0].newInstance(null); } - object.setSubSystemFactoryProxy(this); // side effect: restores filter pools + object.setSubSystemConfigurationProxy(this); // side effect: restores filter pools //System.out.println("*** STARTED SSFACTORY: " + id + " ***"); } catch (Exception exc) { diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/IServiceSubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/IServiceSubSystemConfiguration.java index ba0c8181066..db30998f26e 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/IServiceSubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/servicesubsystem/IServiceSubSystemConfiguration.java @@ -27,7 +27,7 @@ import org.eclipse.rse.services.IService; /** * This is the interface for the class that is for subsystem-providers who desire not to use MOF. * - * @lastgen interface DefaultSubSystemFactory extends SubSystemFactory {} + * @lastgen interface DefaultSubSystemConfiguration extends SubSystemConfiguration {} */ public interface IServiceSubSystemConfiguration extends ISubSystemConfiguration { @@ -37,4 +37,4 @@ public interface IServiceSubSystemConfiguration extends ISubSystemConfiguration public Class getServiceImplType(); public IService getService(IHost host); -} //DefaultSubSystemFactory \ No newline at end of file +} //DefaultSubSystemConfiguration \ No newline at end of file diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java index dcbf68ab028..0b6d8562f42 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java @@ -695,7 +695,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements * Get the userId input validator to use in the password dialog prompt. *

    * By default, returns

    - * 
    getSubSystem().getParentSubSystemFactory().getUserIdValidator()
    + * 
    getSubSystem().getParentSubSystemConfiguration().getUserIdValidator()
    */ public ISystemValidator getUserIdValidator() { @@ -706,7 +706,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements * Get the password input validator to use in the password dialog prompt. *

    * By default, returns:

    - * 
    getSubSystem().getParentSubSystemFactory().getPasswordValidator()
    + * 
    getSubSystem().getParentSubSystemConfiguration().getPasswordValidator()
    */ public ISystemValidator getPasswordValidator() { @@ -760,7 +760,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements /** * You must override - * unless subsystem.getParentSubSystemFactory().supportsServerLaunchProperties + * unless subsystem.getParentSubSystemConfiguration().supportsServerLaunchProperties * returns true. *

    * Attempt to connect to the remote system.
    @@ -800,7 +800,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements * By default, this is the subsystem's port property, via {@link #getPort()}. * Override if appropriate. *
    This is called by the default implementation of {@link #connect(IProgressMonitor)}, if - * subsystem.getParentSubSystemFactory().supportsServerLaunchProperties() is true. + * subsystem.getParentSubSystemConfiguration().supportsServerLaunchProperties() is true. */ protected int getConnectPort() { @@ -811,7 +811,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements * Disconnects from the remote system. *

    * You must override - * if subsystem.getParentSubSystemFactory().supportsServerLaunchProperties + * if subsystem.getParentSubSystemConfiguration().supportsServerLaunchProperties * returns false. *

    * If the subsystem supports server launch @@ -849,7 +849,7 @@ public abstract class AbstractConnectorService extends RSEModelObject implements /** * Return the remote server launcher, which implements IServerLauncher. * This is called by the default implementation of connect() and disconnect(), if - * subsystem.getParentSubSystemFactory().supportsServerLaunchProperties returns true. + * subsystem.getParentSubSystemConfiguration().supportsServerLaunchProperties returns true. *

    This returns null be default! */ public IServerLauncher getRemoteServerLauncher() diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java index b8097faaad4..1c384afe36d 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.java @@ -70,7 +70,7 @@ public abstract class AbstractConnectorServiceManager implements IConnectorServi /** * Protected constructor to ensure not instantiated this way. - * Use subclass-supplied static method getTheSystemFactory() instead. + * Use subclass-supplied static method getTheSystemConfiguration() instead. */ protected AbstractConnectorServiceManager() { diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java index 710ecc6bcdb..a1668194e88 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystem.java @@ -189,7 +189,7 @@ public interface ISubSystem extends ISystemFilterPoolReferenceManagerProvider, I /** * Return true if userId and password should be forced to uppercase. - * Shortcut to calling same method in parent SubSystemFactory. + * Shortcut to calling same method in parent SubSystemConfiguration. */ public boolean forceUserIdToUpperCase(); /** diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java index 392ffdefd55..274bd09040e 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java @@ -191,7 +191,7 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide * to configure how the server-side code for these subsystems are started. There is a Server * Launch Setting property page, with a pluggable composite, where users can configure these * properties. - *
    By default we return false here. This is overridden in UniversalFileSubSystemFactory though. + *
    By default we return false here. This is overridden in UniversalFileSubSystemConfiguration though. */ public boolean supportsServerLaunchProperties(IHost host); /** @@ -243,11 +243,11 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide /** * Private method called by RSEUIPlugin */ - public void setSubSystemFactoryProxy(ISubSystemConfigurationProxy proxy); + public void setSubSystemConfigurationProxy(ISubSystemConfigurationProxy proxy); /** * Private method */ - public ISubSystemConfigurationProxy getSubSystemFactoryProxy(); + public ISubSystemConfigurationProxy getSubSystemConfigurationProxy(); // --------------------------------- // FACTORY ATTRIBUTE METHODS... @@ -289,7 +289,7 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide public Image getGraphicsLiveImage(); /** * Return the category this subsystem factory subscribes to. - * @see org.eclipse.rse.model.ISubSystemFactoryCategories + * @see org.eclipse.rse.model.ISubSystemConfigurationCategories */ public String getCategory(); /** diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java index 3a912dd46d5..56944019782 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfigurationProxy.java @@ -18,7 +18,7 @@ package org.eclipse.rse.core.subsystems; import org.eclipse.jface.resource.ImageDescriptor; /** - * Interface to SubSystemFactoryExtension class + * Interface to SubSystemConfigurationExtension class * Internal use, not likely you will ever need to use it or access it directly. */ public interface ISubSystemConfigurationProxy @@ -56,7 +56,7 @@ public interface ISubSystemConfigurationProxy /** * Return value of the category xml attribute. * Return the category this subsystem configuration subscribes to. - * @see org.eclipse.rse.model.ISubSystemFactoryCategories + * @see org.eclipse.rse.model.ISubSystemConfigurationCategories */ public String getCategory(); /** diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index aa15befae23..ee796864c87 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -109,7 +109,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS protected static final String SUBSYSTEM_FILE_NAME = "subsystem"; - //protected transient SubSystemFactory parentFactory = null; + //protected transient SubSystemConfiguration parentFactory = null; protected static final int OPERATION_RESOLVE_ABSOLUTE = 0; protected static final int OPERATION_RESOLVE_ABSOLUTES= 1; protected static final int OPERATION_RESOLVE_RELATIVE = 2; @@ -125,7 +125,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS protected static final int OPERATION_CANCEL_SHELL = 12; protected static final int OPERATION_REMOVE_SHELL = 13; - protected ISubSystemConfiguration parentSubSystemFactory; + protected ISubSystemConfiguration parentSubSystemConfiguration; protected String previousUserIdKey; protected Shell shell; @@ -230,14 +230,14 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public ISubSystemConfiguration getSubSystemConfiguration() { - return parentSubSystemFactory; + return parentSubSystemConfiguration; } /** * Return the parent subsystem factory that owns this subsystem. */ public void setSubSystemConfiguration(ISubSystemConfiguration ssf) { - parentSubSystemFactory = ssf; + parentSubSystemConfiguration = ssf; supportsConnecting = ssf.supportsSubSystemConnect(); //System.out.println("subsystem supports connecting? " + supportsConnecting); } @@ -257,8 +257,8 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS public boolean forceUserIdToUpperCase() { /* defect 43219 - if (parentSubSystemFactory != null) - return parentSubSystemFactory.forceUserIdToUpperCase(); + if (parentSubSystemConfiguration != null) + return parentSubSystemConfiguration.forceUserIdToUpperCase(); else return true; */ @@ -665,7 +665,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public String getConnectionOwnedFilterPoolName(String profileName, String connectionName) { - // Similar to SubSystemFactoryImpl#getDefaultFilterPoolName(String)... + // Similar to SubSystemConfigurationImpl#getDefaultFilterPoolName(String)... // System.out.println("ProfileName: " + profileName); // System.out.println("ConnectionName: " + connectionName); diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index 1f73c957031..f8b216524b2 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -89,18 +89,18 @@ import org.eclipse.ui.dialogs.PropertyPage; * * Child classes can optionally override: *