mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-13 20:15:22 +02:00
Code Issues Wiki Activity

getting rid of "ibm"

Browse source
This commit is contained in:
David McKnight 2006-07-31 20:43:50 +00:00
parent 8383669ac8
commit c770d4358e
29 changed files with 83 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,7 +49,7 @@ import org.eclipse.rse.core.comm.ISystemKeystoreProvider;
import org.eclipse.rse.core.comm.SystemKeystoreProviderManager; import org.eclipse.rse.core.comm.SystemKeystoreProviderManager;
import org.eclipse.rse.core.subsystems.AbstractConnectorService; import org.eclipse.rse.core.subsystems.AbstractConnectorService;
import org.eclipse.rse.core.subsystems.CommunicationsEvent; 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.IServerLauncher;
import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
import org.eclipse.rse.core.subsystems.ISubSystem; 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(); IServerLauncherProperties sl = getRemoteServerLauncherProperties();
//System.out.println("in UniversalSystem#getServerLauncher: sl = "+sl); //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 else
//return ((SubSystemConfigurationImpl)ss.getParentSubSystemConfiguration()).getDefaultIBMServerLauncher(ss); //return ((SubSystemConfigurationImpl)ss.getParentSubSystemConfiguration()).getDefaultIBMServerLauncher(ss);
@ -478,7 +478,7 @@ public class DStoreConnectorService extends AbstractConnectorService implements
// ISubSystem ss = getPrimarySubSystem(); // ISubSystem ss = getPrimarySubSystem();
getPrimarySubSystem(); getPrimarySubSystem();
IIBMServerLauncher serverLauncher = getIBMServerLauncher(); IRemoteServerLauncher serverLauncher = getIBMServerLauncher();
ServerLaunchType serverLauncherType = null; ServerLaunchType serverLauncherType = null;
boolean autoDetectSSL = true; boolean autoDetectSSL = true;

6
rse/plugins/org.eclipse.rse.connectorservice.dstore/src/org/eclipse/rse/connectorservice/dstore/RexecDstoreServer.java
View file

@ -25,7 +25,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.dstore.core.client.ClientConnection; import org.eclipse.dstore.core.client.ClientConnection;
import org.eclipse.dstore.core.client.ConnectionStatus; import org.eclipse.dstore.core.client.ConnectionStatus;
import org.eclipse.rse.core.SystemBasePlugin; 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.IServerLauncher;
import org.eclipse.rse.core.subsystems.IServerLauncherProperties; import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
import org.eclipse.rse.model.SystemSignonInformation; import org.eclipse.rse.model.SystemSignonInformation;
@ -358,12 +358,12 @@ public class RexecDstoreServer implements IServerLauncher
{ {
this.propertyInfo = propertyInfo; this.propertyInfo = propertyInfo;
// set path... // set path...
this.cwd = ((IIBMServerLauncher)propertyInfo).getServerPath(); this.cwd = ((IRemoteServerLauncher)propertyInfo).getServerPath();
char separatorChar = signonInfo.getSystemType().equals("Windows") ? '\\' : '/'; char separatorChar = signonInfo.getSystemType().equals("Windows") ? '\\' : '/';
if (cwd.length() > 0 && cwd.charAt(cwd.length() - 1) != separatorChar) if (cwd.length() > 0 && cwd.charAt(cwd.length() - 1) != separatorChar)
cwd += separatorChar; cwd += separatorChar;
// set script... // set script...
this.invocation = ((IIBMServerLauncher)propertyInfo).getServerScript(); this.invocation = ((IRemoteServerLauncher)propertyInfo).getServerScript();
} }
/** /**

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

@ -791,17 +791,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
return gotoActions; 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. * Helper method to collapse a node in the tree.
* Called when a currently expanded subsystem is disconnected. * Called when a currently expanded subsystem is disconnected.
@ -5133,9 +5123,6 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (anyOk) if (anyOk)
{ {
if (selectionIsRemoteObject) 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); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this);
else else
{ {
@ -5202,10 +5189,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (ok) if (ok)
{ {
if (remoteAdapter != null) if (remoteAdapter != null)
//sr.fireEvent( sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED,
// new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(
// element,ISystemResourceChangeEvent.EVENT_RENAME_REMOTE, oldFullName));
sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED,
element, parentElement, null, oldFullName, this); element, parentElement, null, oldFullName, this);
else else

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

@ -18,7 +18,7 @@ package org.eclipse.rse.ui;
/** /**
* @author mjberger * @author mjberger
* This is used in forms that are used within dialogs and pages, and * 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 * 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 * verify, a method within the form class. This way the diaog or
* page can update their error messages if there are any. * page can update their error messages if there are any.

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

@ -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. * 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 * The plugin.xml file registers this for objects of class org.eclipse.rse.internal.filters.SystemFilter or
* com.ibm.systems.filters.SystemFilterReference. * org.eclipse.rse.filters.SystemFilterReference.
* <p> * <p>
* If you have your own change filter dialog (versus configuring ours) you must configure this * 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)} * pane yourself by overriding {@link SubSystemConfiguration#customizeChangeFilterPropertyPage(SystemChangeFilterPropertyPage, ISystemFilter, Shell)}

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

@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Control;
/** /**
* The property page for connection properties * 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 public class SystemConnectionPropertyPage extends SystemBasePropertyPage
implements ISystemMessageLine, ISystemConnectionFormCaller implements ISystemMessageLine, ISystemConnectionFormCaller

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/propertypages/SystemConnectionSubSystemsPropertyPage.java
View file

@ -47,12 +47,12 @@ import org.eclipse.ui.dialogs.PropertyPage;
/** /**
* The property page for subsystem properties when accessed from the connection property page. * 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
<page <page
objectClass="com.ibm.etools.systems.model.SystemConnection" objectClass="org.eclipse.rse.model.IHost"
name="SubSystems" name="SubSystems"
class="org.eclipse.rse.core.ui.propertypages.SystemConnectionSubSystemsPropertyPage" class="org.eclipse.rse.core.ui.propertypages.SystemConnectionSubSystemsPropertyPage"
id="com.ibm.etools.systems.SystemConnectionSubSystemsPropertyPage"> id="org.eclipse.rse.SystemConnectionSubSystemsPropertyPage">
</page> </page>
*/ */
public class SystemConnectionSubSystemsPropertyPage extends SystemBasePropertyPage public class SystemConnectionSubSystemsPropertyPage extends SystemBasePropertyPage

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

