You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/07/10 13:20:54 UTC
[commons-vfs] branch master updated: Spell as 'writable'.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 0af67fa Spell as 'writable'.
0af67fa is described below
commit 0af67faa1e8ff90b21d4e50b21f9c9469bea8014
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jul 10 09:20:50 2021 -0400
Spell as 'writable'.
---
.../java/org/apache/commons/vfs2/FileObject.java | 2 +-
.../commons/vfs2/provider/AbstractFileObject.java | 10 ++++----
.../compressed/CompressedFileFileObject.java | 2 +-
.../commons/vfs2/provider/tar/TarFileObject.java | 2 +-
.../org/apache/commons/vfs2/Resources.properties | 4 ++--
.../org/apache/commons/vfs2/PermissionsTests.java | 2 +-
.../commons/vfs2/filter/CanReadFileFilterTest.java | 28 +++++++++++-----------
.../vfs2/filter/CanWriteFileFilterTest.java | 24 +++++++++----------
8 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
index 1f5e2d2..63f50ac 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/FileObject.java
@@ -403,7 +403,7 @@ public interface FileObject extends Comparable<FileObject>, Iterable<FileObject>
/**
* Determines if this file can be written to.
*
- * @return {@code true} if this file is writeable, {@code false} if not.
+ * @return {@code true} if this file is writable, {@code false} if not.
* @throws FileSystemException On error determining if this file exists.
*/
boolean isWriteable() throws FileSystemException;
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
index f960bec..330d8f6 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
@@ -347,7 +347,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
throw new FileSystemException("vfs.provider/create-folder-mismatched-type.error", fileName);
}
/*
- * VFS-210: checking for writeable is not always possible as the security constraint might be more complex
+ * VFS-210: checking for writable is not always possible as the security constraint might be more complex
* if (!isWriteable()) { throw new FileSystemException("vfs.provider/create-folder-read-only.error", name);
* }
*/
@@ -527,7 +527,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
* Creates this file as a folder. Is only called when:
* <ul>
* <li>{@link #doGetType} returns {@link FileType#IMAGINARY}.</li>
- * <li>The parent folder exists and is writeable, or this file is the root of the file system.</li>
+ * <li>The parent folder exists and is writable, or this file is the root of the file system.</li>
* </ul>
* This implementation throws an exception.
*
@@ -923,7 +923,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
}
/**
- * Make the file or folder writeable.
+ * Make the file or folder writable.
* <p>
* Only called if {@link #doGetType} does not return {@link FileType#IMAGINARY}.
* </p>
@@ -1630,7 +1630,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
}
return true;
} catch (final Exception exc) {
- throw new FileSystemException("vfs.provider/check-is-writeable.error", fileName, exc);
+ throw new FileSystemException("vfs.provider/check-is-writable.error", fileName, exc);
}
}
@@ -1876,7 +1876,7 @@ public abstract class AbstractFileObject<AFS extends AbstractFileSystem> impleme
try {
return exists() && doSetWritable(readable, ownerOnly);
} catch (final Exception exc) {
- throw new FileSystemException("vfs.provider/set-writeable.error", fileName, exc);
+ throw new FileSystemException("vfs.provider/set-writable.error", fileName, exc);
}
}
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java
index 45de078..340d983 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/compressed/CompressedFileFileObject.java
@@ -59,7 +59,7 @@ public abstract class CompressedFileFileObject<FS extends CompressedFileFileSyst
/**
* Determines if this file can be written to.
*
- * @return {@code true} if this file is writeable, {@code false} if not.
+ * @return {@code true} if this file is writable, {@code false} if not.
* @throws FileSystemException if an error occurs.
*/
@Override
diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
index 099edd3..188e4c9 100644
--- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
+++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileObject.java
@@ -79,7 +79,7 @@ public class TarFileObject extends AbstractFileObject<TarFileSystem> {
/**
* Determines if this file can be written to.
*
- * @return {@code true} if this file is writeable, {@code false} if not.
+ * @return {@code true} if this file is writable, {@code false} if not.
* @throws FileSystemException if an error occurs.
*/
@Override
diff --git a/commons-vfs2/src/main/resources/org/apache/commons/vfs2/Resources.properties b/commons-vfs2/src/main/resources/org/apache/commons/vfs2/Resources.properties
index 35b1664..51e1b8b 100644
--- a/commons-vfs2/src/main/resources/org/apache/commons/vfs2/Resources.properties
+++ b/commons-vfs2/src/main/resources/org/apache/commons/vfs2/Resources.properties
@@ -53,11 +53,11 @@ vfs.provider/copy-missing-file.error=Could not copy "{0}" because it does not ex
vfs.provider/find-files.error=Could not find files in "{0}".
vfs.provider/check-is-executable.error=Could not determine if file "{0}" is executable.
vfs.provider/check-is-hidden.error=Could not determine if file "{0}" is hidden.
-vfs.provider/check-is-writeable.error=Could not determine if file "{0}" is writeable.
+vfs.provider/check-is-writable.error=Could not determine if file "{0}" is writable.
vfs.provider/check-is-readable.error=Could not determine if file "{0}" is readable.
vfs.provider/check-is-symbolic-link.error=Could not determine if file "{0}" is a symbolic link.
vfs.provider/set-executable.error=Could not set the executable flag of file "{0}".
-vfs.provider/set-writeable.error=Could not set the writeable flag of file "{0}".
+vfs.provider/set-writable.error=Could not set the writable flag of file "{0}".
vfs.provider/set-readable.error=Could not set the readable flag of file "{0}".
vfs.provider/get-url.error=Could not create URL for "{0}".
vfs.provider/resync.error=Could not resync "{0}".
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PermissionsTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PermissionsTests.java
index 936e15f..d4d6aed 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PermissionsTests.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PermissionsTests.java
@@ -70,7 +70,7 @@ public class PermissionsTests extends AbstractProviderTestCase {
}
/**
- * Tests for the writeable permission
+ * Tests for the writable permission
*/
@Test
public void testWriteable() throws Exception {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
index fbc524d..cbfb592 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
@@ -35,15 +35,15 @@ import org.junit.Test;
// CHECKSTYLE:OFF Test code
public class CanReadFileFilterTest extends BaseFilterTest {
- private static final String WRITEABLE = "writeable.txt";
+ private static final String WRITABLE = "writable.txt";
private static final String READONLY = "readonly.txt";
private static File testDir;
- private static File writeableFile;
+ private static File writableFile;
- private static FileSelectInfo writeableFileInfo;
+ private static FileSelectInfo writableFileInfo;
private static File readOnlyFile;
@@ -62,9 +62,9 @@ public class CanReadFileFilterTest extends BaseFilterTest {
testDir = getTestDir(CanReadFileFilterTest.class.getName());
- writeableFile = new File(testDir, WRITEABLE);
- writeableFileInfo = createFileSelectInfo(writeableFile);
- FileUtils.touch(writeableFile);
+ writableFile = new File(testDir, WRITABLE);
+ writableFileInfo = createFileSelectInfo(writableFile);
+ FileUtils.touch(writableFile);
readOnlyFile = new File(testDir, READONLY);
readOnlyFileInfo = createFileSelectInfo(readOnlyFile);
@@ -84,9 +84,9 @@ public class CanReadFileFilterTest extends BaseFilterTest {
@AfterClass
public static void afterClass() throws IOException {
- writeableFileInfo = null;
- writeableFile.delete();
- writeableFile = null;
+ writableFileInfo = null;
+ writableFile.delete();
+ writableFile = null;
readOnlyFileInfo = null;
readOnlyFile.delete();
@@ -107,7 +107,7 @@ public class CanReadFileFilterTest extends BaseFilterTest {
@Test
public void testAcceptCanRead() throws FileSystemException {
- Assert.assertTrue(CanReadFileFilter.CAN_READ.accept(writeableFileInfo));
+ Assert.assertTrue(CanReadFileFilter.CAN_READ.accept(writableFileInfo));
Assert.assertTrue(CanReadFileFilter.CAN_READ.accept(readOnlyFileInfo));
Assert.assertFalse(CanReadFileFilter.CAN_READ.accept(notExistingFileInfo));
@@ -116,7 +116,7 @@ public class CanReadFileFilterTest extends BaseFilterTest {
@Test
public void testAcceptCannotRead() throws FileSystemException {
- Assert.assertFalse(CanReadFileFilter.CANNOT_READ.accept(writeableFileInfo));
+ Assert.assertFalse(CanReadFileFilter.CANNOT_READ.accept(writableFileInfo));
Assert.assertFalse(CanReadFileFilter.CANNOT_READ.accept(readOnlyFileInfo));
Assert.assertTrue(CanReadFileFilter.CANNOT_READ.accept(notExistingFileInfo));
@@ -125,7 +125,7 @@ public class CanReadFileFilterTest extends BaseFilterTest {
@Test
public void testAcceptReadOnly() throws FileSystemException {
- Assert.assertFalse(CanReadFileFilter.READ_ONLY.accept(writeableFileInfo));
+ Assert.assertFalse(CanReadFileFilter.READ_ONLY.accept(writableFileInfo));
Assert.assertTrue(CanReadFileFilter.READ_ONLY.accept(readOnlyFileInfo));
Assert.assertFalse(CanReadFileFilter.READ_ONLY.accept(notExistingFileInfo));
@@ -138,7 +138,7 @@ public class CanReadFileFilterTest extends BaseFilterTest {
// CAN_READ Filter
files = zipFileObj.findFiles(new FileFilterSelector(CanReadFileFilter.CAN_READ));
- assertContains(files, READONLY, WRITEABLE);
+ assertContains(files, READONLY, WRITABLE);
Assert.assertEquals(2, files.length);
// CANNOT_READ Filter
@@ -147,7 +147,7 @@ public class CanReadFileFilterTest extends BaseFilterTest {
// READ_ONLY Filter
files = zipFileObj.findFiles(new FileFilterSelector(CanReadFileFilter.READ_ONLY));
- assertContains(files, READONLY, WRITEABLE);
+ assertContains(files, READONLY, WRITABLE);
Assert.assertEquals(2, files.length);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
index f1f568a..744fa8b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
@@ -35,15 +35,15 @@ import org.junit.Test;
// CHECKSTYLE:OFF Test code
public class CanWriteFileFilterTest extends BaseFilterTest {
- private static final String WRITEABLE = "writeable.txt";
+ private static final String WRITABLE = "writable.txt";
private static final String READONLY = "readonly.txt";
private static File testDir;
- private static File writeableFile;
+ private static File writableFile;
- private static FileSelectInfo writeableFileInfo;
+ private static FileSelectInfo writableFileInfo;
private static File readOnlyFile;
@@ -62,9 +62,9 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
testDir = getTestDir(CanWriteFileFilterTest.class.getName());
- writeableFile = new File(testDir, WRITEABLE);
- writeableFileInfo = createFileSelectInfo(writeableFile);
- FileUtils.touch(writeableFile);
+ writableFile = new File(testDir, WRITABLE);
+ writableFileInfo = createFileSelectInfo(writableFile);
+ FileUtils.touch(writableFile);
readOnlyFile = new File(testDir, READONLY);
readOnlyFileInfo = createFileSelectInfo(readOnlyFile);
@@ -84,9 +84,9 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
@AfterClass
public static void afterClass() throws IOException {
- writeableFileInfo = null;
- writeableFile.delete();
- writeableFile = null;
+ writableFileInfo = null;
+ writableFile.delete();
+ writableFile = null;
readOnlyFileInfo = null;
readOnlyFile.delete();
@@ -107,7 +107,7 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
@Test
public void testAcceptCanWrite() throws FileSystemException {
- Assert.assertTrue(CanWriteFileFilter.CAN_WRITE.accept(writeableFileInfo));
+ Assert.assertTrue(CanWriteFileFilter.CAN_WRITE.accept(writableFileInfo));
Assert.assertFalse(CanWriteFileFilter.CAN_WRITE.accept(readOnlyFileInfo));
Assert.assertTrue(CanWriteFileFilter.CAN_WRITE.accept(notExistingFileInfo));
@@ -116,7 +116,7 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
@Test
public void testAcceptCannotWrite() throws FileSystemException {
- Assert.assertFalse(CanWriteFileFilter.CANNOT_WRITE.accept(writeableFileInfo));
+ Assert.assertFalse(CanWriteFileFilter.CANNOT_WRITE.accept(writableFileInfo));
Assert.assertTrue(CanWriteFileFilter.CANNOT_WRITE.accept(readOnlyFileInfo));
Assert.assertFalse(CanWriteFileFilter.CANNOT_WRITE.accept(notExistingFileInfo));
@@ -133,7 +133,7 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
// CANNOT_WRITE Filter
files = zipFileObj.findFiles(new FileFilterSelector(CanWriteFileFilter.CANNOT_WRITE));
- assertContains(files, READONLY, WRITEABLE);
+ assertContains(files, READONLY, WRITABLE);
Assert.assertEquals(2, files.length);
}