mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-05 15:25:49 +02:00
[224671] [api] org.eclipse.rse.core API leaks non-API types
-made ServerLauncher public
This commit is contained in:
parent
2bc0f17cc6
commit
9f9f310e02
2 changed files with 31 additions and 41 deletions
|
@ -14,6 +14,7 @@
|
||||||
* David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
|
* David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
|
||||||
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
|
* Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType
|
||||||
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
|
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
|
||||||
|
* David McKnight (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.core.subsystems;
|
package org.eclipse.rse.core.subsystems;
|
||||||
|
@ -26,7 +27,6 @@ import org.eclipse.rse.core.model.IPropertySet;
|
||||||
import org.eclipse.rse.core.model.IPropertyType;
|
import org.eclipse.rse.core.model.IPropertyType;
|
||||||
import org.eclipse.rse.core.model.PropertyType;
|
import org.eclipse.rse.core.model.PropertyType;
|
||||||
import org.eclipse.rse.internal.core.RSECoreMessages;
|
import org.eclipse.rse.internal.core.RSECoreMessages;
|
||||||
import org.eclipse.rse.internal.core.subsystems.ServerLauncher;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/********************************************************************************
|
/********************************************************************************
|
||||||
* Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved.
|
* Copyright (c) 2004, 2008 IBM Corporation and others. All rights reserved.
|
||||||
* This program and the accompanying materials are made available under the terms
|
* This program and the accompanying materials are made available under the terms
|
||||||
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
* of the Eclipse Public License v1.0 which accompanies this distribution, and is
|
||||||
* available at http://www.eclipse.org/legal/epl-v10.html
|
* available at http://www.eclipse.org/legal/epl-v10.html
|
||||||
|
@ -14,29 +14,36 @@
|
||||||
* David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
|
* David Dykstal (IBM) - 168977: refactoring IConnectorService and ServerLauncher hierarchies
|
||||||
* David Dykstal (IBM) - 142806: refactoring persistence framework
|
* David Dykstal (IBM) - 142806: refactoring persistence framework
|
||||||
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
|
* Martin Oberhuber (Wind River) - [184095] Replace systemTypeName by IRSESystemType
|
||||||
|
* David McKnight (IBM) - [224671] [api] org.eclipse.rse.core API leaks non-API types
|
||||||
********************************************************************************/
|
********************************************************************************/
|
||||||
|
|
||||||
package org.eclipse.rse.internal.core.subsystems;
|
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.model.ILabeledObject;
|
import org.eclipse.rse.core.model.ILabeledObject;
|
||||||
import org.eclipse.rse.core.model.IPropertySet;
|
|
||||||
import org.eclipse.rse.core.model.IRSEPersistableContainer;
|
import org.eclipse.rse.core.model.IRSEPersistableContainer;
|
||||||
import org.eclipse.rse.core.model.RSEModelObject;
|
import org.eclipse.rse.core.model.RSEModelObject;
|
||||||
import org.eclipse.rse.core.subsystems.IConnectorService;
|
|
||||||
import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
|
|
||||||
import org.eclipse.rse.internal.core.RSECoreMessages;
|
import org.eclipse.rse.internal.core.RSECoreMessages;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Abstract class intended to be extended to provide a means for starting a remote server from
|
||||||
|
* the client. DStore-based connector services use this to determine whether to start a sever via daemon, REXEC, or
|
||||||
|
* some other mechanism. For systems that don't need to start remote servers from RSE, this is not
|
||||||
|
* needed.
|
||||||
|
*/
|
||||||
public abstract class ServerLauncher extends RSEModelObject implements IServerLauncherProperties, ILabeledObject
|
public abstract class ServerLauncher extends RSEModelObject implements IServerLauncherProperties, ILabeledObject
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
protected String _name;
|
protected String _name;
|
||||||
private String _label = null;
|
private String _label = null;
|
||||||
protected IConnectorService _connectorService;
|
protected IConnectorService _connectorService;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs a server launcher
|
||||||
|
* @param name name of the server launcher
|
||||||
|
* @param service the associated connector service
|
||||||
|
*/
|
||||||
protected ServerLauncher(String name, IConnectorService service)
|
protected ServerLauncher(String name, IConnectorService service)
|
||||||
{
|
{
|
||||||
super();
|
super();
|
||||||
|
@ -44,26 +51,41 @@ public abstract class ServerLauncher extends RSEModelObject implements IServerLa
|
||||||
_connectorService = service;
|
_connectorService = service;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the name of the server launcher
|
||||||
|
*/
|
||||||
public String getName()
|
public String getName()
|
||||||
{
|
{
|
||||||
return _name;
|
return _name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the label to display in a ui for the server launcher
|
||||||
|
*/
|
||||||
public String getLabel() {
|
public String getLabel() {
|
||||||
if (_label != null) return _label;
|
if (_label != null) return _label;
|
||||||
return _name;
|
return _name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the label to use for display in a ui for the server launcher
|
||||||
|
*/
|
||||||
public void setLabel(String label) {
|
public void setLabel(String label) {
|
||||||
_label = label;
|
_label = label;
|
||||||
setDirty(true);
|
setDirty(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the description of the server launcher
|
||||||
|
*/
|
||||||
public String getDescription()
|
public String getDescription()
|
||||||
{
|
{
|
||||||
return RSECoreMessages.RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION;
|
return RSECoreMessages.RESID_MODELOBJECTS_SERVERLAUNCHER_DESCRIPTION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the associated connector service
|
||||||
|
*/
|
||||||
public IConnectorService getConnectorService()
|
public IConnectorService getConnectorService()
|
||||||
{
|
{
|
||||||
return _connectorService;
|
return _connectorService;
|
||||||
|
@ -93,40 +115,8 @@ public abstract class ServerLauncher extends RSEModelObject implements IServerLa
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated use property sets
|
* Commits the associated connector service to be persisted
|
||||||
* @param vendorName
|
|
||||||
* @param attributeName
|
|
||||||
* @param attributeValue
|
|
||||||
*/
|
*/
|
||||||
public void setVendorAttribute(String vendorName,
|
|
||||||
String attributeName, String attributeValue)
|
|
||||||
{
|
|
||||||
IPropertySet set = getPropertySet(vendorName);
|
|
||||||
if (set == null)
|
|
||||||
{
|
|
||||||
set = createPropertySet(vendorName, ""); //$NON-NLS-1$
|
|
||||||
}
|
|
||||||
set.addProperty(attributeName, attributeValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated use property sets directly now
|
|
||||||
*/
|
|
||||||
public String getVendorAttribute(String vendor, String attributeName)
|
|
||||||
{
|
|
||||||
IPropertySet set = getPropertySet(vendor);
|
|
||||||
if (set != null)
|
|
||||||
{
|
|
||||||
return set.getPropertyValue(attributeName);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public boolean commit()
|
public boolean commit()
|
||||||
{
|
{
|
||||||
return getConnectorService().getHost().commit();
|
return getConnectorService().getHost().commit();
|
Loading…
Add table
Reference in a new issue