Skip to content

Commit 05c1bb9

Browse files
jmaerkijmaerki
committed
Correct license
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140371 13f79535-47bb-0310-9956-ffa450edef68
1 parent 595f424 commit 05c1bb9

13 files changed

Lines changed: 159 additions & 164 deletions

‎src/java/org/apache/commons/io/filefilter/AbstractFileFilter.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,7 +50,6 @@
5050
* individuals on behalf of the Apache Software Foundation. For more
5151
* information on the Apache Software Foundation, please see
5252
* <http://www.apache.org/>.
53-
*
5453
*/
5554
package org.apache.commons.io.filefilter;
5655

@@ -64,7 +63,7 @@
6463
* otherwise your class will infinitely loop.
6564
*
6665
* @since Commons IO 1.0
67-
* @version $Revision: 1.5 $ $Date: 2003/05/16 22:33:46 $
66+
* @version $Revision: 1.6 $ $Date: 2003/07/27 17:11:38 $
6867
*
6968
* @author Henri Yandell
7069
* @author Stephen Colebourne
@@ -84,7 +83,7 @@ public boolean accept(final File file) {
8483
/**
8584
* Checks to see if the File should be accepted by this filter.
8685
*
87-
* @param file the directory File to check
86+
* @param dir the directory File to check
8887
* @param name the filename within the directory to check
8988
* @return true if this file matches the test
9089
*/

‎src/java/org/apache/commons/io/filefilter/AndFileFilter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,7 +59,7 @@
5959
* This filter produces a logical AND of the two filters specified.
6060
*
6161
* @since Commons IO 1.0
62-
* @version $Revision: 1.3 $ $Date: 2003/05/16 22:33:47 $
62+
* @version $Revision: 1.4 $ $Date: 2003/07/27 17:11:38 $
6363
*
6464
* @author Stephen Colebourne
6565
*/

‎src/java/org/apache/commons/io/filefilter/DelegateFileFilter.java‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,7 +50,6 @@
5050
* individuals on behalf of the Apache Software Foundation. For more
5151
* information on the Apache Software Foundation, please see
5252
* <http://www.apache.org/>.
53-
*
5453
*/
5554
package org.apache.commons.io.filefilter;
5655

@@ -62,7 +61,7 @@
6261
* This class turns a Java FileFilter or FilenameFilter into an IO FileFilter.
6362
*
6463
* @since Commons IO 1.0
65-
* @version $Revision: 1.5 $ $Date: 2003/05/16 22:33:47 $
64+
* @version $Revision: 1.6 $ $Date: 2003/07/27 17:11:38 $
6665
*
6766
* @author Henri Yandell
6867
* @author Stephen Colebourne

‎src/java/org/apache/commons/io/filefilter/DirectoryFileFilter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -70,7 +70,7 @@
7070
* </pre>
7171
*
7272
* @since Commons IO 1.0
73-
* @version $Revision: 1.2 $ $Date: 2003/05/16 22:33:46 $
73+
* @version $Revision: 1.3 $ $Date: 2003/07/27 17:11:38 $
7474
*
7575
* @author Henri Yandell
7676
* @author Stephen Colebourne

‎src/java/org/apache/commons/io/filefilter/FalseFileFilter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,7 +59,7 @@
5959
* A file filter that always returns false.
6060
*
6161
* @since Commons IO 1.0
62-
* @version $Revision: 1.1 $ $Date: 2003/05/16 22:33:47 $
62+
* @version $Revision: 1.2 $ $Date: 2003/07/27 17:11:38 $
6363
*
6464
* @author Henri Yandell
6565
* @author Stephen Colebourne

‎src/java/org/apache/commons/io/filefilter/FileFilterUtils.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,15 +50,14 @@
5050
* individuals on behalf of the Apache Software Foundation. For more
5151
* information on the Apache Software Foundation, please see
5252
* <http://www.apache.org/>.
53-
*
5453
*/
5554
package org.apache.commons.io.filefilter;
5655

5756
/**
5857
* Useful utilities for working with file filters.
5958
*
6059
* @since Commons IO 1.0
61-
* @version $Revision: 1.2 $ $Date: 2003/05/16 22:33:46 $
60+
* @version $Revision: 1.3 $ $Date: 2003/07/27 17:11:38 $
6261
*
6362
* @author Henri Yandell
6463
* @author Stephen Colebourne
@@ -68,7 +67,7 @@ public class FileFilterUtils {
6867
/**
6968
* FileFilterUtils is not normally instantiated.
7069
*/
71-
public FileFilterUtils() {
70+
private FileFilterUtils() {
7271
}
7372

7473
//-----------------------------------------------------------------------

‎src/java/org/apache/commons/io/filefilter/IOFileFilter.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -50,7 +50,6 @@
5050
* individuals on behalf of the Apache Software Foundation. For more
5151
* information on the Apache Software Foundation, please see
5252
* <http://www.apache.org/>.
53-
*
5453
*/
5554
package org.apache.commons.io.filefilter;
5655

@@ -63,7 +62,7 @@
6362
* interfaces together.
6463
*
6564
* @since Commons IO 1.0
66-
* @version $Revision: 1.1 $ $Date: 2003/05/16 22:33:47 $
65+
* @version $Revision: 1.2 $ $Date: 2003/07/27 17:11:38 $
6766
*
6867
* @author Henri Yandell
6968
* @author Stephen Colebourne
@@ -85,7 +84,7 @@ public interface IOFileFilter extends FileFilter, FilenameFilter {
8584
* <p>
8685
* Defined in {@link java.io.FilenameFilter}.
8786
*
88-
* @param file the directory File to check
87+
* @param dir the directory File to check
8988
* @param name the filename within the directory to check
9089
* @return true if this file matches the test
9190
*/

‎src/java/org/apache/commons/io/filefilter/NotFileFilter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
* the documentation and/or other materials provided with the
1717
* distribution.
1818
*
19-
* 3. The end-user documentation included with the redistribution,
20-
* if any, must include the following acknowledgment:
19+
* 3. The end-user documentation included with the redistribution, if
20+
* any, must include the following acknowlegement:
2121
* "This product includes software developed by the
2222
* Apache Software Foundation (http://www.apache.org/)."
23-
* Alternately, this acknowledgment may appear in the software itself,
24-
* if and wherever such third-party acknowledgments normally appear.
23+
* Alternately, this acknowlegement may appear in the software itself,
24+
* if and wherever such third-party acknowlegements normally appear.
2525
*
26-
* 4. The names "Apache" and "Apache Software Foundation" and
27-
* "Apache Turbine" must not be used to endorse or promote products
28-
* derived from this software without prior written permission. For
29-
* written permission, please contact apache@apache.org.
26+
* 4. The names "The Jakarta Project", "Commons", and "Apache Software
27+
* Foundation" must not be used to endorse or promote products derived
28+
* from this software without prior written permission. For written
29+
* permission, please contact apache@apache.org.
3030
*
31-
* 5. Products derived from this software may not be called "Apache",
32-
* "Apache Turbine", nor may "Apache" appear in their name, without
33-
* prior written permission of the Apache Software Foundation.
31+
* 5. Products derived from this software may not be called "Apache"
32+
* nor may "Apache" appear in their names without prior written
33+
* permission of the Apache Software Foundation.
3434
*
3535
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
3636
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -59,7 +59,7 @@
5959
* This filter produces a logical NOT of the filters specified.
6060
*
6161
* @since Commons IO 1.0
62-
* @version $Revision: 1.1 $ $Date: 2003/05/16 22:33:47 $
62+
* @version $Revision: 1.2 $ $Date: 2003/07/27 17:11:38 $
6363
*
6464
* @author Stephen Colebourne
6565
*/

0 commit comments

Comments
 (0)