You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/10/12 23:11:19 UTC
svn commit: r703876 - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/command/impl/
core/src/main/java/org/apache/ftpserver/command/impl/listing/
core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/
core/src/main/java/org...
Author: ngn
Date: Sun Oct 12 14:11:18 2008
New Revision: 703876
URL: http://svn.apache.org/viewvc?rev=703876&view=rev
Log:
Use common naming for methods dealing with the working directory in FileSystemView (FTPSERVER-191)
FtpFile.getFileObject() should be renamed to getFile() (FTPSERVER-189)
Both reported by Andrea Francia, thanks!
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java Sun Oct 12 14:11:18 2008
@@ -100,7 +100,7 @@
// get filenames
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception e) {
LOG.debug("File system threw exception", e);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java Sun Oct 12 14:11:18 2008
@@ -61,12 +61,12 @@
FileSystemView fsview = session.getFileSystemView();
boolean success = false;
try {
- success = fsview.changeDirectory("..");
+ success = fsview.changeWorkingDirectory("..");
} catch (Exception ex) {
LOG.debug("Failed to change directory in file system", ex);
}
if (success) {
- String dirName = fsview.getCurrentDirectory().getFullName();
+ String dirName = fsview.getWorkingDirectory().getFullName();
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "CDUP",
dirName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java Sun Oct 12 14:11:18 2008
@@ -67,12 +67,12 @@
FileSystemView fsview = session.getFileSystemView();
boolean success = false;
try {
- success = fsview.changeDirectory(dirName);
+ success = fsview.changeWorkingDirectory(dirName);
} catch (Exception ex) {
LOG.debug("Failed to change directory in file system", ex);
}
if (success) {
- dirName = fsview.getCurrentDirectory().getFullName();
+ dirName = fsview.getWorkingDirectory().getFullName();
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "CWD",
dirName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java Sun Oct 12 14:11:18 2008
@@ -69,7 +69,7 @@
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Could not get file " + fileName, ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java Sun Oct 12 14:11:18 2008
@@ -96,7 +96,7 @@
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting the file object: " + fileName, ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java Sun Oct 12 14:11:18 2008
@@ -67,7 +67,7 @@
// get file object
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java Sun Oct 12 14:11:18 2008
@@ -70,7 +70,7 @@
// get file object
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java Sun Oct 12 14:11:18 2008
@@ -64,7 +64,7 @@
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(
+ file = session.getFileSystemView().getFile(
parsedArg.getFile());
if (file != null && file.doesExist()) {
FileFormater formater = new MLSTFileFormater((String[]) session
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java Sun Oct 12 14:11:18 2008
@@ -49,7 +49,7 @@
throws IOException, FtpException {
session.resetState();
FileSystemView fsview = session.getFileSystemView();
- String currDir = fsview.getCurrentDirectory().getFullName();
+ String currDir = fsview.getWorkingDirectory().getFullName();
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_257_PATHNAME_CREATED, "PWD", currDir));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java Sun Oct 12 14:11:18 2008
@@ -87,7 +87,7 @@
// get file object
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java Sun Oct 12 14:11:18 2008
@@ -69,7 +69,7 @@
// get file object
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java Sun Oct 12 14:11:18 2008
@@ -68,7 +68,7 @@
// get filename
FtpFile renFr = null;
try {
- renFr = session.getFileSystemView().getFileObject(fileName);
+ renFr = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java Sun Oct 12 14:11:18 2008
@@ -80,7 +80,7 @@
// get target file
FtpFile toFile = null;
try {
- toFile = session.getFileSystemView().getFileObject(toFileStr);
+ toFile = session.getFileSystemView().getFile(toFileStr);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java Sun Oct 12 14:11:18 2008
@@ -66,7 +66,7 @@
// get file object
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java Sun Oct 12 14:11:18 2008
@@ -100,7 +100,7 @@
// get filename
FtpFile file = null;
try {
- file = session.getFileSystemView().getFileObject(fileName);
+ file = session.getFileSystemView().getFile(fileName);
} catch (Exception ex) {
LOG.debug("Exception getting file object", ex);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java Sun Oct 12 14:11:18 2008
@@ -91,7 +91,7 @@
if (pathName == null) {
filePrefix = "ftp.dat";
} else {
- FtpFile dir = session.getFileSystemView().getFileObject(
+ FtpFile dir = session.getFileSystemView().getFile(
pathName);
if (dir.isDirectory()) {
filePrefix = pathName + "/ftp.dat";
@@ -100,7 +100,7 @@
}
}
- file = session.getFileSystemView().getFileObject(filePrefix);
+ file = session.getFileSystemView().getFile(filePrefix);
if (file != null) {
file = getUniqueFile(session, file);
}
@@ -204,7 +204,7 @@
FileSystemView fsView = session.getFileSystemView();
String fileName = newFile.getFullName();
while (newFile.doesExist()) {
- newFile = fsView.getFileObject(fileName + '.'
+ newFile = fsView.getFile(fileName + '.'
+ System.currentTimeMillis());
if (newFile == null) {
break;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java Sun Oct 12 14:11:18 2008
@@ -93,7 +93,7 @@
private List<FtpFile> listFiles(FileSystemView fileSystemView, String file) {
List<FtpFile> files = null;
try {
- FtpFile virtualFile = fileSystemView.getFileObject(file);
+ FtpFile virtualFile = fileSystemView.getFile(file);
if (virtualFile.isFile()) {
files = new ArrayList<FtpFile>();
files.add(virtualFile);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java Sun Oct 12 14:11:18 2008
@@ -95,7 +95,7 @@
/**
* Get the current directory.
*/
- public FtpFile getCurrentDirectory() {
+ public FtpFile getWorkingDirectory() {
FtpFile fileObj = null;
if (currDir.equals("/")) {
fileObj = new NativeFtpFile("/", new File(rootDir), user);
@@ -110,7 +110,7 @@
/**
* Get file object.
*/
- public FtpFile getFileObject(String file) {
+ public FtpFile getFile(String file) {
// get actual file object
String physicalName = NativeFtpFile.getPhysicalName(rootDir,
@@ -125,7 +125,7 @@
/**
* Change directory.
*/
- public boolean changeDirectory(String dir) {
+ public boolean changeWorkingDirectory(String dir) {
// not a directory - return false
dir = NativeFtpFile.getPhysicalName(rootDir, currDir, dir,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java Sun Oct 12 14:11:18 2008
@@ -256,7 +256,7 @@
FileSystemView fsView = session.getFileSystemView();
if (fsView != null) {
try {
- varVal = fsView.getCurrentDirectory().getFullName();
+ varVal = fsView.getWorkingDirectory().getFullName();
} catch (Exception ex) {
varVal = "";
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java Sun Oct 12 14:11:18 2008
@@ -255,7 +255,7 @@
FileSystemView fsView = session.getFileSystemView();
if (fsView != null) {
try {
- varVal = fsView.getCurrentDirectory().getFullName();
+ varVal = fsView.getWorkingDirectory().getFullName();
} catch (Exception ex) {
varVal = "";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java Sun Oct 12 14:11:18 2008
@@ -37,39 +37,39 @@
public void testChangeDirectory() throws Exception {
NativeFileSystemView view = new NativeFileSystemView(user);
- assertEquals("/", view.getCurrentDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getFullName());
- assertTrue(view.changeDirectory(DIR1_NAME));
- assertEquals("/" + DIR1_NAME, view.getCurrentDirectory().getFullName());
+ assertTrue(view.changeWorkingDirectory(DIR1_NAME));
+ assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getFullName());
- assertTrue(view.changeDirectory("."));
- assertEquals("/" + DIR1_NAME, view.getCurrentDirectory().getFullName());
+ assertTrue(view.changeWorkingDirectory("."));
+ assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getFullName());
- assertTrue(view.changeDirectory(".."));
- assertEquals("/", view.getCurrentDirectory().getFullName());
+ assertTrue(view.changeWorkingDirectory(".."));
+ assertEquals("/", view.getWorkingDirectory().getFullName());
- assertTrue(view.changeDirectory("./" + DIR1_NAME));
- assertEquals("/" + DIR1_NAME, view.getCurrentDirectory().getFullName());
+ assertTrue(view.changeWorkingDirectory("./" + DIR1_NAME));
+ assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getFullName());
- assertTrue(view.changeDirectory("~"));
- assertEquals("/", view.getCurrentDirectory().getFullName());
+ assertTrue(view.changeWorkingDirectory("~"));
+ assertEquals("/", view.getWorkingDirectory().getFullName());
}
public void testChangeDirectoryCaseInsensitive() throws Exception {
NativeFileSystemView view = new NativeFileSystemView(user, true);
- assertEquals("/", view.getCurrentDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getFullName());
- assertTrue(view.changeDirectory("/DIR1"));
- assertEquals("/dir1", view.getCurrentDirectory().getFullName());
- assertTrue(view.getCurrentDirectory().doesExist());
-
- assertTrue(view.changeDirectory("/dir1"));
- assertEquals("/dir1", view.getCurrentDirectory().getFullName());
- assertTrue(view.getCurrentDirectory().doesExist());
-
- assertTrue(view.changeDirectory("/DiR1"));
- assertEquals("/dir1", view.getCurrentDirectory().getFullName());
- assertTrue(view.getCurrentDirectory().doesExist());
+ assertTrue(view.changeWorkingDirectory("/DIR1"));
+ assertEquals("/dir1", view.getWorkingDirectory().getFullName());
+ assertTrue(view.getWorkingDirectory().doesExist());
+
+ assertTrue(view.changeWorkingDirectory("/dir1"));
+ assertEquals("/dir1", view.getWorkingDirectory().getFullName());
+ assertTrue(view.getWorkingDirectory().doesExist());
+
+ assertTrue(view.changeWorkingDirectory("/DiR1"));
+ assertEquals("/dir1", view.getWorkingDirectory().getFullName());
+ assertTrue(view.getWorkingDirectory().doesExist());
}
}
\ No newline at end of file
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java Sun Oct 12 14:11:18 2008
@@ -49,7 +49,7 @@
public void testConstructor() throws FtpException {
NativeFileSystemView view = new NativeFileSystemView(user);
- assertEquals("/", view.getCurrentDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getFullName());
}
public void testConstructorWithNullUser() throws FtpException {
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java?rev=703876&r1=703875&r2=703876&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java Sun Oct 12 14:11:18 2008
@@ -35,17 +35,17 @@
/**
* Get user current directory.
*/
- FtpFile getCurrentDirectory() throws FtpException;
+ FtpFile getWorkingDirectory() throws FtpException;
/**
* Change directory.
*/
- boolean changeDirectory(String dir) throws FtpException;
+ boolean changeWorkingDirectory(String dir) throws FtpException;
/**
* Get file object.
*/
- FtpFile getFileObject(String file) throws FtpException;
+ FtpFile getFile(String file) throws FtpException;
/**
* Does the file system support random file access?