@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Label;
/** /**
* The property page for filter pool properties. * The property page for filter pool properties.
* This is an output-only page. * 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 public class SystemFilterPoolPropertyPage extends SystemBasePropertyPage
{ {

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

@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Label;
/** /**
* The property page for filter pool properties. * The property page for filter pool properties.
* This is an output-only page. * 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 public class SystemFilterPoolReferencePropertyPage extends SystemBasePropertyPage
{ {

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

@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Label;
/** /**
* The property page for filter properties. * The property page for filter properties.
* This is an output-only page. * 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 public class SystemFilterPropertyPage extends SystemBasePropertyPage
{ {

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

@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Shell;
/** /**
* The property page for filter string properties. * The property page for filter string properties.
* This is an output-only page. * 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 public class SystemFilterStringPropertyPage extends SystemBasePropertyPage implements ISystemFilterStringEditPaneListener
{ {

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

@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Control;
/** /**
* The property page for core subsystem properties. * 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 public class SystemSubSystemPropertyPageCore extends SystemBasePropertyPage
implements ISystemMessages, ISystemMessageLine//, ISystemMessageLineTarget implements ISystemMessages, ISystemMessageLine//, ISystemMessageLineTarget

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

@ -80,7 +80,7 @@ import org.eclipse.rse.ui.propertypages.SystemChangeFilterPropertyPage;
import org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage; import org.eclipse.rse.ui.propertypages.SystemFilterStringPropertyPage;
import org.eclipse.rse.ui.propertypages.SystemSubSystemPropertyPageCoreForm; import org.eclipse.rse.ui.propertypages.SystemSubSystemPropertyPageCoreForm;
import org.eclipse.rse.ui.validators.ISystemValidator; 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.widgets.IServerLauncherForm;
import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage;
import org.eclipse.rse.ui.wizards.SubSystemServiceWizardPage; 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) public IServerLauncherForm getServerLauncherForm(ISubSystemConfiguration factory, Shell shell, ISystemMessageLine msgLine)
{ {
return new IBMServerLauncherForm(shell, msgLine); return new RemoteServerLauncherForm(shell, msgLine);
} }
/** /**

3
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemPerspectiveLayout.java
View file

@ -64,8 +64,7 @@ public class SystemPerspectiveLayout implements IPerspectiveFactory
folder.addView(IPageLayout.ID_OUTLINE); // put in desktop-supplied outline view 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 // 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, folder= layout.createFolder("org.eclipse.rse.ui.view.PropertiesFolder", IPageLayout.BOTTOM,
(float).75, "org.eclipse.rse.ui.view.NavFolder"); (float).75, "org.eclipse.rse.ui.view.NavFolder");
//layout.addView(IPageLayout.ID_PROP_SHEET, IPageLayout.BOTTOM, //layout.addView(IPageLayout.ID_PROP_SHEET, IPageLayout.BOTTOM,

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

@ -112,7 +112,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor;
* show a generic tabletree view of the selected object * show a generic tabletree view of the selected object
* <p> * <p>
* *
* TableViewer comes from com.ibm.jface.viewer
*/ */
public class SystemTableTreeView public class SystemTableTreeView
// TODO change TreeViewer to TableTreeViewer when Eclipse fixes SWT viewer // 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++) for (int idx = 0; idx < deleted.length; idx++)
deleted[idx] = deletedVector.elementAt(idx); deleted[idx] = deletedVector.elementAt(idx);
if (_selectionIsRemoteObject) 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); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this);
else else
sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput()));

