Merge "Bug 500547 - move JSchUIFileService to o.e.remote.ui.RemoteUIFileService"
diff --git a/bundles/org.eclipse.remote.jsch.ui/plugin.xml b/bundles/org.eclipse.remote.jsch.ui/plugin.xml
index 3e60e75..9668c41 100644
--- a/bundles/org.eclipse.remote.jsch.ui/plugin.xml
+++ b/bundles/org.eclipse.remote.jsch.ui/plugin.xml
@@ -43,7 +43,7 @@
</connectionTypeService>
<connectionTypeService
connectionTypeId="org.eclipse.remote.JSch"
- factory="org.eclipse.remote.internal.jsch.ui.JSchUIFileService$Factory"
+ factory="org.eclipse.remote.ui.RemoteUIFileService$Factory"
service="org.eclipse.remote.ui.IRemoteUIFileService">
</connectionTypeService>
<connectionService
diff --git a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
index a541a0f..5ae3ecf 100644
--- a/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.remote.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.remote.ui;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Activator: org.eclipse.remote.internal.ui.RemoteUIPlugin
Bundle-Vendor: %pluginProvider
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/bundles/org.eclipse.remote.ui/pom.xml b/bundles/org.eclipse.remote.ui/pom.xml
index 42801b8..883274e 100644
--- a/bundles/org.eclipse.remote.ui/pom.xml
+++ b/bundles/org.eclipse.remote.ui/pom.xml
@@ -12,5 +12,5 @@
<artifactId>org.eclipse.remote.ui</artifactId>
<packaging>eclipse-plugin</packaging>
-<version>2.0.0-SNAPSHOT</version>
+<version>2.1.0-SNAPSHOT</version>
</project>
diff --git a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIFileService.java b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIFileService.java
similarity index 93%
rename from bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIFileService.java
rename to bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIFileService.java
index 200c0de..128dd63 100644
--- a/bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/JSchUIFileService.java
+++ b/bundles/org.eclipse.remote.ui/src/org/eclipse/remote/ui/RemoteUIFileService.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - Initial API and implementation
*******************************************************************************/
-package org.eclipse.remote.internal.jsch.ui;
+package org.eclipse.remote.ui;
import java.util.ArrayList;
import java.util.List;
@@ -18,17 +18,19 @@
import org.eclipse.remote.core.IRemoteConnection;
import org.eclipse.remote.core.IRemoteConnectionType;
import org.eclipse.remote.core.IRemoteConnectionType.Service;
-import org.eclipse.remote.ui.IRemoteUIFileService;
import org.eclipse.remote.ui.dialogs.RemoteResourceBrowser;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;
-public class JSchUIFileService implements IRemoteUIFileService {
+/**
+ * @since 2.1
+ */
+public class RemoteUIFileService implements IRemoteUIFileService {
private final IRemoteConnectionType connectionType;
private IRemoteConnection connection = null;
private boolean showConnections = false;
- public JSchUIFileService(IRemoteConnectionType connectionType) {
+ public RemoteUIFileService(IRemoteConnectionType connectionType) {
this.connectionType = connectionType;
}
@@ -37,7 +39,7 @@
@Override
public <T extends Service> T getService(IRemoteConnectionType connectionType, Class<T> service) {
if (IRemoteUIFileService.class.equals(service)) {
- return (T) new JSchUIFileService(connectionType);
+ return (T) new RemoteUIFileService(connectionType);
}
return null;
}
