[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jedit-cvs
Subject:    [ jEdit-commits ] SF.net SVN: jedit:[23431] plugins/FTP/trunk
From:       ezust () users ! sourceforge ! net
Date:       2014-03-09 18:48:31
Message-ID: E1WMim2-00027x-Lj () sfs-ml-1 ! v29 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 23431
          http://sourceforge.net/p/jedit/svn/23431
Author:   ezust
Date:     2014-03-09 18:48:30 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Moved synchronized to better functions, to avoid exceptions at startup. 

Modified Paths:
--------------
    plugins/FTP/trunk/ftp/ConnectionManager.java
    plugins/FTP/trunk/ftp/SFtpConnection.java
    plugins/FTP/trunk/users-guide.xml

Modified: plugins/FTP/trunk/ftp/ConnectionManager.java
===================================================================
--- plugins/FTP/trunk/ftp/ConnectionManager.java	2014-03-09 18:26:37 UTC (rev 23430)
+++ plugins/FTP/trunk/ftp/ConnectionManager.java	2014-03-09 18:48:30 UTC (rev 23431)
@@ -215,7 +215,7 @@
 				jEdit.getProperty("login.masterpassword.message.create"));
 	}
 
-	protected static synchronized boolean promptMasterPassword(final String title, \
final String message) { +	protected static boolean promptMasterPassword(final String \
title, final String message) {  
 		if (!jEdit.getBooleanProperty("vfs.ftp.storePassword")) return false;
 
@@ -418,7 +418,7 @@
 	} //}}}
 
 	//{{{ getConnectionInfo() method
-	public static ConnectionInfo getConnectionInfo(Component comp, FtpAddress address, \
boolean _secure) +	public static synchronized ConnectionInfo \
getConnectionInfo(Component comp, FtpAddress address, boolean _secure)  {
 		Log.log(Log.DEBUG, "ConnectionManager.getConnectionInfo", address);
 		String hostport, user;
@@ -495,7 +495,7 @@
 	} //}}}
 
 	//{{{ getConnection() method
-	public static Connection getConnection(ConnectionInfo info) throws IOException {
+	public static synchronized Connection getConnection(ConnectionInfo info) throws \
IOException {  Connection connect = null;
 		synchronized(lock) {
 			for (Connection conn : connections)

Modified: plugins/FTP/trunk/ftp/SFtpConnection.java
===================================================================
--- plugins/FTP/trunk/ftp/SFtpConnection.java	2014-03-09 18:26:37 UTC (rev 23430)
+++ plugins/FTP/trunk/ftp/SFtpConnection.java	2014-03-09 18:48:30 UTC (rev 23431)
@@ -349,7 +349,7 @@
 	//{{{ prompting functions
 	public boolean promptPassword(String message){ return true;}
 
-	public synchronized boolean promptPassphrase(String message)
+	public boolean promptPassphrase(String message)
 	{
 		Log.log(Log.DEBUG,this,message);
 		passphrase = ConnectionManager.getPassphrase(info.privateKey);

Modified: plugins/FTP/trunk/users-guide.xml
===================================================================
--- plugins/FTP/trunk/users-guide.xml	2014-03-09 18:26:37 UTC (rev 23430)
+++ plugins/FTP/trunk/users-guide.xml	2014-03-09 18:48:30 UTC (rev 23431)
@@ -242,8 +242,10 @@
     <itemizedlist>
       <listitem><para> Fix #1776 FTP 1.0.8 multiple master password dialog
       </para> </listitem>
+      <listitem><para> Now properly hides splashscreen before popping up
+      dialogs </para></listitem>
     </itemizedlist> </listitem>
- 
+
     <listitem><para><emphasis role="bold">Version 1.0.8</emphasis>
       by Alan Ezust Requires Java 1.6, CommonControls 1.5, and jEdit 4.5.
  		</para>

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


------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works. 
Faster operations. Version large binaries.  Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs


[prev in list] [next in list] [prev in thread] [next in thread]