jEdit

Revision: 17704
          http://jedit.svn.sourceforge.net/jedit/?rev=17704&view=rev
Author:   kpouer
Date:     2010-04-28 13:12:06 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
fix the VFSFile created by the ftp plugin that were returning the full path instead of filename

Modified Paths:
--------------
    plugins/FTP/trunk/ftp/SFtpConnection.java

Modified: plugins/FTP/trunk/ftp/SFtpConnection.java
===================================================================
--- plugins/FTP/trunk/ftp/SFtpConnection.java	2010-04-28 13:02:02 UTC (rev 17703)
+++ plugins/FTP/trunk/ftp/SFtpConnection.java	2010-04-28 13:12:06 UTC (rev 17704)
@@ -142,7 +142,8 @@
 		FtpVFS.FtpDirectoryEntry returnValue = null;
 		try {
 			SftpATTRS attrs = sftp.stat(path);
-			returnValue = createDirectoryEntry(path, attrs);
+			String name = MiscUtilities.getFileName(path);
+			returnValue = createDirectoryEntry(name, attrs);
 			returnValue.setPath(path);
 			returnValue.setDeletePath(path);
 		} catch(SftpException e) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 22625
          http://jedit.svn.sourceforge.net/jedit/?rev=22625&view=rev
Author:   ezust
Date:     2012-12-28 02:49:30 +0000 (Fri, 28 Dec 2012)
Log Message:
-----------
made string localizable.

Modified Paths:
--------------
    plugins/FTP/trunk/ftp/SFtpConnection.java

Modified: plugins/FTP/trunk/ftp/SFtpConnection.java
===================================================================
--- plugins/FTP/trunk/ftp/SFtpConnection.java	2012-12-28 02:31:52 UTC (rev 22624)
+++ plugins/FTP/trunk/ftp/SFtpConnection.java	2012-12-28 02:49:30 UTC (rev 22625)
@@ -296,7 +296,8 @@
 		passphrase = ConnectionManager.getPassphrase(info.privateKey);
 		if (passphrase==null || keyAttempts != 0)
 		{
-			PasswordDialog pd = new PasswordDialog(jEdit.getActiveView(),"Enter Passphrase for key",message);
+			PasswordDialog pd = new PasswordDialog(jEdit.getActiveView(),
+				jEdit.getProperty("login.privatekeypassword"),message);
 			if (!pd.isOK())
 				return false;
 			passphrase = new String(pd.getPassword());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 22703
          http://jedit.svn.sourceforge.net/jedit/?rev=22703&view=rev
Author:   ezust
Date:     2013-01-20 20:50:16 +0000 (Sun, 20 Jan 2013)
Log Message:
-----------
Attempt to fix #2873889

Modified Paths:
--------------
    plugins/FTP/trunk/ftp/SFtpConnection.java

Modified: plugins/FTP/trunk/ftp/SFtpConnection.java
===================================================================
--- plugins/FTP/trunk/ftp/SFtpConnection.java	2013-01-20 20:17:40 UTC (rev 22702)
+++ plugins/FTP/trunk/ftp/SFtpConnection.java	2013-01-20 20:50:16 UTC (rev 22703)
@@ -22,20 +22,35 @@
 
 package ftp;
 
-import com.jcraft.jsch.*;
+import java.awt.EventQueue;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Vector;
 
-import ftp.FtpVFS.FtpDirectoryEntry;
-
-import java.awt.*;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
 import javax.swing.JOptionPane;
 
+import org.gjt.sp.jedit.MiscUtilities;
 import org.gjt.sp.jedit.jEdit;
-import org.gjt.sp.jedit.MiscUtilities;
 import org.gjt.sp.util.Log;
 
+import com.jcraft.jsch.Channel;
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Proxy;
+import com.jcraft.jsch.ProxyHTTP;
+import com.jcraft.jsch.ProxySOCKS5;
+import com.jcraft.jsch.Session;
+import com.jcraft.jsch.SftpATTRS;
+import com.jcraft.jsch.SftpException;
+import com.jcraft.jsch.UIKeyboardInteractive;
+import com.jcraft.jsch.UserInfo;
+
+import ftp.FtpVFS.FtpDirectoryEntry;
+
 /**
  * Secure FTP connection class
  * @author Slava Pestov
@@ -83,7 +98,7 @@
 			}
 			// }}}
 			
-			Session session = ConnectionManager.client.getSession(info.user, info.host, info.port);
+			session = ConnectionManager.client.getSession(info.user, info.host, info.port);
 			if (proxy != null)
 				session.setProxy(proxy);
 			
@@ -243,9 +258,12 @@
 	
 	void logout() throws IOException {
 		sftp.disconnect();
+		session.disconnect();
 	}
 	
 	private ChannelSftp sftp;
+	private Session session;
+	
 	private int keyAttempts = 0;
 	
 	// private int symLinkDepth = 0; // not used now
@@ -297,7 +315,7 @@
 		if (passphrase==null || keyAttempts != 0)
 		{
 			PasswordDialog pd = new PasswordDialog(jEdit.getActiveView(),
-				jEdit.getProperty("login.privatekeypassword"),message);
+				jEdit.getProperty("login.privatekeypassword"), message);
 			if (!pd.isOK())
 				return false;
 			passphrase = new String(pd.getPassword());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 22708
          http://jedit.svn.sourceforge.net/jedit/?rev=22708&view=rev
Author:   ezust
Date:     2013-01-21 05:27:20 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
Set agent and x11 forwarding to true.

Modified Paths:
--------------
    plugins/FTP/trunk/ftp/SFtpConnection.java

Modified: plugins/FTP/trunk/ftp/SFtpConnection.java
===================================================================
--- plugins/FTP/trunk/ftp/SFtpConnection.java	2013-01-21 05:24:26 UTC (rev 22707)
+++ plugins/FTP/trunk/ftp/SFtpConnection.java	2013-01-21 05:27:20 UTC (rev 22708)
@@ -116,6 +116,8 @@
 			Channel channel = session.openChannel("sftp");
 			channel.connect();
 			sftp=(ChannelSftp)channel;
+			sftp.setAgentForwarding(true);
+			sftp.setXForwarding(true);
 			home=sftp.getHome();
 			keyAttempts = 0;
 		} catch(Exception e) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.