mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 17:35:35 +02:00
Code Issues Wiki Activity

SubSystemFactory -> SubSystemConfiguration

Browse source 
Fix for Defect 150496
This commit is contained in:
David McKnight 2006-07-31 16:21:36 +00:00
parent 46fed2bfe1
commit 27746a536e
126 changed files with 579 additions and 437 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/model/DaytimeResourceAdapter.java
View file

@ -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$
}

29
rse/examples/org.eclipse.rse.examples.daytime/src/org/eclipse/rse/examples/daytime/ui/DaytimeNewConnectionWizardPage.java Normal file
View file

@ -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;
}
}

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

@ -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.
* <p>
* 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;
}
}

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

@ -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;
}
}

4
rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/DeveloperResourceAdapter.java
View file

@ -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$
}

4
rse/examples/org.eclipse.rse.examples.tutorial/src/samples/model/TeamResourceAdapter.java
View file

@ -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$
}

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

@ -23,7 +23,7 @@ import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.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
{
/**

4
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java
View file

@ -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()
{

2
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemFactory.java → rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/IUniversalSubSystemConfiguration.java
View file

@ -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
{

4
rse/plugins/org.eclipse.rse.eclipse.filesystem/plugin.xml
View file

@ -33,7 +33,7 @@ Contributors:
</filesystemContributor>
</extension>
<!-- remote eclipse filesystem not properly supported yet
<!-- remote eclipse filesystem not properly supported yet-->
<extension
point="org.eclipse.rse.ui.popupMenus">
<objectContribution
@ -57,5 +57,5 @@ Contributors:
</action>
</objectContribution>
</extension>
-->
<!-- -->
</plugin>

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

@ -24,7 +24,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.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

28
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/SystemFileFilterStringEditPane.java
View file

@ -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();

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAbstractRemoteFilePopupMenuExtensionAction.java
View file

@ -37,7 +37,7 @@ import org.eclipse.ui.IObjectActionDelegate;
* <li>{@link #getSelectedRemoteFiles()}
* <li>{@link #getFirstSelectedRemoteFile()}
* <li>{@link #getRemoteFileSubSystem()}
* <li>{@link #getRemoteFileSubSystemFactory()}
* <li>{@link #getRemoteFileSubSystemConfiguration()}
* </ul>
* <p>
* 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();
}
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemAddToArchiveAction.java
View file

@ -180,7 +180,7 @@ public class SystemAddToArchiveAction extends SystemBaseAction
{
return;
}
if (!destinationArchive.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemFactory().supportsArchiveManagement())
if (!destinationArchive.getParentRemoteFileSubSystem().getParentRemoteFileSubSystemConfiguration().supportsArchiveManagement())
{
return;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemExtractAction.java
View file

@ -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;

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemNewFileFilterAction.java
View file

@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Shell;
public class SystemNewFileFilterAction
extends SystemNewFilterAction
{
//private RemoteFileSubSystemFactory inputSubsystemFactory;
//private RemoteFileSubSystemConfiguration inputSubsystemConfiguration;
/**
* Constructor

6
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/propertypages/FileServicesPropertyPage.java
View file

@ -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;
}

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

@ -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();
}
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/CombineForm.java
View file

@ -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

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/ExtractToForm.java
View file

@ -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

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemEditableRemoteFile.java
View file

@ -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

10
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/UniversalFileTransferUtility.java
View file

@ -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;

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/search/SystemSearchPage.java
View file

@ -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)) {

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

@ -39,13 +39,13 @@ import org.eclipse.rse.model.ISystemRegistry;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystemConfiguration;
import org.eclipse.rse.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;

4
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemFactoryAdapterFactory.java → rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/RemoteFileSubsystemConfigurationAdapterFactory.java
View file

@ -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()

28
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteFileAdapter.java
View file

@ -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);

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultAdapter.java
View file

@ -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;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/view/SystemViewRemoteSearchResultSetAdapter.java
View file

@ -179,7 +179,7 @@ public class SystemViewRemoteSearchResultSetAdapter extends AbstractSystemViewAd
return null;
}
public String getSubSystemFactoryId(Object element)
public String getSubSystemConfigurationId(Object element)
{
return null;
}

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SystemQualifiedRemoteFolderCombo.java
View file

@ -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();

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

@ -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)
{

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

@ -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());

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/wizards/SystemNewFileWizard.java
View file

@ -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();

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

@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.Platform;
import org.eclipse.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);
}

6
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/SystemProcessFilterStringEditPane.java
View file

@ -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);

6
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/propertypages/ProcessServicesPropertyPage.java
View file

@ -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;
}

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

@ -24,11 +24,11 @@ import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterPool;
import org.eclipse.rse.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;

4
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemFactoryAdapterFactory.java → rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/RemoteProcessSubsystemConfigurationAdapterFactory.java
View file

@ -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()

2
rse/plugins/org.eclipse.rse.processes.ui/src/org/eclipse/rse/processes/ui/view/SystemViewRemoteProcessAdapter.java
View file

@ -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();

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

@ -19,7 +19,7 @@ package org.eclipse.rse.shells.ui;
import org.eclipse.core.runtime.IAdapterManager;
import org.eclipse.core.runtime.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);
}

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/RemoteCommandHelpers.java
View file

@ -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))
{

8
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/SystemRemoteCommandEntryForm.java
View file

@ -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++)
{

6
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/propertypages/ShellServicesPropertyPage.java
View file

@ -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;
}

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

@ -31,11 +31,11 @@ import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;
import org.eclipse.rse.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;

4
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemFactoryAdapterFactory.java → rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/ShellServiceSubsystemConfigurationAdapterFactory.java
View file

@ -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()

2
rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/shells/ui/view/SystemCommandsViewPart.java
View file

@ -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)
{

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

@ -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())
{

6
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemFactoryAPIProviderImpl.java → rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/internal/subsystems/files/core/SystemFileSubSystemConfigurationAPIProviderImpl.java
View file

@ -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;
}

4
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileFilterString.java
View file

@ -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();
}

2
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/model/RemoteFileUtility.java
View file

@ -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);

4
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/servicesubsystem/FileServiceSubSystem.java
View file

@ -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);

14
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.java
View file

@ -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 "/".
* <br>
* 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 "/"
* <br>
* 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 ":"
* <br>
* 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 ":"
* <br>
* Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getPathSeparatorChar()
* Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getPathSeparatorChar()
*/
public char getPathSeparatorChar();
/**
* Return as a string the line separator.
* <br>
* Shortcut to {@link #getParentRemoteFileSubSystemFactory()}.getLineSeparator()
* Shortcut to {@link #getParentRemoteFileSubSystemConfiguration()}.getLineSeparator()
*/
public String getLineSeparator();

2
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystemConfiguration.java
View file

@ -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

16
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFile.java
View file

@ -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);

