Refactoring and bug fixes

tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPApplication.java

diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPApplication.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPApplication.java
index 9cb8c09..efc2e9c 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPApplication.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPApplication.java
@@ -27,8 +27,6 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.team.internal.ftp.*;
 import org.eclipse.team.internal.ftp.FTPException;
-import org.eclipse.team.internal.ftp.FTPProxyLocation;
-import org.eclipse.team.internal.ftp.FTPServerLocation;
 import org.eclipse.team.internal.ftp.client.*;
 import org.eclipse.team.internal.ftp.client.FTPClient;
 import org.eclipse.team.internal.ftp.client.FTPCommunicationException;

tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPTestSetup.java

diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPTestSetup.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPTestSetup.java
index 1ed6d2f..f4c54d4 100644
--- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPTestSetup.java
+++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ftp/FTPTestSetup.java
@@ -22,9 +22,9 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.team.internal.ftp.FTPException;
-import org.eclipse.team.internal.ftp.FTPServerLocation;
 import org.eclipse.team.internal.ftp.client.FTPClient;
 import org.eclipse.team.internal.ftp.client.FTPDirectoryEntry;
+import org.eclipse.team.internal.ftp.client.FTPServerLocation;
 import org.eclipse.team.internal.ftp.client.IFTPClientListener;
 
 /**