commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1362597 - in /commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2: ./ impl/ provider/ provider/local/ tasks/
Date Tue, 17 Jul 2012 18:35:22 GMT
Author: ggregory
Date: Tue Jul 17 18:35:21 2012
New Revision: 1362597

URL: http://svn.apache.org/viewvc?rev=1362597&view=rev
Log:
Fix spelling of 'descendants'.

Modified:
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/AllFileSelector.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystem.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/NameScope.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Selectors.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/PrivilegedFileReplicator.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileReplicator.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileSystem.java
    commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/AllFileSelector.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/AllFileSelector.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/AllFileSelector.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/AllFileSelector.java
Tue Jul 17 18:35:21 2012
@@ -36,7 +36,7 @@ public class AllFileSelector
     /**
      * Determines whether a folder should be traversed.
      * @param fileInfo The file selection information.
-     * @return true if descendents should be traversed, false otherwise.
+     * @return true if descendants should be traversed, false otherwise.
      */
     @Override
     public boolean traverseDescendents(final FileSelectInfo fileInfo)

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileExtensionSelector.java
Tue Jul 17 18:35:21 2012
@@ -98,7 +98,7 @@ public class FileExtensionSelector imple
      *
      * @param fileInfo
      *            The file selection information.
-     * @return true if descendents should be traversed, fase otherwise.
+     * @return true if descendants should be traversed, fase otherwise.
      */
     @Override
     public boolean traverseDescendents(final FileSelectInfo fileInfo)

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileObject.java Tue
Jul 17 18:35:21 2012
@@ -59,7 +59,7 @@ import org.apache.commons.vfs2.operation
  * <p>Other files in the <i>same</i> file system as this file can be found
  * using:
  * <ul>
