Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[14003] plugins/FTP/trunk
|
From: <vo...@us...> - 2008-11-04 14:01:18
|
Revision: 14003
http://jedit.svn.sourceforge.net/jedit/?rev=14003&view=rev
Author: voituk
Date: 2008-11-04 14:01:03 +0000 (Tue, 04 Nov 2008)
Log Message:
-----------
Code cleanup during debug
Modified Paths:
--------------
plugins/FTP/trunk/FTP.props
plugins/FTP/trunk/ftp/Connection.java
plugins/FTP/trunk/ftp/ConnectionManager.java
plugins/FTP/trunk/ftp/FtpAddress.java
plugins/FTP/trunk/ftp/FtpVFS.java
plugins/FTP/trunk/ftp/SFtpConnection.java
Added Paths:
-----------
plugins/FTP/trunk/.project
Added: plugins/FTP/trunk/.project
===================================================================
--- plugins/FTP/trunk/.project (rev 0)
+++ plugins/FTP/trunk/.project 2008-11-04 14:01:03 UTC (rev 14003)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jEdit-FTP</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: plugins/FTP/trunk/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: plugins/FTP/trunk/FTP.props
===================================================================
--- plugins/FTP/trunk/FTP.props 2008-11-04 09:01:06 UTC (rev 14002)
+++ plugins/FTP/trunk/FTP.props 2008-11-04 14:01:03 UTC (rev 14003)
@@ -3,7 +3,7 @@
plugin.ftp.FtpPlugin.name=FTP
plugin.ftp.FtpPlugin.author=Slava Pestov, Nicholas O'Leary, Vadim Voituk
-plugin.ftp.FtpPlugin.version=0.9.6.3
+plugin.ftp.FtpPlugin.version=0.9.6.5
plugin.ftp.FtpPlugin.dev.revision=$Rev$
plugin.ftp.FtpPlugin.docs=index.html
plugin.ftp.FtpPlugin.depend.0=jedit 04.03.04.00
Modified: plugins/FTP/trunk/ftp/Connection.java
===================================================================
--- plugins/FTP/trunk/ftp/Connection.java 2008-11-04 09:01:06 UTC (rev 14002)
+++ plugins/FTP/trunk/ftp/Connection.java 2008-11-04 14:01:03 UTC (rev 14003)
@@ -23,18 +23,17 @@
int id;
ConnectionInfo info;
String home;
- boolean inUse;
Timer closeTimer;
+
+ private boolean inUse;
Connection(ConnectionInfo info)
{
id = COUNTER++;
this.info = info;
- closeTimer = new Timer(0,new ActionListener()
- {
- public void actionPerformed(ActionEvent evt)
- {
+ closeTimer = new Timer(0,new ActionListener() {
+ public void actionPerformed(ActionEvent evt) {
ConnectionManager.closeConnection(Connection.this);
}
});
@@ -53,41 +52,30 @@
abstract String resolveSymlink(String path, String[] name) throws IOException;
abstract void logout() throws IOException;
- boolean inUse()
- {
+ public boolean inUse() {
return inUse;
}
- void lock()
- {
+ void lock() {
if(inUse)
- {
- throw new InternalError("Trying to lock "
- + "connection twice!");
- }
- else
- {
- Log.log(Log.DEBUG,ConnectionManager.class,
- Thread.currentThread() +
- ": Connection " + this + " locked");
- inUse = true;
- closeTimer.stop();
- }
+ throw new InternalError("Trying to lock connection twice!");
+
+ Log.log(Log.DEBUG,ConnectionManager.class,
+ Thread.currentThread() + ": Connection " + this + " locked");
+ inUse = true;
+ closeTimer.stop();
}
void unlock()
{
- if(!inUse)
- {
+ if(!inUse) {
Log.log(Log.ERROR,ConnectionManager.class,
- new Exception(Thread.currentThread() +
- ": Trying to release connection twice!"));
+ new Exception(Thread.currentThread() + ": Trying to release connection twice!"));
}
else
{
Log.log(Log.DEBUG,ConnectionManager.class,
- Thread.currentThread() +
- ": Connection " + this + " released");
+ Thread.currentThread() + ": Connection " + this + " released");
}
inUse = false;
Modified: plugins/FTP/trunk/ftp/ConnectionManager.java
===================================================================
--- plugins/FTP/trunk/ftp/ConnectionManager.java 2008-11-04 09:01:06 UTC (rev 14002)
+++ plugins/FTP/trunk/ftp/ConnectionManager.java 2008-11-04 14:01:03 UTC (rev 14003)
@@ -327,7 +327,7 @@
} catch (FtpLoginException e) {
Log.log(Log.DEBUG, ConnectionManager.class, "catch FtpLoginException");
//if (e.getResponse().getReturnCode() == "530")
- info.password = null; // to Show login dialog again
+ info.password = null; // necessary to show login dialog again instead of using save password again
throw e;
}
}
@@ -343,8 +343,8 @@
} //}}}
//{{{ releaseConnection() method
- public static void releaseConnection(Connection connect)
- {
+ public static void releaseConnection(Connection connect) {
+ Log.log(Log.DEBUG, ConnectionManager.class, "releaseConnection(" + connect + ")");
if (connect==null) return;
synchronized(lock) {
connect.unlock();
@@ -356,19 +356,18 @@
{
synchronized(lock)
{
- if(connect.inUse)
+ if(connect.inUse()) {
+ Log.log(Log.DEBUG, ConnectionManager.class, "Can't close connection that still in use");
return;
+ }
Log.log(Log.DEBUG,ConnectionManager.class, "Closing connection to "+ connect.info);
- try
- {
+ try {
connect.logout();
}
- catch(IOException io)
- {
+ catch(IOException io) {
Log.log(Log.ERROR,ConnectionManager.class,io);
}
-
connections.remove(connect);
}
} //}}}
@@ -396,8 +395,7 @@
try {
passwordFile.createNewFile();
} catch(IOException e) {
- Log.log(Log.WARNING,ConnectionManager.class,
- "Unable to create password file: "+passwordFile);
+ Log.log(Log.WARNING,ConnectionManager.class, "Unable to create password file: " + passwordFile);
}
}
} //}}}
Modified: plugins/FTP/trunk/ftp/FtpAddress.java
===================================================================
--- plugins/FTP/trunk/ftp/FtpAddress.java 2008-11-04 09:01:06 UTC (rev 14002)
+++ plugins/FTP/trunk/ftp/FtpAddress.java 2008-11-04 14:01:03 UTC (rev 14003)
@@ -22,6 +22,9 @@
package ftp;
+/**
+ * @author Vadim Voituk
+ */
public class FtpAddress {
private String scheme;
@@ -66,7 +69,7 @@
authPart = domainPart.substring(0, pos);
domainPart = domainPart.substring(pos+1);
- // TODO: parse auth part
+ // parse auth part
pos = authPart.indexOf(':');
if (pos == -1) {
this.user = authPart;
Modified: plugins/FTP/trunk/ftp/FtpVFS.java
===================================================================
--- plugins/FTP/trunk/ftp/FtpVFS.java 2008-11-04 09:01:06 UTC (rev 14002)
+++ plugins/FTP/trunk/ftp/FtpVFS.java 2008-11-04 14:01:03 UTC (rev 14003)
@@ -160,9 +160,8 @@
//{{{ createVFSSession() method
public Object createVFSSession(String path, Component comp)
{
- try
- {
- Log.log(Log.DEBUG, this, "FtpVFS.createVFSSession()" );
+ try {
+ Log.log(Log.DEBUG, this, "FtpVFS.createVFSSession("+path+", "+comp+")" );
ConnectionInfo info = ConnectionManager.getConnectionInfo(comp,
path == null ? null : new FtpAddress(path), secure);
@@ -381,8 +380,7 @@
} //}}}
//{{{ _mkdir() method
- public boolean _mkdir(Object _session, String directory, Component comp)
- throws IOException
+ public boolean _mkdir(Object _session, String directory, Component comp) throws IOException
{
Connection session = getConnection(_session);
@@ -423,22 +421,21 @@
//{{{ _finishTwoStageSave() method
public void _finishTwoStageSave(Object _session, Buffer buffer, String path,
- Component comp) throws IOException
- {
+ Component comp) throws IOException {
+ Log.log(Log.DEBUG, "Run FtpVFS._finishTwoStageSave()", path);
Connection session = getConnection(_session);
FtpAddress address = new FtpAddress(path);
+ // Restore permissions
int permissions = buffer.getIntegerProperty(PERMISSIONS_PROPERTY,0);
if(permissions != 0)
session.chmod(address.getPath(),permissions);
} //}}}
- public void _saveComplete(java.lang.Object session,
- Buffer buffer,
- java.lang.String path,
- java.awt.Component comp)
+ public void _saveComplete(java.lang.Object session, Buffer buffer,
+ java.lang.String path, java.awt.Component comp)
throws java.io.IOException
{
}
Modified: plugins/FTP/trunk/ftp/SFtpConnection.java
===================================================================
--- plugins/FTP/trunk/ftp/SFtpConnection.java 2008-11-04 09:01:06 UTC (rev 14002)
+++ plugins/FTP/trunk/ftp/SFtpConnection.java 2008-11-04 14:01:03 UTC (rev 14003)
@@ -238,8 +238,7 @@
return returnValue;
}
- void logout() throws IOException
- {
+ void logout() throws IOException {
sftp.disconnect();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|