5
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemTableView.java
View file

@ -112,8 +112,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor;
* This subclass of the standard JFace table viewer is used to * This subclass of the standard JFace table viewer is used to
* show a generic table view of the selected object in the Systems view * show a generic table view of the selected object in the Systems view
* <p> * <p>
*
* TableViewer comes from com.ibm.jface.viewer
*/ */
public class SystemTableView public class SystemTableView
extends TableViewer extends TableViewer
@ -1452,7 +1450,6 @@ public class SystemTableView
for (int idx = 0; idx < deleted.length; idx++) for (int idx = 0; idx < deleted.length; idx++)
deleted[idx] = deletedVector.elementAt(idx); deleted[idx] = deletedVector.elementAt(idx);
if (_selectionIsRemoteObject) 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); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this);
else else
sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput())); sr.fireEvent(new org.eclipse.rse.model.SystemResourceChangeEvent(deleted, ISystemResourceChangeEvents.EVENT_DELETE_MANY, getInput()));
@ -1533,8 +1530,6 @@ public class SystemTableView
{ {
updateItem(widget, element); 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); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED, element, parentElement, remoteAdapter.getSubSystem(element), oldFullName, this);
} }

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

@ -791,17 +791,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
return gotoActions; 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. * Helper method to collapse a node in the tree.
* Called when a currently expanded subsystem is disconnected. * Called when a currently expanded subsystem is disconnected.
@ -5133,9 +5123,6 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (anyOk) if (anyOk)
{ {
if (selectionIsRemoteObject) 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); sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_DELETED, deletedVector, null, null, null, this);
else else
{ {
@ -5202,10 +5189,7 @@ public class SystemView extends TreeViewer implements ISystemTree,
if (ok) if (ok)
{ {
if (remoteAdapter != null) if (remoteAdapter != null)
//sr.fireEvent( sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED,
// new com.ibm.etools.systems.model.impl.SystemResourceChangeEvent(
// element,ISystemResourceChangeEvent.EVENT_RENAME_REMOTE, oldFullName));
sr.fireRemoteResourceChangeEvent(ISystemRemoteChangeEvents.SYSTEM_REMOTE_RESOURCE_RENAMED,
element, parentElement, null, oldFullName, this); element, parentElement, null, oldFullName, this);
else else

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

@ -29,8 +29,6 @@ import org.eclipse.ui.views.properties.IPropertyDescriptor;
/** /**
* Adapter for displaying temporary message objects when an expand fails or is cancelled. * Adapter for displaying temporary message objects when an expand fails or is cancelled.
* <p> * <p>
* The objects must all implement com.ibm.etools.systems.model.ISystemExpandablePromptableObject
* to use this adapter.
*/ */
public class SystemViewMessageAdapter public class SystemViewMessageAdapter
extends AbstractSystemViewAdapter implements ISystemViewElementAdapter extends AbstractSystemViewAdapter implements ISystemViewElementAdapter

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

@ -1819,7 +1819,7 @@ public class SystemViewPart
public String getFactoryId() public String getFactoryId()
{ {
//System.out.println("INSIDE GETFACTORYID IN SYSTEMVIEWPART"); //System.out.println("INSIDE GETFACTORYID IN SYSTEMVIEWPART");
return "com.ibm.etools.systems.systemview.elementfactory"; return "org.eclipse.rse.systemview.elementfactory";
} }
/* /*

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

@ -733,15 +733,7 @@ public class SystemTeamViewPart
{ {
if (!item.getId().equals("team.main") || privateProfileStillExists) if (!item.getId().equals("team.main") || privateProfileStillExists)
menuMgr.remove(item); 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);
}*/
} }
} }
} }

