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 0999f9e5 Camel-case parameter and internal names
0999f9e5 is described below
commit 0999f9e51c2214dbbeb7b89c99474c659e903ab7
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Oct 19 08:44:15 2023 -0400
Camel-case parameter and internal names
Spelling
---
.../org/apache/commons/vfs2/impl/DefaultFileReplicator.java | 12 ++++++------
.../org/apache/commons/vfs2/provider/TemporaryFileStore.java | 4 ++--
.../vfs2/provider/compressed/CompressedFileFileObject.java | 10 +++++-----
.../java/org/apache/commons/vfs2/ProviderDeleteTests.java | 8 ++++----
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
index 5bc934e7..6ebab481 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
@@ -80,12 +80,12 @@ public class DefaultFileReplicator extends
AbstractVfsComponent implements FileR
@Override
public File allocateFile(final String baseName) throws FileSystemException
{
// Create a unique-ish file name
- final String basename = createFilename(baseName);
+ final String actualBaseName = createFilename(baseName);
synchronized (this) {
filecount++;
}
- return createAndAddFile(tempDir, basename);
+ return createAndAddFile(tempDir, actualBaseName);
}
/**
@@ -110,8 +110,8 @@ public class DefaultFileReplicator extends
AbstractVfsComponent implements FileR
}
}
- protected File createAndAddFile(final File parent, final String basename)
throws FileSystemException {
- final File file = createFile(tempDir, basename);
+ protected File createAndAddFile(final File parent, final String baseName)
throws FileSystemException {
+ final File file = createFile(tempDir, baseName);
// Keep track to delete later
addFile(file);
@@ -221,8 +221,8 @@ public class DefaultFileReplicator extends
AbstractVfsComponent implements FileR
*/
@Override
public File replicateFile(final FileObject srcFile, final FileSelector
selector) throws FileSystemException {
- final String basename = srcFile.getName().getBaseName();
- final File file = allocateFile(basename);
+ final String baseName = srcFile.getName().getBaseName();
+ final File file = allocateFile(baseName);
// Copy from the source file
final FileObject destFile = getContext().toFileObject(file);
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
index 6e106a72..72319e58 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
@@ -28,9 +28,9 @@ public interface TemporaryFileStore {
/**
* Allocates a new temporary file. The file (and all its descendants) will
be deleted when this store is closed.
*
- * @param basename The name of the file.
+ * @param baseName The name of the file.
* @return The temporary file.
* @throws FileSystemException if an error occurs.
*/
- File allocateFile(String basename) throws FileSystemException;
+ File allocateFile(String baseName) throws FileSystemException;
}
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 0b161774..9ec6026f 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
@@ -47,13 +47,13 @@ public abstract class CompressedFileFileObject<FS extends
CompressedFileFileSyst
super(name, fs);
this.container = container;
- // todo, add getBaseName(String) to FileName
- String basename = container.getName().getBaseName();
- final int pos = basename.lastIndexOf('.');
+ // TODO, add getBaseName(String) to FileName
+ String baseName = container.getName().getBaseName();
+ final int pos = baseName.lastIndexOf('.');
if (pos > 0) {
- basename = basename.substring(0, pos);
+ baseName = baseName.substring(0, pos);
}
- children = new String[] {basename};
+ children = new String[] {baseName};
}
@Override
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java
index 0fd53449..d2b71863 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderDeleteTests.java
@@ -24,15 +24,15 @@ import org.junit.Test;
public class ProviderDeleteTests extends AbstractProviderTestCase {
private static class FileNameSelector implements FileSelector {
- final String basename;
+ final String baseName;
- private FileNameSelector(final String basename) {
- this.basename = basename;
+ private FileNameSelector(final String baseName) {
+ this.baseName = baseName;
}
@Override
public boolean includeFile(final FileSelectInfo fileInfo) throws
Exception {
- return
this.basename.equals(fileInfo.getFile().getName().getBaseName());
+ return
this.baseName.equals(fileInfo.getFile().getName().getBaseName());
}
@Override