52
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java
View file

@ -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 "/".
* <br>
* 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 "/"
* <br>
* 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 ":"
* <br>
* 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 ":"
* <br>
* 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.
* <br>
* 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

4
rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/util/ValidatorFileUniqueName.java
View file

@ -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;
}

2
rse/plugins/org.eclipse.rse.subsystems.files.local/src/org/eclipse/rse/subsystems/files/local/LocalFileSubSystemConfiguration.java
View file

@ -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;

4
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/RemoteProcessSubSystem.java
View file

@ -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

2
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemConfiguration.java
View file

@ -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
*

4
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java
View file

@ -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();
}

2
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystem.java
View file

@ -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)
{

8
rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/servicesubsystem/ProcessServiceSubSystemConfiguration.java
View file

@ -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)
{

8
rse/plugins/org.eclipse.rse.subsystems.processes.dstore/src/org/eclipse/rse/subsystems/processes/dstore/DStoreProcessSubSystemConfiguration.java
View file

@ -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)
{

6
rse/plugins/org.eclipse.rse.subsystems.processes.local/src/org/eclipse/rse/subsystems/processes/local/LocalProcessSubSystemConfiguration.java
View file

@ -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()
{

8
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/internal/subsystems/shells/subsystems/RemoteCmdSubSystem.java
View file

@ -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.
* <p>
* 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);
*/

2
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandFilterString.java
View file

@ -85,7 +85,7 @@ public class RemoteCommandFilterString implements Cloneable
this(subsysFactory);
}
public void setSubSystemFactory(IRemoteCmdSubSystemConfiguration subsysFactory)
public void setSubSystemConfiguration(IRemoteCmdSubSystemConfiguration subsysFactory)
{
}

