From c770d4358e145288ec8ec6dbe9f08f987adf3b4a Mon Sep 17 00:00:00 2001 From: David McKnight Date: Mon, 31 Jul 2006 20:43:50 +0000 Subject: [PATCH] getting rid of "ibm" --- .../dstore/DStoreConnectorService.java | 10 ++--- .../dstore/RexecDstoreServer.java | 6 +-- .../rse/internal/ui/view/SystemView.java | 20 +-------- .../eclipse/rse/ui/ISystemVerifyListener.java | 2 +- .../SystemChangeFilterPropertyPage.java | 4 +- .../SystemConnectionPropertyPage.java | 2 +- ...ystemConnectionSubSystemsPropertyPage.java | 6 +-- .../SystemFilterPoolPropertyPage.java | 2 +- ...SystemFilterPoolReferencePropertyPage.java | 2 +- .../SystemFilterPropertyPage.java | 2 +- .../SystemFilterStringPropertyPage.java | 2 +- .../SystemSubSystemPropertyPageCore.java | 2 +- .../view/SubsystemConfigurationAdapter.java | 4 +- .../rse/ui/view/SystemPerspectiveLayout.java | 3 +- .../rse/ui/view/SystemTableTreeView.java | 2 - .../eclipse/rse/ui/view/SystemTableView.java | 5 --- .../org/eclipse/rse/ui/view/SystemView.java | 20 +-------- .../rse/ui/view/SystemViewMessageAdapter.java | 2 - .../eclipse/rse/ui/view/SystemViewPart.java | 2 +- .../rse/ui/view/team/SystemTeamViewPart.java | 10 +---- ...java => RemoteBaseServerLauncherForm.java} | 6 +-- ...orm.java => RemoteServerLauncherForm.java} | 10 ++--- .../widgets/SystemSelectConnectionForm.java | 1 - ...ava => RemoteServerLauncherConstants.java} | 2 +- .../subsystems/AbstractConnectorService.java | 8 ++-- ...uncher.java => IRemoteServerLauncher.java} | 24 +++++------ .../subsystems/ISubSystemConfiguration.java | 2 +- ...auncher.java => RemoteServerLauncher.java} | 42 +++++++++---------- .../subsystems/SubSystemConfiguration.java | 14 +++---- 29 files changed, 83 insertions(+), 134 deletions(-) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/{IBMBaseServerLauncherForm.java => RemoteBaseServerLauncherForm.java} (90%) rename rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/{IBMServerLauncherForm.java => RemoteServerLauncherForm.java} (98%) rename rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/{IBMServerLauncherConstants.java => RemoteServerLauncherConstants.java} (97%) rename rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/{IIBMServerLauncher.java => IRemoteServerLauncher.java} (86%) rename rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/{IBMServerLauncher.java => RemoteServerLauncher.java} (89%) diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java index a3b052726ed..c271f4a74c1 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/DStoreConnectorService.java @@ -49,7 +49,7 @@ import org.eclipse.rse.core.comm.ISystemKeystoreProvider; import org.eclipse.rse.core.comm.SystemKeystoreProviderManager; import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.core.subsystems.CommunicationsEvent; -import org.eclipse.rse.core.subsystems.IIBMServerLauncher; +import org.eclipse.rse.core.subsystems.IRemoteServerLauncher; import org.eclipse.rse.core.subsystems.IServerLauncher; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ISubSystem; @@ -337,13 +337,13 @@ public class DStoreConnectorService extends AbstractConnectorService implements } } - private IIBMServerLauncher getIBMServerLauncher() + private IRemoteServerLauncher getIBMServerLauncher() { IServerLauncherProperties sl = getRemoteServerLauncherProperties(); //System.out.println("in UniversalSystem#getServerLauncher: sl = "+sl); - if (sl != null && sl instanceof IIBMServerLauncher) + if (sl != null && sl instanceof IRemoteServerLauncher) { - return (IIBMServerLauncher)sl; + return (IRemoteServerLauncher)sl; } else //return ((SubSystemConfigurationImpl)ss.getParentSubSystemConfiguration()).getDefaultIBMServerLauncher(ss); @@ -478,7 +478,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements // ISubSystem ss = getPrimarySubSystem(); getPrimarySubSystem(); - IIBMServerLauncher serverLauncher = getIBMServerLauncher(); + IRemoteServerLauncher serverLauncher = getIBMServerLauncher(); ServerLaunchType serverLauncherType = null; boolean autoDetectSSL = true; diff --git a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java index 4f6e71cbc55..16673585604 100644 --- a/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java +++ b/rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.dstore.core.client.ClientConnection; import org.eclipse.dstore.core.client.ConnectionStatus; import org.eclipse.rse.core.SystemBasePlugin; -import org.eclipse.rse.core.subsystems.IIBMServerLauncher; +import org.eclipse.rse.core.subsystems.IRemoteServerLauncher; import org.eclipse.rse.core.subsystems.IServerLauncher; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.model.SystemSignonInformation; @@ -358,12 +358,12 @@ public class RexecDstoreServer implements IServerLauncher { this.propertyInfo = propertyInfo; // set path... - this.cwd = ((IIBMServerLauncher)propertyInfo).getServerPath(); + this.cwd = ((IRemoteServerLauncher)propertyInfo).getServerPath(); char separatorChar = signonInfo.getSystemType().equals("Windows") ? '\\' : '/'; if (cwd.length() > 0 && cwd.charAt(cwd.length() - 1) != separatorChar) cwd += separatorChar; // set script... - this.invocation = ((IIBMServerLauncher)propertyInfo).getServerScript(); + this.invocation = ((IRemoteServerLauncher)propertyInfo).getServerScript(); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java index c7b7ed7c772..59e61beb9f0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemView.java @@ -791,17 +791,7 @@ public class SystemView extends TreeViewer implements ISystemTree, return gotoActions; } - /* - * Helper method to collapse a node in the tree, and then re-expand it one element deep. - * Called by com.ibm.etools.systems.SystemBaseElement. - */ - //public void refreshElementChildren(ISystemBaseElement element) - //{ - // boolean expanded = isElementExpanded(element); - // collapseElement(element, true); // collapse and delete children - // if (expanded) - // expandToLevel(element, 1); // re-expand - //} + /** * Helper method to collapse a node in the tree. * Called when a currently expanded subsystem is disconnected. @@ -5133,9 +5123,6 @@ public class SystemView extends TreeViewer implements ISystemTree, if (anyOk) { if (selectionIsRemoteObject) - //sr.fireEvent( - // new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent( - // deleted,ISystemResourceChangeEvent.EVENT_DELETE_REMOTE_MANY,null)); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); else { @@ -5202,10 +5189,7 @@ public class SystemView extends TreeViewer implements ISystemTree, if (ok) { if (remoteAdapter != null) - //sr.fireEvent( - // new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent( - // element,ISystemResourceChangeEvent.EVENT_RENAME_REMOTE, oldFullName)); - sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, + sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, element, parentElement, null, oldFullName, this); else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemVerifyListener.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemVerifyListener.java index e5d2363a249..6e46f787fbd 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemVerifyListener.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/ISystemVerifyListener.java @@ -18,7 +18,7 @@ package org.eclipse.rse.ui; /** * @author mjberger * This is used in forms that are used within dialogs and pages, and - * specifically with {@link org.eclipse.rse.ui.IBMBaseServerLauncherForm}. + * specifically with {@link org.eclipse.rse.ui.RemoteBaseServerLauncherForm}. * It allows the dialog or page to be called back when the form code calls * verify, a method within the form class. This way the diaog or * page can update their error messages if there are any. diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java index 6f96277ffa1..af905fd8008 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemChangeFilterPropertyPage.java @@ -41,8 +41,8 @@ import org.eclipse.swt.widgets.Shell; /** * This is the property page for changing filters. This page used to be the Change dialog. - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.filters.SystemFilter or - * com.ibm.systems.filters.SystemFilterReference. + * The plugin.xml file registers this for objects of class org.eclipse.rse.internal.filters.SystemFilter or + * org.eclipse.rse.filters.SystemFilterReference. *

* If you have your own change filter dialog (versus configuring ours) you must configure this * pane yourself by overriding {@link SubSystemConfiguration#customizeChangeFilterPropertyPage(SystemChangeFilterPropertyPage, ISystemFilter, Shell)} diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java index de70456bb8c..8acb1cd0740 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionPropertyPage.java @@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Control; /** * The property page for connection properties - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.model.SystemConnection + * The plugin.xml file registers this for objects of class org.eclipse.rse.rse.model.IHost */ public class SystemConnectionPropertyPage extends SystemBasePropertyPage implements ISystemMessageLine, ISystemConnectionFormCaller diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java index 330768f91bd..ea742e58c28 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java @@ -47,12 +47,12 @@ import org.eclipse.ui.dialogs.PropertyPage; /** * The property page for subsystem properties when accessed from the connection property page. - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.model.SystemConnection + * The plugin.xml file registers this for objects of class org.eclipse.rse.model.IHost + id="org.eclipse.rse.SystemConnectionSubSystemsPropertyPage"> */ public class SystemConnectionSubSystemsPropertyPage extends SystemBasePropertyPage diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java index 6e0031f0e30..1819a30e6be 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolPropertyPage.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Label; /** * The property page for filter pool properties. * This is an output-only page. - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.filters.SystemFilterPool + * The plugin.xml file registers this for objects of class org.eclipse.rse.internal.filters.SystemFilterPool */ public class SystemFilterPoolPropertyPage extends SystemBasePropertyPage { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java index f56d5570a4d..3b119c0d83a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPoolReferencePropertyPage.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Label; /** * The property page for filter pool properties. * This is an output-only page. - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.filters.SystemFilterPool + * The plugin.xml file registers this for objects of class org.eclipse.rse.internal.filters.SystemFilterPool */ public class SystemFilterPoolReferencePropertyPage extends SystemBasePropertyPage { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java index 10402e41af7..167139c89bc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterPropertyPage.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Label; /** * The property page for filter properties. * This is an output-only page. - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.filters.SystemFilter + * The plugin.xml file registers this for objects of class org.eclipse.rse.internal.filters.SystemFilter */ public class SystemFilterPropertyPage extends SystemBasePropertyPage { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java index 5e76ab91215..c670d4debcc 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemFilterStringPropertyPage.java @@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Shell; /** * The property page for filter string properties. * This is an output-only page. - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.filters.SystemFilterString + * The plugin.xml file registers this for objects of class org.eclipse.rse.internal.filters.SystemFilterString */ public class SystemFilterStringPropertyPage extends SystemBasePropertyPage implements ISystemFilterStringEditPaneListener { diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java index ad9e052111c..86e8d244c10 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemSubSystemPropertyPageCore.java @@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Control; /** * The property page for core subsystem properties. - * The plugin.xml file registers this for objects of class com.ibm.etools.systems.subsystems.SubSystem + * The plugin.xml file registers this for objects of class org.eclipse.rse.internal.subsystems.SubSystem */ public class SystemSubSystemPropertyPageCore extends SystemBasePropertyPage implements ISystemMessages, ISystemMessageLine//, ISystemMessageLineTarget diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java index de08f9e07b2..719c25b1107 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SubsystemConfigurationAdapter.java @@ -80,7 +80,7 @@ import org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage; import org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage; import org.eclipse.rse.ui.propertypages.SystemSubSystemPropertyPageCoreForm; import org.eclipse.rse.ui.validators.ISystemValidator; -import org.eclipse.rse.ui.widgets.IBMServerLauncherForm; +import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm; import org.eclipse.rse.ui.widgets.IServerLauncherForm; import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; import org.eclipse.rse.ui.wizards.SubSystemServiceWizardPage; @@ -1406,7 +1406,7 @@ public class SubsystemConfigurationAdapter implements ISubsystemConfigurationAda */ public IServerLauncherForm getServerLauncherForm(ISubSystemConfiguration factory, Shell shell, ISystemMessageLine msgLine) { - return new IBMServerLauncherForm(shell, msgLine); + return new RemoteServerLauncherForm(shell, msgLine); } /** diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java index 0a7a1729c9b..7afbcd78503 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java @@ -64,8 +64,7 @@ public class SystemPerspectiveLayout implements IPerspectiveFactory folder.addView(IPageLayout.ID_OUTLINE); // put in desktop-supplied outline view // unfortunately we can't do the following as snippets aren't in wswb, according to DKM - //folder.addView("com.ibm.sed.library.libraryView"); // NEW FOR 5.1.2: SNIPPETS VIEW. PSC - + folder= layout.createFolder("org.eclipse.rse.ui.view.PropertiesFolder", IPageLayout.BOTTOM, (float).75, "org.eclipse.rse.ui.view.NavFolder"); //layout.addView(IPageLayout.ID_PROP_SHEET, IPageLayout.BOTTOM, diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java index 6921e05141b..c9b4efb7f1d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableTreeView.java @@ -112,7 +112,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; * show a generic tabletree view of the selected object *

* - * TableViewer comes from com.ibm.jface.viewer */ public class SystemTableTreeView // TODO change TreeViewer to TableTreeViewer when Eclipse fixes SWT viewer @@ -1304,7 +1303,6 @@ implements IMenuListener, ISystemDeleteTarget, ISystemRenameTarget, ISystemSelec for (int idx = 0; idx < deleted.length; idx++) deleted[idx] = deletedVector.elementAt(idx); if (_selectionIsRemoteObject) - //sr.fireEvent(new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvent.EVENT_DELETE_REMOTE_MANY, null)); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); else sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java index 993fb2de78f..9c778b3a5ed 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java @@ -112,8 +112,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; * This subclass of the standard JFace table viewer is used to * show a generic table view of the selected object in the Systems view *

- * - * TableViewer comes from com.ibm.jface.viewer */ public class SystemTableView extends TableViewer @@ -1452,7 +1450,6 @@ public class SystemTableView for (int idx = 0; idx < deleted.length; idx++) deleted[idx] = deletedVector.elementAt(idx); if (_selectionIsRemoteObject) - //sr.fireEvent(new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvent.EVENT_DELETE_REMOTE_MANY, null)); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); else sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); @@ -1533,8 +1530,6 @@ public class SystemTableView { updateItem(widget, element); } - - //sr.fireEvent(new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(element, ISystemResourceChangeEvent.EVENT_RENAME_REMOTE, oldFullName)); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, element, parentElement, remoteAdapter.getSubSystem(element), oldFullName, this); } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java index c7b7ed7c772..59e61beb9f0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemView.java @@ -791,17 +791,7 @@ public class SystemView extends TreeViewer implements ISystemTree, return gotoActions; } - /* - * Helper method to collapse a node in the tree, and then re-expand it one element deep. - * Called by com.ibm.etools.systems.SystemBaseElement. - */ - //public void refreshElementChildren(ISystemBaseElement element) - //{ - // boolean expanded = isElementExpanded(element); - // collapseElement(element, true); // collapse and delete children - // if (expanded) - // expandToLevel(element, 1); // re-expand - //} + /** * Helper method to collapse a node in the tree. * Called when a currently expanded subsystem is disconnected. @@ -5133,9 +5123,6 @@ public class SystemView extends TreeViewer implements ISystemTree, if (anyOk) { if (selectionIsRemoteObject) - //sr.fireEvent( - // new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent( - // deleted,ISystemResourceChangeEvent.EVENT_DELETE_REMOTE_MANY,null)); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this); else { @@ -5202,10 +5189,7 @@ public class SystemView extends TreeViewer implements ISystemTree, if (ok) { if (remoteAdapter != null) - //sr.fireEvent( - // new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent( - // element,ISystemResourceChangeEvent.EVENT_RENAME_REMOTE, oldFullName)); - sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, + sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, element, parentElement, null, oldFullName, this); else diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMessageAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMessageAdapter.java index 4ddad7d1dab..d7543e9f025 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMessageAdapter.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewMessageAdapter.java @@ -29,8 +29,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor; /** * Adapter for displaying temporary message objects when an expand fails or is cancelled. *

- * The objects must all implement com.ibm.etools.systems.model.ISystemExpandablePromptableObject - * to use this adapter. */ public class SystemViewMessageAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java index b28103ec824..731e734d1c0 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewPart.java @@ -1819,7 +1819,7 @@ public class SystemViewPart public String getFactoryId() { //System.out.println("INSIDE GETFACTORYID IN SYSTEMVIEWPART"); - return "com.ibm.etools.systems.systemview.elementfactory"; + return "org.eclipse.rse.systemview.elementfactory"; } /* diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewPart.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewPart.java index 87b869026d4..bb770a942e2 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewPart.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/team/SystemTeamViewPart.java @@ -733,15 +733,7 @@ public class SystemTeamViewPart { if (!item.getId().equals("team.main") || privateProfileStillExists) menuMgr.remove(item); - /* - if (item.getId().startsWith("com.ibm.etools") || - item.getId().startsWith("com_ibm_etools") || - item.getId().equals("ValidationAction") || - item.getId().equals("addJETNature") || - item.getId().equals("addFromHistoryAction")) - { - menuMgr.remove(item); - }*/ + } } } diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMBaseServerLauncherForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java similarity index 90% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMBaseServerLauncherForm.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java index b87db571269..c5de40d7605 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMBaseServerLauncherForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java @@ -16,7 +16,7 @@ package org.eclipse.rse.ui.widgets; -import org.eclipse.rse.core.internal.subsystems.IBMServerLauncherConstants; +import org.eclipse.rse.core.internal.subsystems.RemoteServerLauncherConstants; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ServerLaunchType; import org.eclipse.rse.ui.RSEUIPlugin; @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Shell; /** * Base IBM server launcher form. Extend this to provide a specialized server launcher form */ -public abstract class IBMBaseServerLauncherForm extends SystemBaseForm implements IServerLauncherForm, IBMServerLauncherConstants, ISystemConnectionWizardErrorUpdater +public abstract class RemoteBaseServerLauncherForm extends SystemBaseForm implements IServerLauncherForm, RemoteServerLauncherConstants, ISystemConnectionWizardErrorUpdater { @@ -47,7 +47,7 @@ public abstract class IBMBaseServerLauncherForm extends SystemBaseForm implement * Constructor for EnvironmentVariablesForm. * @param msgLine */ - public IBMBaseServerLauncherForm(Shell shell, ISystemMessageLine msgLine) + public RemoteBaseServerLauncherForm(Shell shell, ISystemMessageLine msgLine) { super(shell, msgLine); _msgLine = msgLine; diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMServerLauncherForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteServerLauncherForm.java similarity index 98% rename from rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMServerLauncherForm.java rename to rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteServerLauncherForm.java index fab76db9566..65479046c1f 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMServerLauncherForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteServerLauncherForm.java @@ -16,7 +16,7 @@ package org.eclipse.rse.ui.widgets; -import org.eclipse.rse.core.subsystems.IIBMServerLauncher; +import org.eclipse.rse.core.subsystems.IRemoteServerLauncher; import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.ServerLaunchType; import org.eclipse.rse.services.clientserver.messages.SystemMessage; @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Text; /** * Comment goes here */ -public class IBMServerLauncherForm extends IBMBaseServerLauncherForm +public class RemoteServerLauncherForm extends RemoteBaseServerLauncherForm { private Button _radioDaemon, _radioRexec, _radioNone, _checkBoxSSL, _checkBoxRexecSSL, _checkBoxAutoDetect; @@ -71,7 +71,7 @@ public class IBMServerLauncherForm extends IBMBaseServerLauncherForm * Constructor for EnvironmentVariablesForm. * @param msgLine */ - public IBMServerLauncherForm(Shell shell, ISystemMessageLine msgLine) + public RemoteServerLauncherForm(Shell shell, ISystemMessageLine msgLine) { super(shell, msgLine); _daemonPortValidator = new ValidatorPortInput(); @@ -245,7 +245,7 @@ public class IBMServerLauncherForm extends IBMBaseServerLauncherForm */ public void initValues(IServerLauncherProperties launcher) { - IIBMServerLauncher isl = (IIBMServerLauncher)launcher; + IRemoteServerLauncher isl = (IRemoteServerLauncher)launcher; ServerLaunchType type = isl.getServerLaunchType(); String path = isl.getServerPath(); @@ -364,7 +364,7 @@ public class IBMServerLauncherForm extends IBMBaseServerLauncherForm boolean useSSL = getUseSSL(); boolean autoDetect = getAutoDetect(); - IIBMServerLauncher isl = (IIBMServerLauncher)launcher; + IRemoteServerLauncher isl = (IRemoteServerLauncher)launcher; isl.setServerLaunchType(launchType); isl.setServerPath(path); isl.setServerScript(invocation); diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java index e30a6e6622d..866ce0f06c7 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java @@ -54,7 +54,6 @@ import org.eclipse.swt.widgets.Text; *

  • {@link #setDefaultConnection(IHost)} *
  • {@link #setSystemTypes(String[])} *
  • {@link #setShowPropertySheet(boolean)} - *
  • {@link #enableAddMode(com.ibm.etools.systems.files.ui.ISystemAddFileListener)} *
  • {@link #setMultipleSelectionMode(boolean)} * *

    diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/IBMServerLauncherConstants.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java similarity index 97% rename from rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/IBMServerLauncherConstants.java rename to rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java index 9556228245d..62839cddffc 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/IBMServerLauncherConstants.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java @@ -19,7 +19,7 @@ package org.eclipse.rse.core.internal.subsystems; /** * This interface defines constants for IBM Server Launcher. */ -public interface IBMServerLauncherConstants +public interface RemoteServerLauncherConstants { /** diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java index 0b6d8562f42..e33d5bb0ac6 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java @@ -977,9 +977,9 @@ public abstract class AbstractConnectorService extends RSEModelObject implements protected void enableServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType, boolean enable) { IServerLauncherProperties sl =getRemoteServerLauncherProperties(); - if (sl instanceof IBMServerLauncher) + if (sl instanceof RemoteServerLauncher) { - IBMServerLauncher isl = (IBMServerLauncher)sl; + RemoteServerLauncher isl = (RemoteServerLauncher)sl; isl.enableServerLaunchType(serverLaunchType, enable); } } @@ -992,9 +992,9 @@ public abstract class AbstractConnectorService extends RSEModelObject implements protected boolean isEnabledServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType) { IServerLauncherProperties sl = getRemoteServerLauncherProperties(); - if (sl instanceof IBMServerLauncher) + if (sl instanceof RemoteServerLauncher) { - IBMServerLauncher isl = (IBMServerLauncher)sl; + RemoteServerLauncher isl = (RemoteServerLauncher)sl; return isl.isEnabledServerLaunchType(serverLaunchType); } else diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IIBMServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java similarity index 86% rename from rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IIBMServerLauncher.java rename to rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java index dabd6965f1f..8a05a80b28c 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IIBMServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java @@ -27,20 +27,20 @@ package org.eclipse.rse.core.subsystems; *

    * The following features are supported: *

    *

    * * @see org.eclipse.rse.core.subsystems.SubsystemsPackage#getIBMServerLauncher() */ -public interface IIBMServerLauncher extends IServerLauncherProperties{ +public interface IRemoteServerLauncher extends IServerLauncherProperties{ /** * Returns the value of the 'Server Launch Type' attribute. @@ -63,7 +63,7 @@ public interface IIBMServerLauncher extends IServerLauncherProperties{ ServerLaunchType getServerLaunchType(); /** - * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerLaunchType Server Launch Type}' attribute. + * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerLaunchType Server Launch Type}' attribute. * * This is the means by which to start the server-side code, as specified by the user, typically. * It is one of the constants in the enumeration class {@link org.eclipse.rse.core.subsystems.ServerLaunchType} @@ -129,7 +129,7 @@ public interface IIBMServerLauncher extends IServerLauncherProperties{ String getServerPath(); /** - * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerPath Server Path}' attribute. + * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerPath Server Path}' attribute. * * Set the path where the server lives on the remote system. Used by at least the REXEC server launch type. * @@ -155,7 +155,7 @@ public interface IIBMServerLauncher extends IServerLauncherProperties{ String getServerScript(); /** - * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerScript Server Script}' attribute. + * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerScript Server Script}' attribute. * * The script to run on the remote system, to start the server code. * diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java index 274bd09040e..0ffa95d9180 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.java @@ -397,7 +397,7 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide * When a subsystem is created, and {@link #supportsServerLaunchProperties()} * returns true, this method is called to create the server launcher instance * associated with the subsystem. The default implementation is to create an - * instance of {@link IIBMServerLauncher}, but override to create your own + * instance of {@link IRemoteServerLauncher}, but override to create your own * ServerLauncher instance if you have your own class. */ public IServerLauncherProperties createServerLauncher(IConnectorService connectorService); diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java similarity index 89% rename from rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java rename to rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java index b686f008f0f..e8d41e3729d 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java @@ -18,7 +18,7 @@ package org.eclipse.rse.core.subsystems; import java.util.Arrays; import java.util.List; -import org.eclipse.rse.core.internal.subsystems.IBMServerLauncherConstants; +import org.eclipse.rse.core.internal.subsystems.RemoteServerLauncherConstants; import org.eclipse.rse.core.internal.subsystems.ServerLauncher; import org.eclipse.rse.internal.model.IPropertyType; import org.eclipse.rse.model.IProperty; @@ -41,20 +41,20 @@ import org.eclipse.rse.ui.SystemResources; *

    * The following features are implemented: *

    *

    * * @generated */ -public class IBMServerLauncher extends ServerLauncher implements IIBMServerLauncher +public class RemoteServerLauncher extends ServerLauncher implements IRemoteServerLauncher { protected static final ServerLaunchType SERVER_LAUNCH_TYPE_EDEFAULT = ServerLaunchType.DAEMON_LITERAL; @@ -100,7 +100,7 @@ public class IBMServerLauncher extends ServerLauncher implements IIBMServerLaunc protected IPropertyType _serverLauncherEnumType; - protected IBMServerLauncher(String name, IConnectorService connectorService) + protected RemoteServerLauncher(String name, IConnectorService connectorService) { super(name, connectorService); } @@ -232,15 +232,15 @@ public class IBMServerLauncher extends ServerLauncher implements IIBMServerLaunc public IServerLauncherProperties cloneServerLauncher(IServerLauncherProperties newOne) { super.cloneServerLauncher(newOne); - IIBMServerLauncher ibmNewOne = (IIBMServerLauncher)newOne; - ibmNewOne.addPropertySets(getPropertySets()); - ibmNewOne.setDaemonPort(getDaemonPort()); - ibmNewOne.setRexecPort(getRexecPort()); - ibmNewOne.setServerLaunchType(getServerLaunchTypeGen()); - ibmNewOne.setServerPath(getServerPath()); - ibmNewOne.setServerScript(getServerScript()); - ibmNewOne.setAutoDetectSSL(getAutoDetectSSL()); - return ibmNewOne; + IRemoteServerLauncher remoteNewOne = (IRemoteServerLauncher)newOne; + remoteNewOne.addPropertySets(getPropertySets()); + remoteNewOne.setDaemonPort(getDaemonPort()); + remoteNewOne.setRexecPort(getRexecPort()); + remoteNewOne.setServerLaunchType(getServerLaunchTypeGen()); + remoteNewOne.setServerPath(getServerPath()); + remoteNewOne.setServerScript(getServerScript()); + remoteNewOne.setAutoDetectSSL(getAutoDetectSSL()); + return remoteNewOne; } /** @@ -376,7 +376,7 @@ public class IBMServerLauncher extends ServerLauncher implements IIBMServerLaunc String serverPath = _serverPath; if ((serverPath == null) || (serverPath.length() == 0)) { - serverPath = IBMServerLauncherConstants.DEFAULT_REXEC_PATH; + serverPath = RemoteServerLauncherConstants.DEFAULT_REXEC_PATH; } return serverPath; } diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java index f8b216524b2..5bca5be24d8 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystemConfiguration.java @@ -33,7 +33,7 @@ import org.eclipse.jface.wizard.IWizard; import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemPreferencesManager; -import org.eclipse.rse.core.internal.subsystems.IBMServerLauncherConstants; +import org.eclipse.rse.core.internal.subsystems.RemoteServerLauncherConstants; import org.eclipse.rse.core.internal.subsystems.SubSystemFilterNamingPolicy; import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilterContainer; @@ -72,7 +72,7 @@ import org.eclipse.rse.ui.validators.ISystemValidator; import org.eclipse.rse.ui.validators.ValidatorPortInput; import org.eclipse.rse.ui.validators.ValidatorSpecialChar; import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; -import org.eclipse.rse.ui.widgets.IBMServerLauncherForm; +import org.eclipse.rse.ui.widgets.RemoteServerLauncherForm; import org.eclipse.rse.ui.widgets.IServerLauncherForm; import org.eclipse.rse.ui.wizards.ISubSystemPropertiesWizardPage; import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; @@ -2648,22 +2648,22 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration * When a subsystem is created, and {@link #supportsServerLaunchProperties()} * returns true, this method is called to create the server launcher instance * associated with the subsystem. The default implementation is to create an - * instance of {@link IIBMServerLauncher}, but override to create your own + * instance of {@link IRemoteServerLauncher}, but override to create your own * ServerLauncher instance if you have your own class. */ public IServerLauncherProperties createServerLauncher(IConnectorService connectorService) { - IIBMServerLauncher sl = new IBMServerLauncher("IBM Server Launcher", connectorService); + IRemoteServerLauncher sl = new RemoteServerLauncher("Remote Server Launcher", connectorService); String systemType = connectorService.getHostType(); if (systemType.equals(IRSESystemType.SYSTEMTYPE_LINUX) || systemType.equals(IRSESystemType.SYSTEMTYPE_POWER_LINUX) || systemType.equals(IRSESystemType.SYSTEMTYPE_ZSERIES_LINUX)) { - sl.setServerScript(IBMServerLauncherConstants.LINUX_REXEC_SCRIPT); + sl.setServerScript(RemoteServerLauncherConstants.LINUX_REXEC_SCRIPT); } else if (systemType.equals(IRSESystemType.SYSTEMTYPE_UNIX) || systemType.equals(IRSESystemType.SYSTEMTYPE_AIX)) { - sl.setServerScript(IBMServerLauncherConstants.UNIX_REXEC_SCRIPT); + sl.setServerScript(RemoteServerLauncherConstants.UNIX_REXEC_SCRIPT); } sl.saveToProperties(); @@ -2678,7 +2678,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration */ public IServerLauncherForm getServerLauncherForm(Shell shell, ISystemMessageLine msgLine) { - return new IBMServerLauncherForm(shell, msgLine); + return new RemoteServerLauncherForm(shell, msgLine); } // ------------------------------------------