[ jEdit-commits ] SF.net SVN: jedit:[23302] plugins/FTP/trunk

[<ez...@us...>]

Revision: 23302
          http://jedit.svn.sourceforge.net/jedit/?rev=23302&view=rev
Author:   ezust
Date:     2013-10-31 15:30:13 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
If the user tries to "cancel" when entering a master password, now it disables password saving. 

Modified Paths:
--------------
    plugins/FTP/trunk/FTP.props
    plugins/FTP/trunk/ftp/ConnectionManager.java
    plugins/FTP/trunk/ftp/SFtpConnection.java
    plugins/FTP/trunk/lang_de.properties
    plugins/FTP/trunk/lang_fr.properties

Modified: plugins/FTP/trunk/FTP.props
===================================================================
--- plugins/FTP/trunk/FTP.props	2013-10-31 03:36:53 UTC (rev 23301)
+++ plugins/FTP/trunk/FTP.props	2013-10-31 15:30:13 UTC (rev 23302)
@@ -3,7 +3,7 @@
 
 plugin.ftp.FtpPlugin.name=FTP
 plugin.ftp.FtpPlugin.author=Slava Pestov, Nicholas O'Leary, Vadim Voituk, Alan Ezust
-plugin.ftp.FtpPlugin.version=1.0.6
+plugin.ftp.FtpPlugin.version=1.0.7
 plugin.ftp.FtpPlugin.dev.revision=$Rev$
 plugin.ftp.FtpPlugin.docs=index.html
 plugin.ftp.FtpPlugin.depend.0=jedit 04.05.99.00
@@ -61,7 +61,7 @@
 login.useProxy=Connect using proxy
 login.useProxyHttp=Connect using proxy (HTTP Proxy only)
 
-ftp.bad-master-password=FTP Plugin: Bad Master Password (failed to restore saved passwords)
+ftp.bad-master-password=Bad Master Password (failed to restore saved passwords)
 ftp.jce.strongkeys.missing=JCE unlimited key strength not available. Unable to encrypt passwords. 
 # Settings
 vfs.ftp.passive=true

Modified: plugins/FTP/trunk/ftp/ConnectionManager.java
===================================================================
--- plugins/FTP/trunk/ftp/ConnectionManager.java	2013-10-31 03:36:53 UTC (rev 23301)
+++ plugins/FTP/trunk/ftp/ConnectionManager.java	2013-10-31 15:30:13 UTC (rev 23302)
@@ -244,11 +244,15 @@
 		while (!restoredPasswords) try
 		{
 			if (masterPassword == null) {
-				if ( (i ==0 ) && !promptMasterPassword()) return;
-				if ((i > 0 ) && !promptMasterPassword(
-					jEdit.getProperty("vfs.sftp.failed-authentication.title"),
-					jEdit.getProperty("login.masterpassword.message")))
+				if ( (i ==0 ) && !promptMasterPassword()) {
+					jEdit.setBooleanProperty("vfs.ftp.storePassword"), false);
 					return;
+				}
+				if ((i > 0 ) && !promptMasterPassword(jEdit.getProperty("ftp.bad-master-password"),
+					jEdit.getProperty("login.masterpassword.message"))) {
+						jEdit.setBooleanProperty("vfs.ftp.storePassword"), false);
+						return;
+					}
 			}
 
 			i++;
@@ -462,7 +466,6 @@
 	} //}}}
 
 
-
 	//{{{ getConnection() method
 	public static Connection getConnection(ConnectionInfo info) throws IOException {
 		Connection connect = null;
@@ -489,8 +492,8 @@
 				} catch (IOException e) {
 					Log.log(Log.DEBUG, ConnectionManager.class, "catch " + e.getClass().getName() + " on "+ info);
 					info.password   = null; // necessary to show login dialog again instead of using saved password again
-					//jEdit.setProperty("ftp.keys."+info.host+"."+info.user, null);
-					throw e;
+					jEdit.unsetProperty("ftp.keys."+info.host+"."+info.user);
+					// throw e;
 				}
 				connections.add(connect);
 			} else {

Modified: plugins/FTP/trunk/ftp/SFtpConnection.java
===================================================================
--- plugins/FTP/trunk/ftp/SFtpConnection.java	2013-10-31 03:36:53 UTC (rev 23301)
+++ plugins/FTP/trunk/ftp/SFtpConnection.java	2013-10-31 15:30:13 UTC (rev 23302)
@@ -133,8 +133,8 @@
 //			sftp.setXForwarding(true);
 			home=sftp.getHome();
 			keyAttempts = 0;
-		} catch(Exception e) {
-			Log.log(Log.ERROR, this, e);
+		} catch(Exception e) {			
+			throw new IOException(e.toString());
 		}
 	}
 

Modified: plugins/FTP/trunk/lang_de.properties
===================================================================
--- plugins/FTP/trunk/lang_de.properties	2013-10-31 03:36:53 UTC (rev 23301)
+++ plugins/FTP/trunk/lang_de.properties	2013-10-31 15:30:13 UTC (rev 23302)
@@ -44,7 +44,7 @@
 login.useProxy=Verbinden unter Verwendung eines Proxy
 login.useProxyHttp=Proxy verwenden (nur HTTP Proxy)
 
-ftp.bad-master-password=FTP Plugin: Bad Master Password (failed to restore saved passwords)
+ftp.bad-master-password=Bad Master Password (failed to restore saved passwords)
 ftp.jce.strongkeys.missing=JCE unlimited key strength not available. Unable to encrypt passwords.
 
 # Error messages

Modified: plugins/FTP/trunk/lang_fr.properties
===================================================================
--- plugins/FTP/trunk/lang_fr.properties	2013-10-31 03:36:53 UTC (rev 23301)
+++ plugins/FTP/trunk/lang_fr.properties	2013-10-31 15:30:13 UTC (rev 23302)
@@ -39,7 +39,7 @@
 login.useProxy=Connexion via un proxy
 login.useProxyHttp=Connexion en utilisant un proxy (uniquement proxy HTTP)
 
-ftp.bad-master-password=Plugin FTP : mot de passe principal invalide (rétablissement des mots de passe enregistrés échoué)
+ftp.bad-master-password=mot de passe principal invalide (rétablissement des mots de passe enregistrés échoué)
 ftp.jce.strongkeys.missing=JCE unlimited key strength indisponible. Impossible de chiffrer les mots de passe. 
 # Error messages
 # XXX - FTP responses seem to end with a newline?

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