6
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMBaseServerLauncherForm.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteBaseServerLauncherForm.java
View file

@ -16,7 +16,7 @@
package org.eclipse.rse.ui.widgets; 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.IServerLauncherProperties;
import org.eclipse.rse.core.subsystems.ServerLaunchType; import org.eclipse.rse.core.subsystems.ServerLaunchType;
import org.eclipse.rse.ui.RSEUIPlugin; 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 * 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. * Constructor for EnvironmentVariablesForm.
* @param msgLine * @param msgLine
*/ */
public IBMBaseServerLauncherForm(Shell shell, ISystemMessageLine msgLine) public RemoteBaseServerLauncherForm(Shell shell, ISystemMessageLine msgLine)
{ {
super(shell, msgLine); super(shell, msgLine);
_msgLine = msgLine; _msgLine = msgLine;

10
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/IBMServerLauncherForm.java → rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/RemoteServerLauncherForm.java
View file

@ -16,7 +16,7 @@
package org.eclipse.rse.ui.widgets; 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.IServerLauncherProperties;
import org.eclipse.rse.core.subsystems.ServerLaunchType; import org.eclipse.rse.core.subsystems.ServerLaunchType;
import org.eclipse.rse.services.clientserver.messages.SystemMessage; import org.eclipse.rse.services.clientserver.messages.SystemMessage;
@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Text;
/** /**
* Comment goes here * Comment goes here
*/ */
public class IBMServerLauncherForm extends IBMBaseServerLauncherForm public class RemoteServerLauncherForm extends RemoteBaseServerLauncherForm
{ {
private Button _radioDaemon, _radioRexec, _radioNone, _checkBoxSSL, _checkBoxRexecSSL, _checkBoxAutoDetect; private Button _radioDaemon, _radioRexec, _radioNone, _checkBoxSSL, _checkBoxRexecSSL, _checkBoxAutoDetect;
@ -71,7 +71,7 @@ public class IBMServerLauncherForm extends IBMBaseServerLauncherForm
* Constructor for EnvironmentVariablesForm. * Constructor for EnvironmentVariablesForm.
* @param msgLine * @param msgLine
*/ */
public IBMServerLauncherForm(Shell shell, ISystemMessageLine msgLine) public RemoteServerLauncherForm(Shell shell, ISystemMessageLine msgLine)
{ {
super(shell, msgLine); super(shell, msgLine);
_daemonPortValidator = new ValidatorPortInput(); _daemonPortValidator = new ValidatorPortInput();
@ -245,7 +245,7 @@ public class IBMServerLauncherForm extends IBMBaseServerLauncherForm
*/ */
public void initValues(IServerLauncherProperties launcher) public void initValues(IServerLauncherProperties launcher)
{ {
IIBMServerLauncher isl = (IIBMServerLauncher)launcher; IRemoteServerLauncher isl = (IRemoteServerLauncher)launcher;
ServerLaunchType type = isl.getServerLaunchType(); ServerLaunchType type = isl.getServerLaunchType();
String path = isl.getServerPath(); String path = isl.getServerPath();
@ -364,7 +364,7 @@ public class IBMServerLauncherForm extends IBMBaseServerLauncherForm
boolean useSSL = getUseSSL(); boolean useSSL = getUseSSL();
boolean autoDetect = getAutoDetect(); boolean autoDetect = getAutoDetect();
IIBMServerLauncher isl = (IIBMServerLauncher)launcher; IRemoteServerLauncher isl = (IRemoteServerLauncher)launcher;
isl.setServerLaunchType(launchType); isl.setServerLaunchType(launchType);
isl.setServerPath(path); isl.setServerPath(path);
isl.setServerScript(invocation); isl.setServerScript(invocation);

1
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemSelectConnectionForm.java
View file

@ -54,7 +54,6 @@ import org.eclipse.swt.widgets.Text;
* <li>{@link #setDefaultConnection(IHost)} * <li>{@link #setDefaultConnection(IHost)}
* <li>{@link #setSystemTypes(String[])} * <li>{@link #setSystemTypes(String[])}
* <li>{@link #setShowPropertySheet(boolean)} * <li>{@link #setShowPropertySheet(boolean)}
* <li>{@link #enableAddMode(com.ibm.etools.systems.files.ui.ISystemAddFileListener)}
* <li>{@link #setMultipleSelectionMode(boolean)} * <li>{@link #setMultipleSelectionMode(boolean)}
* </ul> * </ul>
* <p> * <p>

2
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/IBMServerLauncherConstants.java → rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/internal/subsystems/RemoteServerLauncherConstants.java
View file

@ -19,7 +19,7 @@ package org.eclipse.rse.core.internal.subsystems;
/** /**
* This interface defines constants for IBM Server Launcher. * This interface defines constants for IBM Server Launcher.
*/ */
public interface IBMServerLauncherConstants public interface RemoteServerLauncherConstants
{ {
/** /**

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

@ -977,9 +977,9 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
protected void enableServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType, boolean enable) protected void enableServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType, boolean enable)
{ {
IServerLauncherProperties sl =getRemoteServerLauncherProperties(); IServerLauncherProperties sl =getRemoteServerLauncherProperties();
if (sl instanceof IBMServerLauncher) if (sl instanceof RemoteServerLauncher)
{ {
IBMServerLauncher isl = (IBMServerLauncher)sl; RemoteServerLauncher isl = (RemoteServerLauncher)sl;
isl.enableServerLaunchType(serverLaunchType, enable); isl.enableServerLaunchType(serverLaunchType, enable);
} }
} }
@ -992,9 +992,9 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
protected boolean isEnabledServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType) protected boolean isEnabledServerLaunchType(ISubSystem subsystem, ServerLaunchType serverLaunchType)
{ {
IServerLauncherProperties sl = getRemoteServerLauncherProperties(); IServerLauncherProperties sl = getRemoteServerLauncherProperties();
if (sl instanceof IBMServerLauncher) if (sl instanceof RemoteServerLauncher)
{ {
IBMServerLauncher isl = (IBMServerLauncher)sl; RemoteServerLauncher isl = (RemoteServerLauncher)sl;
return isl.isEnabledServerLaunchType(serverLaunchType); return isl.isEnabledServerLaunchType(serverLaunchType);
} }
else else

24
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IIBMServerLauncher.java → rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IRemoteServerLauncher.java
View file

@ -27,20 +27,20 @@ package org.eclipse.rse.core.subsystems;
* <p> * <p>
* The following features are supported: * The following features are supported:
* <ul> * <ul>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerLaunchType <em>Server Launch Type</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerLaunchType <em>Server Launch Type</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getPort <em>Port</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getPort <em>Port</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getRexecPort <em>Rexec Port</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getRexecPort <em>Rexec Port</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getDaemonPort <em>Daemon Port</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getDaemonPort <em>Daemon Port</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerPath <em>Server Path</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerPath <em>Server Path</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerScript <em>Server Script</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerScript <em>Server Script</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getIbmAttributes <em>Ibm Attributes</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getIbmAttributes <em>Ibm Attributes</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getRestrictedTypes <em>Restricted Types</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getRestrictedTypes <em>Restricted Types</em>}</li>
* </ul> * </ul>
* </p> * </p>
* *
* @see org.eclipse.rse.core.subsystems.SubsystemsPackage#getIBMServerLauncher() * @see org.eclipse.rse.core.subsystems.SubsystemsPackage#getIBMServerLauncher()
*/ */
public interface IIBMServerLauncher extends IServerLauncherProperties{ public interface IRemoteServerLauncher extends IServerLauncherProperties{
/** /**
* Returns the value of the '<em><b>Server Launch Type</b></em>' attribute. * Returns the value of the '<em><b>Server Launch Type</b></em>' attribute.
@ -63,7 +63,7 @@ public interface IIBMServerLauncher extends IServerLauncherProperties{
ServerLaunchType getServerLaunchType(); ServerLaunchType getServerLaunchType();
/** /**
* Sets the value of the '{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerLaunchType <em>Server Launch Type</em>}' attribute. * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerLaunchType <em>Server Launch Type</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* This is the means by which to start the server-side code, as specified by the user, typically. * 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} * 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(); String getServerPath();
/** /**
* Sets the value of the '{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerPath <em>Server Path</em>}' attribute. * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerPath <em>Server Path</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* Set the path where the server lives on the remote system. Used by at least the REXEC server launch type. * Set the path where the server lives on the remote system. Used by at least the REXEC server launch type.
* <!-- end-user-doc --> * <!-- end-user-doc -->
@ -155,7 +155,7 @@ public interface IIBMServerLauncher extends IServerLauncherProperties{
String getServerScript(); String getServerScript();
/** /**
* Sets the value of the '{@link org.eclipse.rse.core.subsystems.IIBMServerLauncher#getServerScript <em>Server Script</em>}' attribute. * Sets the value of the '{@link org.eclipse.rse.core.subsystems.IRemoteServerLauncher#getServerScript <em>Server Script</em>}' attribute.
* <!-- begin-user-doc --> * <!-- begin-user-doc -->
* The script to run on the remote system, to start the server code. * The script to run on the remote system, to start the server code.
* <!-- end-user-doc --> * <!-- end-user-doc -->

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

@ -397,7 +397,7 @@ public interface ISubSystemConfiguration extends ISystemFilterPoolManagerProvide
* When a subsystem is created, and {@link #supportsServerLaunchProperties()} * When a subsystem is created, and {@link #supportsServerLaunchProperties()}
* returns true, this method is called to create the server launcher instance * returns true, this method is called to create the server launcher instance
* associated with the subsystem. The default implementation is to create an * 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. * ServerLauncher instance if you have your own class.
*/ */
public IServerLauncherProperties createServerLauncher(IConnectorService connectorService); public IServerLauncherProperties createServerLauncher(IConnectorService connectorService);

42
rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/IBMServerLauncher.java → rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/RemoteServerLauncher.java
View file

@ -18,7 +18,7 @@ package org.eclipse.rse.core.subsystems;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; 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.core.internal.subsystems.ServerLauncher;
import org.eclipse.rse.internal.model.IPropertyType; import org.eclipse.rse.internal.model.IPropertyType;
import org.eclipse.rse.model.IProperty; import org.eclipse.rse.model.IProperty;
@ -41,20 +41,20 @@ import org.eclipse.rse.ui.SystemResources;
* <p> * <p>
* The following features are implemented: * The following features are implemented:
* <ul> * <ul>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getServerLaunchType <em>Server Launch Type</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getServerLaunchType <em>Server Launch Type</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getPort <em>Port</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getPort <em>Port</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getRexecPort <em>Rexec Port</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getRexecPort <em>Rexec Port</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getDaemonPort <em>Daemon Port</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getDaemonPort <em>Daemon Port</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getServerPath <em>Server Path</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getServerPath <em>Server Path</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getServerScript <em>Server Script</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getServerScript <em>Server Script</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getIbmAttributes <em>Ibm Attributes</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getIbmAttributes <em>Ibm Attributes</em>}</li>
* <li>{@link org.eclipse.rse.core.subsystems.IBMServerLauncher#getRestrictedTypes <em>Restricted Types</em>}</li> * <li>{@link org.eclipse.rse.core.subsystems.RemoteServerLauncher#getRestrictedTypes <em>Restricted Types</em>}</li>
* </ul> * </ul>
* </p> * </p>
* *
* @generated * @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; 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 IPropertyType _serverLauncherEnumType;
protected IBMServerLauncher(String name, IConnectorService connectorService) protected RemoteServerLauncher(String name, IConnectorService connectorService)
{ {
super(name, connectorService); super(name, connectorService);
} }
@ -232,15 +232,15 @@ public class IBMServerLauncher extends ServerLauncher implements IIBMServerLaunc
public IServerLauncherProperties cloneServerLauncher(IServerLauncherProperties newOne) public IServerLauncherProperties cloneServerLauncher(IServerLauncherProperties newOne)
{ {
super.cloneServerLauncher(newOne); super.cloneServerLauncher(newOne);
IIBMServerLauncher ibmNewOne = (IIBMServerLauncher)newOne; IRemoteServerLauncher remoteNewOne = (IRemoteServerLauncher)newOne;
ibmNewOne.addPropertySets(getPropertySets()); remoteNewOne.addPropertySets(getPropertySets());
ibmNewOne.setDaemonPort(getDaemonPort()); remoteNewOne.setDaemonPort(getDaemonPort());
ibmNewOne.setRexecPort(getRexecPort()); remoteNewOne.setRexecPort(getRexecPort());
ibmNewOne.setServerLaunchType(getServerLaunchTypeGen()); remoteNewOne.setServerLaunchType(getServerLaunchTypeGen());
ibmNewOne.setServerPath(getServerPath()); remoteNewOne.setServerPath(getServerPath());
ibmNewOne.setServerScript(getServerScript()); remoteNewOne.setServerScript(getServerScript());
ibmNewOne.setAutoDetectSSL(getAutoDetectSSL()); remoteNewOne.setAutoDetectSSL(getAutoDetectSSL());
return ibmNewOne; return remoteNewOne;
} }
/** /**
@ -376,7 +376,7 @@ public class IBMServerLauncher extends ServerLauncher implements IIBMServerLaunc
String serverPath = _serverPath; String serverPath = _serverPath;
if ((serverPath == null) || (serverPath.length() == 0)) if ((serverPath == null) || (serverPath.length() == 0))
{ {
serverPath = IBMServerLauncherConstants.DEFAULT_REXEC_PATH; serverPath = RemoteServerLauncherConstants.DEFAULT_REXEC_PATH;
} }
return serverPath; return serverPath;
} }

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

@ -33,7 +33,7 @@ import org.eclipse.jface.wizard.IWizard;
import org.eclipse.rse.core.IRSESystemType; import org.eclipse.rse.core.IRSESystemType;
import org.eclipse.rse.core.SystemBasePlugin; import org.eclipse.rse.core.SystemBasePlugin;
import org.eclipse.rse.core.SystemPreferencesManager; 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.core.internal.subsystems.SubSystemFilterNamingPolicy;
import org.eclipse.rse.filters.ISystemFilter; import org.eclipse.rse.filters.ISystemFilter;
import org.eclipse.rse.filters.ISystemFilterContainer; 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.ValidatorPortInput;
import org.eclipse.rse.ui.validators.ValidatorSpecialChar; import org.eclipse.rse.ui.validators.ValidatorSpecialChar;
import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter; 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.widgets.IServerLauncherForm;
import org.eclipse.rse.ui.wizards.ISubSystemPropertiesWizardPage; import org.eclipse.rse.ui.wizards.ISubSystemPropertiesWizardPage;
import org.eclipse.rse.ui.wizards.ISystemNewConnectionWizardPage; 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()} * When a subsystem is created, and {@link #supportsServerLaunchProperties()}
* returns true, this method is called to create the server launcher instance * returns true, this method is called to create the server launcher instance
* associated with the subsystem. The default implementation is to create an * 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. * ServerLauncher instance if you have your own class.
*/ */
public IServerLauncherProperties createServerLauncher(IConnectorService connectorService) 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(); String systemType = connectorService.getHostType();
if (systemType.equals(IRSESystemType.SYSTEMTYPE_LINUX) || if (systemType.equals(IRSESystemType.SYSTEMTYPE_LINUX) ||
systemType.equals(IRSESystemType.SYSTEMTYPE_POWER_LINUX) || systemType.equals(IRSESystemType.SYSTEMTYPE_POWER_LINUX) ||
systemType.equals(IRSESystemType.SYSTEMTYPE_ZSERIES_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) || else if (systemType.equals(IRSESystemType.SYSTEMTYPE_UNIX) ||
systemType.equals(IRSESystemType.SYSTEMTYPE_AIX)) { systemType.equals(IRSESystemType.SYSTEMTYPE_AIX)) {
sl.setServerScript(IBMServerLauncherConstants.UNIX_REXEC_SCRIPT); sl.setServerScript(RemoteServerLauncherConstants.UNIX_REXEC_SCRIPT);
} }
sl.saveToProperties(); sl.saveToProperties();
@ -2678,7 +2678,7 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
*/ */
public IServerLauncherForm getServerLauncherForm(Shell shell, ISystemMessageLine msgLine) public IServerLauncherForm getServerLauncherForm(Shell shell, ISystemMessageLine msgLine)
{ {
return new IBMServerLauncherForm(shell, msgLine); return new RemoteServerLauncherForm(shell, msgLine);
} }
// ------------------------------------------ // ------------------------------------------