Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java7
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2Method.java3
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java4
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java1
7 files changed, 23 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java
index f615399b1..a65f906ad 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Method.java
@@ -25,14 +25,17 @@ import org.eclipse.team.internal.ccvs.core.*;
*/
public class CVSSSH2Method implements IConnectionMethod {
+ @Override
public String getName() {
return "extssh"; //$NON-NLS-1$
}
+ @Override
public IServerConnection createConnection(ICVSRepositoryLocation root, String password) {
return new CVSSSH2ServerConnection(root, password);
}
+ @Override
public void disconnect(ICVSRepositoryLocation location) {
}
}
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
index 7bdb66a7b..2c4b595f9 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Plugin.java
@@ -37,6 +37,7 @@ public class CVSSSH2Plugin extends Plugin {
plugin = this;
}
+ @Override
public void stop(BundleContext context) throws Exception {
try {
// unregister debug options listener
@@ -54,6 +55,7 @@ public class CVSSSH2Plugin extends Plugin {
return plugin;
}
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
index 6594396b5..0c6b7780b 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2ServerConnection.java
@@ -54,6 +54,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
this.e = e;
}
+ @Override
public Throwable getCause() {
return e;
}
@@ -71,6 +72,7 @@ public class CVSSSH2ServerConnection implements IServerConnection {
this.location = location;
this.password = password;
}
+ @Override
public void close() throws IOException {
if (ssh1 != null) {
ssh1.close();
@@ -100,18 +102,21 @@ public class CVSSSH2ServerConnection implements IServerConnection {
}
}
}
+ @Override
public InputStream getInputStream() {
if (ssh1 != null) {
return ssh1.getInputStream();
}
return inputStream;
}
+ @Override
public OutputStream getOutputStream() {
if (ssh1 != null) {
return ssh1.getOutputStream();
}
return outputStream;
}
+ @Override
public void open(IProgressMonitor monitor) throws IOException, CVSAuthenticationException {
if (ssh1 != null) {
ssh1.open(monitor);
@@ -163,12 +168,14 @@ public class CVSSSH2ServerConnection implements IServerConnection {
}
int timeout = location.getTimeout();
inputStream = new PollingInputStream(new TimeoutInputStream(new FilterInputStream(channel_in) {
+ @Override
public void close() {
// Don't close the underlying stream as it belongs to the session
}
},
8192 /*bufferSize*/, (timeout>0 ? 1000 : 0) /*readTimeout*/, -1 /*closeTimeout*/, true /* growWhenFull */), timeout > 0 ? timeout : 1, monitor);
outputStream = new PollingOutputStream(new TimeoutOutputStream(new FilterOutputStream(channel_out) {
+ @Override
public void close() {
// Don't close the underlying stream as it belongs to the session
}
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
index 14c91c3ad..62d43b29a 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/JSchSession.java
@@ -67,12 +67,15 @@ class JSchSession {
// there is not a place to save the given password for ssh2.
if (!location.getMethod().getName().equals("pserverssh2")) { //$NON-NLS-1$
IPasswordStore pstore = new IPasswordStore() {
+ @Override
public void clear(IJSchLocation l) {
location.flushUserInfo();
}
+ @Override
public boolean isCached(IJSchLocation l) {
return location.getUserInfoCached();
}
+ @Override
public void update(IJSchLocation l) {
location.setPassword(l.getPassword());
location.setAllowCaching(true);
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2Method.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2Method.java
index 3b71f48a0..17932ab88 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2Method.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2Method.java
@@ -19,12 +19,15 @@ import org.eclipse.team.internal.ccvs.core.IConnectionMethod;
import org.eclipse.team.internal.ccvs.core.IServerConnection;
public class PServerSSH2Method implements IConnectionMethod {
+ @Override
public String getName() {
return "pserverssh2"; //$NON-NLS-1$
}
+ @Override
public IServerConnection createConnection(ICVSRepositoryLocation root, String password) {
return new PServerSSH2ServerConnection(root, password);
}
+ @Override
public void disconnect(ICVSRepositoryLocation location) {
}
}
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
index 55e5c20c7..3c1e29bab 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/PServerSSH2ServerConnection.java
@@ -37,17 +37,21 @@ public class PServerSSH2ServerConnection implements IServerConnection {
this.password = password;
}
+ @Override
public void close() throws IOException {
psc.close();
}
+ @Override
public InputStream getInputStream() {
return psc.getInputStream();
}
+ @Override
public OutputStream getOutputStream() {
return psc.getOutputStream();
}
+ @Override
public void open(IProgressMonitor monitor) throws IOException, CVSAuthenticationException {
monitor.subTask("PServerSSH2ServerConnection.open"); //$NON-NLS-1$
monitor.worked(1);
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
index 95133cfbd..39dcfb033 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/Policy.java
@@ -21,6 +21,7 @@ public class Policy {
public static boolean DEBUG = false;
static final DebugOptionsListener DEBUG_OPTIONS_LISTENER = new DebugOptionsListener() {
+ @Override
public void optionsChanged(DebugOptions options) {
DEBUG = options.getBooleanOption(CVSSSH2Plugin.ID + "/debug", false); //$NON-NLS-1$
}

Back to the top