2
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/model/RemoteCommandShellOperation.java
View file

@ -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)

4
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java
View file

@ -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

2
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystemConfiguration.java
View file

@ -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
{

4
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/IShellServiceSubSystemConfiguration.java
View file

@ -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
} //DefaultCmdSubSystemConfiguration

2
rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/servicesubsystem/ShellServiceSubSystem.java
View file

@ -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);
}

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

@ -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));

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

@ -58,7 +58,7 @@ import org.eclipse.rse.ui.internal.RSESystemTypeAdapterFactory;
import org.eclipse.rse.ui.internal.RSEUIRegistry;
import org.eclipse.rse.ui.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<proxies.length); proxyIdx++)
boolean usedBySubSystemConfiguration = false;
for (int proxyIdx=0; !usedBySubSystemConfiguration && (proxyIdx<proxies.length); proxyIdx++)
if (proxies[proxyIdx].appliesToSystemType(name))
usedBySubSystemFactory = true;
usedBySubSystemConfiguration = true;
//DKM v doesn't contain names - it contains SystemTypes
// changing this to use typeStrs - an array of names
boolean alreadyDeclared = typeStrs.contains(name);
if (usedBySubSystemFactory && !alreadyDeclared)
if (usedBySubSystemConfiguration && !alreadyDeclared)
{
String icon = getSystemTypeIcon(typePlugins[idx]);
String iconLive = getSystemTypeLiveIcon(typePlugins[idx]);
@ -820,7 +820,7 @@ public class RSEUIPlugin extends SystemBasePlugin
// TODO: need to figure out a way to give preference to a particular declaration
// of a system type (among more than one such declaration). One idea is to tie
// this to a product branding, i.e. product ID.
else if (usedBySubSystemFactory && alreadyDeclared)
else if (usedBySubSystemConfiguration && alreadyDeclared)
{
// KM: if a system type is redeclared, how do we know which one
// to give preference to? Currently, we don't, so for now
@ -1085,7 +1085,7 @@ public class RSEUIPlugin extends SystemBasePlugin
}*/
/**
* Return an array of SubSystemFactoryProxy objects.
* Return an array of SubSystemConfigurationProxy objects.
* These represent all extensions to our subsystemconfiguration extension point.
*/
public ISubSystemConfigurationProxy[] getSubSystemConfigurationProxies()

14
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.java
View file

@ -51,11 +51,11 @@ import org.eclipse.ui.IWorkbenchPart;
* <li>{@link #getRemoteAdapter(Object)}
*
* <li>{@link #getSubSystem()}
* <li>{@link #getSubSystemFactory()}
* <li>{@link #getSubSystemConfiguration()}
* <li>{@link #getSystemConnection()}
*
* <li>{@link #getRemoteObjectName(Object obj, ISystemRemoteElementAdapter adapter)}
* <li>{@link #getRemoteObjectSubSystemFactoryId(Object obj, ISystemRemoteElementAdapter adapter)}
* <li>{@link #getRemoteObjectSubSystemConfigurationId(Object obj, ISystemRemoteElementAdapter adapter)}
* <li>{@link #getRemoteObjectTypeCategory(Object obj, ISystemRemoteElementAdapter adapter)}
* <li>{@link #getRemoteObjectType(Object obj, ISystemRemoteElementAdapter adapter)}
* <li>{@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 <code>adapter.getSubSystemFactoryId(obj);</code>
* Same as <code>adapter.getSubSystemConfigurationId(obj);</code>
*/
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));

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemTestFilterStringDialog.java
View file

@ -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);

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ISystemConnectionWizardPropertyPage.java
View file

@ -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);
}

2
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/ServerConnectionSecurityPropertyPage.java
View file

@ -101,7 +101,7 @@ public class ServerConnectionSecurityPropertyPage extends SystemBasePropertyPage
return true;
}
public void setSubSystemFactory(ISubSystemConfiguration factory)
public void setSubSystemConfiguration(ISubSystemConfiguration factory)
{
}

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

@ -95,7 +95,7 @@ public class ServerLauncherPropertyPage extends SystemBasePropertyPage implement
return true;
}
public void setSubSystemFactory(ISubSystemConfiguration factory)
public void setSubSystemConfiguration(ISubSystemConfiguration factory)
{
_factory = factory;
}

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

@ -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);

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.java
View file

@ -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()));

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

@ -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);

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

@ -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...
/**
* <i>Configuration method</i><br>

18
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemFactoryPropertyPage.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemTeamViewSubSystemConfigurationPropertyPage.java
View file

@ -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;
}

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

@ -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<values.length); idx++)
{

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

@ -55,7 +55,7 @@ public interface ISystemRemoteElementAdapter extends IRemoteObjectIdentifier
* 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 a value for the type category property for this object
* The value must not be translated, so that property pages registered via xml can subset by it.

16
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemFactoryAdapter.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java
View file

@ -90,7 +90,7 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.dialogs.PropertyPage;
public class SubsystemFactoryAdapter implements ISubsystemConfigurationAdapter, ISystemNewFilterActionConfigurator
public class SubsystemConfigurationAdapter implements ISubsystemConfigurationAdapter, ISystemNewFilterActionConfigurator
{
protected Hashtable imageTable = null;
@ -99,7 +99,7 @@ public class SubsystemFactoryAdapter implements ISubsystemConfigurationAdapter,
private IAction[] filterPoolActions = null;
private IAction[] filterPoolReferenceActions = null;
private IAction[] filterActions = null;
public SubsystemFactoryAdapter()
public SubsystemConfigurationAdapter()
{
}
@ -279,14 +279,14 @@ public class SubsystemFactoryAdapter implements ISubsystemConfigurationAdapter,
// * @see #supportsUserDefinedActions()
// * @see #createActionSubSystem()
// */
// public SystemUDActionSubsystem getActionSubSystem(ISubSystemFactory factory, ISubSystem subsystem)
// public SystemUDActionSubsystem getActionSubSystem(ISubSystemConfiguration factory, ISubSystem subsystem)
// {
// if (udas == null)
// udas = createActionSubSystem(factory);
// if (udas != null)
// {
// udas.setSubsystem(subsystem);
// udas.setSubSystemFactory(factory);
// udas.setSubSystemConfiguration(factory);
// }
// return udas;
// }
@ -298,7 +298,7 @@ public class SubsystemFactoryAdapter implements ISubsystemConfigurationAdapter,
// * @see #supportsUserDefinedActions()
// * @see #getActionSubSystem(ISubSystem)
// */
// protected SystemUDActionSubsystem createActionSubSystem(ISubSystemFactory factory)
// protected SystemUDActionSubsystem createActionSubSystem(ISubSystemConfiguration factory)
// {
// return null;
// }
@ -310,7 +310,7 @@ public class SubsystemFactoryAdapter implements ISubsystemConfigurationAdapter,
// * This is called by the addCommonRemoteObjectsActions method, if this subsystem
// * supports user defined actions.
// */
// public static void addUserDefinedActions(ISubSystemFactory factory, Shell shell, IStructuredSelection selection, SystemMenuManager menu, String menuGroup, SystemUDActionSubsystem userActionSubSystem)
// public static void addUserDefinedActions(ISubSystemConfiguration factory, Shell shell, IStructuredSelection selection, SystemMenuManager menu, String menuGroup, SystemUDActionSubsystem userActionSubSystem)
// {
// SystemUDACascadeAction act = new SystemUDACascadeAction(userActionSubSystem, selection);
// menu.add(menuGroup, act);
@ -488,7 +488,7 @@ public class SubsystemFactoryAdapter implements ISubsystemConfigurationAdapter,
SystemFilterPoolReferenceManager refMgr = selectedSubSystem.getSystemFilterPoolReferenceManager();
SystemFilterPool[] refdPools = refMgr.getReferencedSystemFilterPools();
if ( refdPools.length == 0 )
RSEUIPlugin.logInfo("SubSystemFactoryImpl::getSubSystemActions - getReferencedSystemFilterPools returned array of lenght zero.");
RSEUIPlugin.logInfo("SubSystemConfigurationImpl::getSubSystemActions - getReferencedSystemFilterPools returned array of lenght zero.");
for (int idx=0; idx<newFilterActions.length; idx++)
{
if (newFilterActions[idx] instanceof SystemFilterBaseNewFilterAction && refdPools.length > 0 )
@ -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...

4
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemFactoryAdapterFactory.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapterFactory.java
View file

@ -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()

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

@ -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)
{

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

@ -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));

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