- * <li>{@link #findFiles} to find a set of matching descendents in in the same file
system.
+ * <li>{@link #findFiles} to find a set of matching descendants in in the same file
system.
  * <li>{@link #getChildren} and {@link #getChild} to find the children of this file.
  * <li>{@link #getParent} to find the folder containing this file.
  * <li>{@link #getFileSystem} to find another file in the same file system.
@@ -68,7 +68,7 @@ import org.apache.commons.vfs2.operation
  * <p/>
  * <p>To find files in another file system, use a {@link FileSystemManager}.
  * <h4>Iterating Files</h4>
- *<p>You can iterate over a FileObject using the Java "foreach" statement, which provides
all descendents of a File
+ *<p>You can iterate over a FileObject using the Java "foreach" statement, which provides
all descendants of a File
  * Object.</p>
  *
  * <h4>Sorting Files</h4>
@@ -249,7 +249,7 @@ public interface FileObject extends Comp
     FileObject resolveFile(String path) throws FileSystemException;
 
     /**
-     * Finds the set of matching descendents of this file, in depthwise order.
+     * Finds the set of matching descendants of this file, in depthwise order.
      *
      * @param selector The selector to use to select matching files.
      * @return The matching files.  The files are returned in depthwise order
@@ -259,7 +259,7 @@ public interface FileObject extends Comp
     FileObject[] findFiles(FileSelector selector) throws FileSystemException;
 
     /**
-      * Finds the set of matching descendents of this file.
+      * Finds the set of matching descendants of this file.
       *
       * @param selector  the selector used to determine if the file should be selected
       * @param depthwise controls the ordering in the list. e.g. deepest first
@@ -270,7 +270,7 @@ public interface FileObject extends Comp
 
     /**
      * Deletes this file.  Does nothing if this file does not exist of if it is a
-     * folder that has children.  Does not delete any descendents of this file,
+     * folder that has children.  Does not delete any descendants of this file,
      * use {@link #delete(FileSelector)} or {@link #deleteAll()} for that.
      *
      * @return true if this object has been deleted
@@ -280,7 +280,7 @@ public interface FileObject extends Comp
     boolean delete() throws FileSystemException;
 
     /**
-     * Deletes all descendents of this file that match a selector.  Does
+     * Deletes all descendants of this file that match a selector.  Does
      * nothing if this file does not exist.
      * 
      * <p>This method is not transactional.  If it fails and throws an
@@ -289,8 +289,8 @@ public interface FileObject extends Comp
      *
      * @param selector The selector to use to select which files to delete.
      * @return the number of deleted objects
-     * @throws FileSystemException If this file or one of its descendents is read-only, or
on error
-     *                             deleting this file or one of its descendents.
+     * @throws FileSystemException If this file or one of its descendants is read-only, or
on error
+     *                             deleting this file or one of its descendants.
      */
     int delete(FileSelector selector) throws FileSystemException;
 
@@ -327,7 +327,7 @@ public interface FileObject extends Comp
     void createFile() throws FileSystemException;
 
     /**
-     * Copies another file, and all its descendents, to this file.
+     * Copies another file, and all its descendants, to this file.
      * <p>
      * If this file does not exist, it is created.  Its parent folder is also
      * created, if necessary.  If this file does exist, it is deleted first.

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystem.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystem.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/FileSystem.java Tue
Jul 17 18:35:21 2012
@@ -149,7 +149,7 @@ public interface FileSystem
     void removeJunction(String junctionPoint) throws FileSystemException;
 
     /**
-     * Creates a temporary local copy of a file and its descendents.  If
+     * Creates a temporary local copy of a file and its descendants.  If
      * this file is already a local file, a copy is not made.
      * <p/>
      * <p>Note that the local copy may include additonal files, that were

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/NameScope.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/NameScope.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/NameScope.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/NameScope.java Tue
Jul 17 18:35:21 2012
@@ -30,14 +30,14 @@ public enum NameScope
     CHILD("child"),
 
     /**
-     * Resolve against the descendents of the base file.  The name is resolved
+     * Resolve against the descendants of the base file.  The name is resolved
      * as described by {@link #FILE_SYSTEM}.  However, an exception is thrown
      * if the resolved file is not a descendent of the base file.
      */
     DESCENDENT("descendent"),
 
     /**
-     * Resolve against the descendents of the base file.  The name is resolved
+     * Resolve against the descendants of the base file.  The name is resolved
      * as described by {@link #FILE_SYSTEM}.  However, an exception is thrown
      * if the resolved file is not a descendent of the base file, or the base
      * files itself.

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/PatternFileSelector.java
Tue Jul 17 18:35:21 2012
@@ -93,7 +93,7 @@ public class PatternFileSelector impleme
      *
      * @param fileInfo
      *            The file selection information.
-     * @return true if descendents should be traversed, false otherwise.
+     * @return true if descendants should be traversed, false otherwise.
      */
     @Override
     public boolean traverseDescendents(final FileSelectInfo fileInfo)

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Selectors.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Selectors.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Selectors.java (original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/Selectors.java Tue
Jul 17 18:35:21 2012
@@ -39,7 +39,7 @@ public final class Selectors
     public static final FileSelector SELECT_CHILDREN = new FileDepthSelector(1);
 
     /**
-     * A {@link FileSelector} that selects all the descendents of the
+     * A {@link FileSelector} that selects all the descendants of the
      * base folder, but does not select the base folder itself.
      */
     public static final FileSelector EXCLUDE_SELF = new FileDepthSelector(1, Integer.MAX_VALUE);
@@ -56,7 +56,7 @@ public final class Selectors
 
     /**
      * A {@link FileSelector} that selects the base file/folder, plus all
-     * its descendents.
+     * its descendants.
      */
     public static final FileSelector SELECT_ALL = new AllFileSelector();
 

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/DefaultFileReplicator.java
Tue Jul 17 18:35:21 2012
@@ -229,7 +229,7 @@ public class DefaultFileReplicator
     }
 
     /**
-     * Creates a local copy of the file, and all its descendents.
+     * Creates a local copy of the file, and all its descendants.
      * @param srcFile The file to copy.
      * @param selector The FileSelector.
      * @return the created File.

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/PrivilegedFileReplicator.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/PrivilegedFileReplicator.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/PrivilegedFileReplicator.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/impl/PrivilegedFileReplicator.java
Tue Jul 17 18:35:21 2012
@@ -112,7 +112,7 @@ public class PrivilegedFileReplicator
     }
 
     /**
-     * Creates a local copy of the file, and all its descendents.
+     * Creates a local copy of the file, and all its descendants.
      * @param srcFile The source FileObject.
      * @param selector The file selector.
      * @return The replicated file.

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileObject.java
Tue Jul 17 18:35:21 2012
@@ -788,7 +788,7 @@ public abstract class AbstractFileObject
     }
 
     /**
-     * Lists the set of matching descendents of this file, in depthwise
+     * Lists the set of matching descendants of this file, in depthwise
      * order.
      *
      * @param selector The FileSelector.
@@ -1438,7 +1438,7 @@ public abstract class AbstractFileObject
     }
 
     /**
-     * Finds the set of matching descendents of this file, in depthwise
+     * Finds the set of matching descendants of this file, in depthwise
      * order.
      *
      * @param selector The FileSelector.
@@ -1928,7 +1928,7 @@ public abstract class AbstractFileObject
     }
 
     /**
-     * Traverses the descendents of this file, and builds a list of selected
+     * Traverses the descendants of this file, and builds a list of selected
      * files.
      * @param selector The FileSelector.
      * @param depthwise if true files are added after their descendants, before otherwise.
@@ -1994,12 +1994,12 @@ public abstract class AbstractFileObject
         {
             if (depthwise)
             {
-                // Add this file after its descendents
+                // Add this file after its descendants
                 selected.add(file);
             }
             else
             {
-                // Add this file before its descendents
+                // Add this file before its descendants
                 selected.add(index, file);
             }
         }

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileSystem.java
Tue Jul 17 18:35:21 2012
@@ -409,7 +409,7 @@ public abstract class AbstractFileSystem
     }
 
     /**
-     * Creates a temporary local copy of a file and its descendents.
+     * Creates a temporary local copy of a file and its descendants.
      * @param file The FileObject to replicate.
      * @param selector The FileSelector.
      * @return The replicated File.
@@ -468,7 +468,7 @@ public abstract class AbstractFileSystem
     }
 
     /**
-     * Creates a temporary local copy of a file and its descendents.
+     * Creates a temporary local copy of a file and its descendants.
      */
     protected File doReplicateFile(final FileObject file,
                                    final FileSelector selector)

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileReplicator.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileReplicator.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileReplicator.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/FileReplicator.java
Tue Jul 17 18:35:21 2012
@@ -30,7 +30,7 @@ import org.apache.commons.vfs2.FileSyste
 public interface FileReplicator
 {
     /**
-     * Creates a local copy of the file, and all its descendents.
+     * Creates a local copy of the file, and all its descendants.
      *
      * @param srcFile  The file to copy.
      * @param selector Selects the files to copy.

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/TemporaryFileStore.java
Tue Jul 17 18:35:21 2012
@@ -26,7 +26,7 @@ import org.apache.commons.vfs2.FileSyste
 public interface TemporaryFileStore
 {
     /**
-     * Allocates a new temporary file.  The file (and all its descendents)
+     * 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.

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileSystem.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileSystem.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileSystem.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/local/LocalFileSystem.java
Tue Jul 17 18:35:21 2012
@@ -67,7 +67,7 @@ public class LocalFileSystem
     }
 
     /**
-     * Creates a temporary local copy of a file and its descendents.
+     * Creates a temporary local copy of a file and its descendants.
      */
     @Override
     protected File doReplicateFile(final FileObject fileObject,

Modified: commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java?rev=1362597&r1=1362596&r2=1362597&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
(original)
+++ commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/tasks/ShowFileTask.java
Tue Jul 17 18:35:21 2012
@@ -57,8 +57,8 @@ public class ShowFileTask
     }
 
     /**
-     * Recursively shows the descendents of the file.
-     * @param recursive true if descendents should be shown.
+     * Recursively shows the descendants of the file.
+     * @param recursive true if descendants should be shown.
      */
     public void setRecursive(final boolean recursive)
     {



Mime
View raw message