diff options
Diffstat (limited to 'plugins')
5 files changed, 46 insertions, 19 deletions
diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFService.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFService.java new file mode 100644 index 000000000..79f1e4624 --- /dev/null +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/ITCFService.java @@ -0,0 +1,25 @@ +/******************************************************************************* + * Adapted from org.eclipse.rse.internal.services.ssh.ISshService + * Copyright (c) 2006, 2010 Wind River Systems, Inc. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Martin Oberhuber (Wind River) - initial API and implementation + * Martin Oberhuber (Wind River) - [170910] Adopt RSE ITerminalService API for SSH + * Intel Corporation - [329654] Make all sub services operate against TCF connector service + *******************************************************************************/ +package org.eclipse.tm.internal.tcf.rse; + +/** + * Markup Interface for services using the TCFConnectorService. + * + * By implementing this interface, services can be recognized + * as operating against an TCFConnectorService. The interface + * is used as the key in a table for looking up the connector + * service when needed. + */ +public interface ITCFService { +}
\ No newline at end of file diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java index 58fdce85f..afaab224b 100644 --- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileService.java @@ -12,6 +12,7 @@ * Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse * Uwe Stieber (Wind River) - [274277] The TCF file service subsystem implementation is not updating the progress monitor * Intel Corporation - [326489] Make recursive copy/delete available (delete/copy a folder contains files) + * Intel Corporation - [329654] Make all sub services operate against TCF connector service *******************************************************************************/ package org.eclipse.tm.internal.tcf.rse.files; @@ -44,7 +45,7 @@ import org.eclipse.rse.services.clientserver.messages.SystemOperationFailedExcep import org.eclipse.rse.services.files.AbstractFileService; import org.eclipse.rse.services.files.IHostFile; import org.eclipse.tm.internal.tcf.rse.Activator; -import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.ITCFService; import org.eclipse.tm.internal.tcf.rse.Messages; import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; @@ -96,7 +97,7 @@ public class TCFFileService extends AbstractFileService { public TCFFileService(IHost host) { connector = (TCFConnectorService)TCFConnectorServiceManager - .getInstance().getConnectorService(host, ITCFSubSystem.class); + .getInstance().getConnectorService(host, ITCFService.class); } @Override diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java index e644f0fca..79e1dd48d 100644 --- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/files/TCFFileSubSystemConfiguration.java @@ -6,9 +6,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Wind River Systems - initial API and implementation + * Wind River Systems - initial API and implementation * Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse - * Intel Corp. - Add Unix File System style detection, set TRUE by default + * Intel Corp. - Add Unix File System style detection, set TRUE by default + * Intel Corporation - [329654] Make all sub services operate against TCF connector service *******************************************************************************/ package org.eclipse.tm.internal.tcf.rse.files; @@ -32,7 +33,7 @@ import org.eclipse.rse.subsystems.files.core.servicesubsystem.FileServiceSubSyst import org.eclipse.rse.subsystems.files.core.subsystems.IHostFileToRemoteFileAdapter; import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem; import org.eclipse.rse.ui.SystemBasePlugin; -import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.ITCFService; import org.eclipse.tm.internal.tcf.rse.Messages; import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; @@ -89,13 +90,12 @@ public class TCFFileSubSystemConfiguration extends FileServiceSubSystemConfigura @Override public IConnectorService getConnectorService(IHost host) { return TCFConnectorServiceManager.getInstance() - .getConnectorService(host, ITCFSubSystem.class); + .getConnectorService(host, getServiceImplType()); } @Override - @SuppressWarnings("rawtypes") - public Class getServiceImplType() { - return TCFFileService.class; + public Class<ITCFService> getServiceImplType() { + return ITCFService.class; } @Override diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessService.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessService.java index b2bd4f8c2..82f1bc622 100644 --- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessService.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessService.java @@ -6,9 +6,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Wind River Systems - initial API and implementation + * Wind River Systems - initial API and implementation * Martin Oberhuber (Wind River) - [238564] Adopt TM 3.0 APIs - * Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse + * Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse + * Intel Corporation - [329654] Make all sub services operate against TCF connector service *******************************************************************************/ package org.eclipse.tm.internal.tcf.rse.processes; @@ -30,7 +31,7 @@ import org.eclipse.rse.services.clientserver.processes.IHostProcessFilter; import org.eclipse.rse.services.clientserver.processes.ISystemProcessRemoteConstants; import org.eclipse.rse.services.processes.AbstractProcessService; import org.eclipse.rse.services.processes.IProcessService; -import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.ITCFService; import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; import org.eclipse.tm.internal.tcf.rse.TCFRSETask; @@ -48,7 +49,7 @@ public class TCFProcessService extends AbstractProcessService implements IProces public TCFProcessService(IHost host) { connector = (TCFConnectorService)TCFConnectorServiceManager - .getInstance().getConnectorService(host, ITCFSubSystem.class); + .getInstance().getConnectorService(host, ITCFService.class); root = new TCFProcessResource(this, null, null, null); } diff --git a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java index 6799254d5..7bfcac8df 100644 --- a/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java +++ b/plugins/org.eclipse.tm.tcf.rse/src/org/eclipse/tm/internal/tcf/rse/processes/TCFProcessSubSystemConfiguration.java @@ -6,8 +6,9 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Wind River Systems - initial API and implementation + * Wind River Systems - initial API and implementation * Uwe Stieber (Wind River) - [271227] Fix compiler warnings in org.eclipse.tm.tcf.rse + * Intel Corporation - [329654] Make all sub services operate against TCF connector service *******************************************************************************/ package org.eclipse.tm.internal.tcf.rse.processes; @@ -18,7 +19,7 @@ import org.eclipse.rse.services.processes.IProcessService; import org.eclipse.rse.subsystems.processes.core.subsystem.IHostProcessToRemoteProcessAdapter; import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystem; import org.eclipse.rse.subsystems.processes.servicesubsystem.ProcessServiceSubSystemConfiguration; -import org.eclipse.tm.internal.tcf.rse.ITCFSubSystem; +import org.eclipse.tm.internal.tcf.rse.ITCFService; import org.eclipse.tm.internal.tcf.rse.TCFConnectorService; import org.eclipse.tm.internal.tcf.rse.TCFConnectorServiceManager; @@ -27,9 +28,8 @@ public class TCFProcessSubSystemConfiguration extends ProcessServiceSubSystemCon private final TCFProcessAdapter process_adapter = new TCFProcessAdapter(); @Override - @SuppressWarnings("rawtypes") - public Class getServiceImplType() { - return TCFProcessService.class; + public Class<ITCFService> getServiceImplType() { + return ITCFService.class; } @Override @@ -50,7 +50,7 @@ public class TCFProcessSubSystemConfiguration extends ProcessServiceSubSystemCon @Override public IConnectorService getConnectorService(IHost host) { return TCFConnectorServiceManager.getInstance() - .getConnectorService(host, ITCFSubSystem.class); + .getConnectorService(host, getServiceImplType()); } @Override |