@ -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)

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

@ -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;
}

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

@ -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

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

@ -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];
}

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

@ -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;
}

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

@ -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);
}
/**
* <i>Overridden from parent.</i><br>
@ -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)
{

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

@ -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);
}

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

@ -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;

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

@ -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");

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

@ -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;

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewCategoryAdapter.java
View file

@ -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; idx<nodes.length; idx++)
{
nodes[idx] = (SystemTeamViewSubSystemFactoryNode)v.elementAt(idx);
nodes[idx] = (SystemTeamViewSubSystemConfigurationNode)v.elementAt(idx);
}
}
return nodes;

12
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewContentProvider.java
View file

@ -71,10 +71,10 @@ public class SystemTeamViewContentProvider extends WorkbenchContentProvider
}
/*
String name = element.getClass().getName();
if (element instanceof SystemTeamViewSubSystemFactoryNode)
if (element instanceof SystemTeamViewSubSystemConfigurationNode)
{
SystemTeamViewSubSystemFactoryNode ssfNode = (SystemTeamViewSubSystemFactoryNode)element;
name = ssfNode.getParentCategory().getLabel() + "." + ssfNode.getSubSystemFactory().getName();
SystemTeamViewSubSystemConfigurationNode ssfNode = (SystemTeamViewSubSystemConfigurationNode)element;
name = ssfNode.getParentCategory().getLabel() + "." + ssfNode.getSubSystemConfiguration().getName();
}
else if (element instanceof SystemTeamViewCategoryNode)
{
@ -117,10 +117,10 @@ public class SystemTeamViewContentProvider extends WorkbenchContentProvider
}
/* debug info
String name = element.getClass().getName();
if (element instanceof SystemTeamViewSubSystemFactoryNode)
if (element instanceof SystemTeamViewSubSystemConfigurationNode)
{
SystemTeamViewSubSystemFactoryNode ssfNode = (SystemTeamViewSubSystemFactoryNode)element;
name = ssfNode.getParentCategory().getLabel() + "." + ssfNode.getSubSystemFactory().getName();
SystemTeamViewSubSystemConfigurationNode ssfNode = (SystemTeamViewSubSystemConfigurationNode)element;
name = ssfNode.getParentCategory().getLabel() + "." + ssfNode.getSubSystemConfiguration().getName();
}
else if (element instanceof SystemTeamViewCategoryNode)
{

Some files were not shown because too many files have changed in this diff Show more