svn commit: r1356829 - /commons/proper/imaging/trunk/pom.xml
Author: damjan
Date: Tue Jul 3 16:54:39 2012
New Revision: 1356829
URL: http://svn.apache.org/viewvc?rev=1356829view=rev
Log:
Remove redundant settings which are in the parent POM.
Modified:
commons/proper/imaging/trunk/pom.xml
Modified: commons/proper/imaging/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/imaging/trunk/pom.xml?rev=1356829r1=1356828r2=1356829view=diff
==
--- commons/proper/imaging/trunk/pom.xml (original)
+++ commons/proper/imaging/trunk/pom.xml Tue Jul 3 16:54:39 2012
@@ -217,8 +217,6 @@
version${commons.changes.version}/version
configuration
issueLinkTemplate%URL%/%ISSUE%/issueLinkTemplate
- templaterelease-notes.vm/template
- templateDirectorysrc/changes/templateDirectory
/configuration
reportSets
reportSet
svn commit: r1356916 - in /commons/proper/collections/trunk: ./ src/main/java/org/apache/commons/collections/buffer/
Author: tn
Date: Tue Jul 3 20:27:01 2012
New Revision: 1356916
URL: http://svn.apache.org/viewvc?rev=1356916view=rev
Log:
Cleanup of buffer package.
Added:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/package-info.java
- copied, changed from r1356878,
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/package.html
Removed:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/package.html
Modified:
commons/proper/collections/trunk/pom.xml
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/BlockingBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/BoundedBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/PriorityBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/TransformedBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
Modified: commons/proper/collections/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=1356916r1=1356915r2=1356916view=diff
==
--- commons/proper/collections/trunk/pom.xml (original)
+++ commons/proper/collections/trunk/pom.xml Tue Jul 3 20:27:01 2012
@@ -45,10 +45,22 @@
developers
developer
+ nameMatt Benson/name
+ idmbenson/id
+/developer
+developer
+ nameJames Carman/name
+ idjcarman/id
+/developer
+developer
nameStephen Colebourne/name
idscolebourne/id
/developer
developer
+ nameRobert Burrell Donkin/name
+ idrdonkin/id
+/developer
+developer
nameMorgan Delagrange/name
idmorgand/id
/developer
@@ -65,6 +77,10 @@
idcraigmcc/id
/developer
developer
+ namePhil Steitz/name
+ idpsteitz/id
+/developer
+developer
nameArun M. Thomas/name
idamamment/id
/developer
@@ -76,18 +92,6 @@
nameHenri Yandell/name
idbayard/id
/developer
-developer
- nameJames Carman/name
- idjcarman/id
-/developer
-developer
- nameRobert Burrell Donkin/name
- idrdonkin/id
-/developer
-developer
- nameMatt Benson/name
- idmbenson/id
-/developer
/developers
contributors
@@ -431,7 +435,7 @@
/configuration
/plugin
/plugins
-/build
+ /build
reporting
plugins
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java?rev=1356916r1=1356915r2=1356916view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
Tue Jul 3 20:27:01 2012
@@ -20,18 +20,16 @@ import org.apache.commons.collections.Bu
import org.apache.commons.collections.collection.AbstractCollectionDecorator;
/**
- * Decorates another codeBuffer/code to provide additional behaviour.
+ * Decorates another {@link Buffer} to provide additional behaviour.
* p
* Methods are forwarded directly to the decorated buffer.
*
* @param E the type of the elements in the buffer
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
*/
-public abstract class AbstractBufferDecoratorE extends
AbstractCollectionDecoratorE implements
-BufferE {
+public abstract class AbstractBufferDecoratorE extends
AbstractCollectionDecoratorE
+implements BufferE {
/** Serialization version */
private static final long serialVersionUID = -2629815475789577029L;
Modified:
svn commit: r1356923 - in /commons/proper/vfs/trunk: core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCa
Author: ggregory
Date: Tue Jul 3 20:38:40 2012
New Revision: 1356923
URL: http://svn.apache.org/viewvc?rev=1356923view=rev
Log:
[VFS-426] HTTP URL query string not part of cache key
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
commons/proper/vfs/trunk/src/changes/changes.xml
Modified:
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java?rev=1356923r1=1356922r2=1356923view=diff
==
---
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
(original)
+++
commons/proper/vfs/trunk/core/src/main/java/org/apache/commons/vfs2/provider/AbstractFileName.java
Tue Jul 3 20:38:40 2012
@@ -255,7 +255,7 @@ public abstract class AbstractFileName i
{
if (key == null)
{
-key = createURI(true, true);
+key = getURI();
}
return key;
}
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java?rev=1356923r1=1356922r2=1356923view=diff
==
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/http/test/HttpFilesCacheTestCase.java
Tue Jul 3 20:38:40 2012
@@ -50,9 +50,9 @@ public class HttpFilesCacheTestCase exte
Assert.assertEquals(noQueryStringUrl,
noQueryFile.getURL().toExternalForm());
final FileObject queryFile =
fileSystemManager.resolveFile(queryStringUrl);
-// Assert.assertEquals(queryStringUrl,
queryFile.getURL().toExternalForm()); // fails for VFS-426
+Assert.assertEquals(queryStringUrl,
queryFile.getURL().toExternalForm()); // failed for VFS-426
final FileObject queryFile2 =
fileSystemManager.resolveFile(queryStringUrl2);
-// Assert.assertEquals(queryStringUrl2,
queryFile2.getURL().toExternalForm()); // fails for VFS-426
+Assert.assertEquals(queryStringUrl2,
queryFile2.getURL().toExternalForm()); // failed for VFS-426
}
}
Modified: commons/proper/vfs/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/changes.xml?rev=1356923r1=1356922r2=1356923view=diff
==
--- commons/proper/vfs/trunk/src/changes/changes.xml (original)
+++ commons/proper/vfs/trunk/src/changes/changes.xml Tue Jul 3 20:38:40 2012
@@ -23,6 +23,9 @@
body
release version=2.1 date=TBD description=New features and bug fix
release.
+ action issue=VFS-426 dev=ggregory type=add
due-to=daniel.bergholm
+HTTP URL query string not part of cache key.
+ /action
action issue=VFS-425 dev=ggregory type=add due-to=ggregory
Add API FileObject.isExecutable().
/action
svn commit: r1356933 - /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/
Author: tn
Date: Tue Jul 3 20:49:03 2012
New Revision: 1356933
URL: http://svn.apache.org/viewvc?rev=1356933view=rev
Log:
Cleanup of collection package.
Added:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/package-info.java
- copied, changed from r1356878,
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/package.html
Removed:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/package.html
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java?rev=1356933r1=1356932r2=1356933view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
Tue Jul 3 20:49:03 2012
@@ -37,10 +37,7 @@ import java.util.Iterator;
*
* @param E the type of the elements in the collection
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Paul Jack
+ * @version $Id$
*/
public abstract class AbstractCollectionDecoratorE
implements CollectionE, Serializable {
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java?rev=1356933r1=1356932r2=1356933view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
Tue Jul 3 20:49:03 2012
@@ -38,12 +38,8 @@ import java.util.Collection;
*
* @param D the type of the elements in the decorated collection
* @param E the element type of the Collection implementation
- * @since Commons Collections 5
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Paul Jack
- * @author Matt Benson
+ * @since Commons Collections 4.0
+ * @version $Id$
*/
public abstract class AbstractUntypedCollectionDecoratorE, D implements
CollectionE, Serializable {
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java?rev=1356933r1=1356932r2=1356933view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
Tue Jul 3 20:49:03 2012
@@ -37,11 +37,7 @@ import org.apache.commons.collections.li
*
* @param E the type of the elements in the collection
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Brian McCallister
- * @author Stephen Colebourne
- * @author Phil Steitz
+ * @version $Id$
*/
public class CompositeCollectionE implements CollectionE, Serializable {
@@ -190,6 +186,7 @@ public class CompositeCollectionE impl
* Returns an object array, populating the supplied array if possible.
* See
svn commit: r1356950 - /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/
Author: tn
Date: Tue Jul 3 21:13:33 2012
New Revision: 1356950
URL: http://svn.apache.org/viewvc?rev=1356950view=rev
Log:
Cleanup of comparators package.
Added:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/package-info.java
- copied, changed from r1356878,
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/package.html
Removed:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/package.html
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/NullComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java?rev=1356950r1=1356949r2=1356950view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
Tue Jul 3 21:13:33 2012
@@ -28,9 +28,7 @@ import java.util.Comparator;
* @see #booleanComparator(boolean)
*
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Rodney Waldhoff
+ * @version $Id$
*/
public final class BooleanComparator implements ComparatorBoolean,
Serializable {
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java?rev=1356950r1=1356949r2=1356950view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
Tue Jul 3 21:13:33 2012
@@ -20,24 +20,23 @@ import java.io.Serializable;
import java.util.Comparator;
/**
- * A {@link Comparator Comparator} that compares
- * {@link Comparable Comparable} objects.
- * p /
- * This Comparator is useful, for example,
- * for enforcing the natural order in custom implementations
- * of SortedSet and SortedMap.
- * p /
- * Note: In the 2.0 and 2.1 releases of Commons Collections,
- * this class would throw a {@link ClassCastException} if
- * either of the arguments to {@link #compare(Object, Object) compare}
- * were codenull/code, not {@link Comparable Comparable},
- * or for which {@link Comparable#compareTo(Object) compareTo} gave
- * inconsistent results. This is no longer the case. See
- * {@link #compare(Object, Object) compare} for details.
- *
+ * A {@link Comparator Comparator} that compares {@link Comparable Comparable}
+ * objects.
+ * p
+ * This Comparator is useful, for example, for enforcing the natural order in
+ * custom implementations of {@link SortedSet} and {@link SortedMap}.
+ * p
+ * Note: In the 2.0 and 2.1 releases of Commons Collections, this class would
+ * throw a {@link ClassCastException} if either of the arguments to
+ * {@link #compare(Object, Object) compare} were codenull/code, not
+ * {@link Comparable Comparable}, or for which
+ * {@link Comparable#compareTo(Object) compareTo} gave inconsistent results.
+ * This is no longer the case. See {@link #compare(Object, Object) compare} for
+ * details.
+ *
* @since Commons Collections 2.0
- * @version $Revision$
- *
+ * @version $Id$
+ *
* @see java.util.Collections#reverseOrder()
*/
public class ComparableComparatorE extends Comparable? super E implements
ComparatorE, Serializable {
@@ -57,6 +56,7 @@ public class ComparableComparatorE exte
* instead of constructing a new instance to reduce allocation and GC
overhead
* when multiple comparable comparators may be used in the same VM.
*
+ * @param E the element type
*
svn commit: r1356955 - in /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections: ./ splitmap/
Author: tn
Date: Tue Jul 3 21:24:25 2012
New Revision: 1356955
URL: http://svn.apache.org/viewvc?rev=1356955view=rev
Log:
Cleanup of splitmap package.
Added:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
- copied, changed from r1356878,
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/SplitMapUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/package-info.java
- copied, changed from r1356878,
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/package.html
Removed:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/SplitMapUtils.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/package.html
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
Copied:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
(from r1356878,
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/SplitMapUtils.java)
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java?p2=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.javap1=commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/SplitMapUtils.javar1=1356878r2=1356955rev=1356955view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/SplitMapUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
Tue Jul 3 21:24:25 2012
@@ -38,10 +38,10 @@ import org.apache.commons.collections.se
* and/or {@link Get} but not {@link Map}.
*
* @since Commons Collections 4.0
- * @version $Revision$
+ * @version $Id$
+ *
* @see Get
* @see Put
- * @author Matt Benson
*/
public class SplitMapUtils {
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java?rev=1356955r1=1356954r2=1356955view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
Tue Jul 3 21:24:25 2012
@@ -20,21 +20,19 @@ import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections.Get;
import org.apache.commons.collections.IterableGet;
import org.apache.commons.collections.MapIterator;
import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter;
/**
- * {@link IterableGet} that uses a {@link Map}K, V for the {@link Get}K, V
- * implementation.
+ * {@link IterableGet} that uses a {@link Map}K, V for the
+ * {@link org.apache.commons.collections.Get Get}K, V implementation.
*
* @since Commons Collections 4.0
- * @version $Revision$
- *
- * @author Matt Benson
+ * @version $Id$
*/
public class AbstractIterableGetMapDecoratorK, V implements IterableGetK,
V {
+
/** The map to decorate */
protected transient MapK, V map;
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java?rev=1356955r1=1356954r2=1356955view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
Tue Jul 3 21:24:25 2012
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Tr
import org.apache.commons.collections.map.LinkedMap;
/**
- * Decorates another codeMap/code to transform objects that are added.
+ * Decorates another {@link Map} to transform objects that are added.
* p
* The Map put methods and Map.Entry setValue method are affected by this
class.
* Thus objects must be removed or searched for using their transformed form.
@@ -53,15 +53,13 @@ import
svn commit: r1356957 - /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
Author: joehni
Date: Tue Jul 3 21:25:08 2012
New Revision: 1356957
URL: http://svn.apache.org/viewvc?rev=1356957view=rev
Log:
More var-args. Clean-up.
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java?rev=1356957r1=1356956r2=1356957view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/PredicateUtils.java
Tue Jul 3 21:25:08 2012
@@ -67,10 +67,7 @@ import org.apache.commons.collections.fu
* All the supplied predicates are Serializable.
*
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Ola Berg
+ * @version $Id$
*/
public class PredicateUtils {
@@ -284,7 +281,7 @@ public class PredicateUtils {
* @deprecated use {@link AllPredicate#allPredicate(Predicate...)} instead.
*/
@Deprecated
-public static T PredicateT allPredicate(Predicate? super T[]
predicates) {
+public static T PredicateT allPredicate(Predicate? super T...
predicates) {
return AllPredicate.allPredicate(predicates);
}
@@ -331,7 +328,7 @@ public class PredicateUtils {
* @throws IllegalArgumentException if the predicates array is null
* @throws IllegalArgumentException if any predicate in the array is null
*/
-public static T PredicateT anyPredicate(Predicate? super T[]
predicates) {
+public static T PredicateT anyPredicate(Predicate? super T...
predicates) {
return AnyPredicate.anyPredicate(predicates);
}
@@ -362,9 +359,10 @@ public class PredicateUtils {
* @return the codeeither/code predicate
* @throws IllegalArgumentException if either predicate is null
*/
-@SuppressWarnings(unchecked)
public static T PredicateT eitherPredicate(Predicate? super T
predicate1, Predicate? super T predicate2) {
-return onePredicate(new Predicate[] { predicate1, predicate2 });
+@SuppressWarnings(unchecked)
+PredicateT onePredicate = onePredicate(predicate1, predicate2);
+return onePredicate;
}
/**
@@ -379,7 +377,7 @@ public class PredicateUtils {
* @throws IllegalArgumentException if the predicates array is null
* @throws IllegalArgumentException if any predicate in the array is null
*/
-public static T PredicateT onePredicate(Predicate? super T[]
predicates) {
+public static T PredicateT onePredicate(Predicate? super T...
predicates) {
return OnePredicate.onePredicate(predicates);
}
@@ -410,9 +408,10 @@ public class PredicateUtils {
* @return the codeneither/code predicate
* @throws IllegalArgumentException if either predicate is null
*/
-@SuppressWarnings(unchecked)
public static T PredicateT neitherPredicate(Predicate? super T
predicate1, Predicate? super T predicate2) {
-return nonePredicate(new Predicate[] { predicate1, predicate2 });
+@SuppressWarnings(unchecked)
+PredicateT nonePredicate = nonePredicate(predicate1, predicate2);
+return nonePredicate;
}
/**
@@ -427,7 +426,7 @@ public class PredicateUtils {
* @throws IllegalArgumentException if the predicates array is null
* @throws IllegalArgumentException if any predicate in the array is null
*/
-public static T PredicateT nonePredicate(Predicate? super T[]
predicates) {
+public static T PredicateT nonePredicate(Predicate? super T...
predicates) {
return NonePredicate.nonePredicate(predicates);
}
svn commit: r1356958 - /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java
Author: tn Date: Tue Jul 3 21:25:12 2012 New Revision: 1356958 URL: http://svn.apache.org/viewvc?rev=1356958view=rev Log: Cleanup of SplitMapUtils Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java Modified: commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java?rev=1356958r1=1356957r2=1356958view=diff == --- commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java (original) +++ commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/SplitMapUtils.java Tue Jul 3 21:25:12 2012 @@ -14,19 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.collections.splitmap; +package org.apache.commons.collections; import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.Get; -import org.apache.commons.collections.IterableGet; -import org.apache.commons.collections.IterableMap; -import org.apache.commons.collections.MapIterator; -import org.apache.commons.collections.MapUtils; -import org.apache.commons.collections.Put; -import org.apache.commons.collections.Unmodifiable; import org.apache.commons.collections.collection.UnmodifiableCollection; import org.apache.commons.collections.iterators.UnmodifiableMapIterator; import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter;
svn commit: r1356962 - /commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java
Author: tn
Date: Tue Jul 3 21:28:55 2012
New Revision: 1356962
URL: http://svn.apache.org/viewvc?rev=1356962view=rev
Log:
Fix SplitMapUtils test.
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java
Modified:
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java?rev=1356962r1=1356961r2=1356962view=diff
==
---
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java
(original)
+++
commons/proper/collections/trunk/src/test/java/org/apache/commons/collections/TestSplitMapUtils.java
Tue Jul 3 21:28:55 2012
@@ -14,19 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.splitmap;
+package org.apache.commons.collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.collections.BulkTest;
-import org.apache.commons.collections.IterableMap;
-import org.apache.commons.collections.MapIterator;
-import org.apache.commons.collections.Put;
-import org.apache.commons.collections.Transformer;
-import org.apache.commons.collections.Unmodifiable;
import org.apache.commons.collections.functors.NOPTransformer;
import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.collections.splitmap.TransformedMap;
/**
* Tests for {@link TransformedMap}
svn commit: r1356967 - /commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/
Author: tn
Date: Tue Jul 3 21:39:25 2012
New Revision: 1356967
URL: http://svn.apache.org/viewvc?rev=1356967view=rev
Log:
Cleanup of keyvalue package.
Added:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/package-info.java
- copied, changed from r1356960,
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/package.html
Removed:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/package.html
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java?rev=1356967r1=1356966r2=1356967view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
Tue Jul 3 21:39:25 2012
@@ -23,12 +23,7 @@ import org.apache.commons.collections.Ke
* and {@link java.util.Map.Entry Map.Entry} implementations.
*
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Michael A. Smith
- * @author Neil O'Toole
- * @author Stephen Colebourne
+ * @version $Id$
*/
public abstract class AbstractKeyValueK, V implements KeyValueK, V {
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java?rev=1356967r1=1356966r2=1356967view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
Tue Jul 3 21:39:25 2012
@@ -23,12 +23,7 @@ import java.util.Map;
* {@link java.util.Map.Entry Map.Entry} implementations.
*
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author James Strachan
- * @author Michael A. Smith
- * @author Neil O'Toole
- * @author Stephen Colebourne
+ * @version $Id$
*/
public abstract class AbstractMapEntryK, V extends AbstractKeyValueK, V
implements Map.EntryK, V {
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java?rev=1356967r1=1356966r2=1356967view=diff
==
---
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
(original)
+++
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
Tue Jul 3 21:39:25 2012
@@ -25,9 +25,7 @@ import org.apache.commons.collections.Ke
* added to a {@link java.util.Map.Entry Map.Entry}.
*
* @since Commons Collections 3.0
- * @version $Revision$
- *
- * @author Stephen Colebourne
+ * @version $Id$
*/
public abstract class AbstractMapEntryDecoratorK, V implements Map.EntryK,
V, KeyValueK, V {
Modified:
commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java?rev=1356967r1=1356966r2=1356967view=diff
==
---
svn commit: r1357004 - in /commons/proper/math/trunk/src: main/java/org/apache/commons/math3/util/Pair.java test/java/org/apache/commons/math3/util/PairTest.java
Author: erans
Date: Tue Jul 3 23:03:55 2012
New Revision: 1357004
URL: http://svn.apache.org/viewvc?rev=1357004view=rev
Log:
MATH-810
Added new accessors.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Pair.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Pair.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Pair.java?rev=1357004r1=1357003r2=1357004view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Pair.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math3/util/Pair.java
Tue Jul 3 23:03:55 2012
@@ -39,8 +39,8 @@ public class PairK, V {
* Create an entry representing a mapping from the specified key to the
* specified value.
*
- * @param k Key.
- * @param v Value.
+ * @param k Key (first element of the pair).
+ * @param v Value (second element of the pair).
*/
public Pair(K k, V v) {
key = k;
@@ -59,7 +59,7 @@ public class PairK, V {
/**
* Get the key.
*
- * @return the key.
+ * @return the key (first element of the pair).
*/
public K getKey() {
return key;
@@ -68,13 +68,31 @@ public class PairK, V {
/**
* Get the value.
*
- * @return the value.
+ * @return the value (second element of the pair).
*/
public V getValue() {
return value;
}
/**
+ * Get the first element of the pair.
+ *
+ * @return the first element of the pair.
+ */
+public K getFirst() {
+return key;
+}
+
+/**
+ * Get the second element of the pair.
+ *
+ * @return the second element of the pair.
+ */
+public V getSecond() {
+return value;
+}
+
+/**
* Compare the specified object with this entry for equality.
*
* @param o Object.
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java?rev=1357004r1=1357003r2=1357004view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math3/util/PairTest.java
Tue Jul 3 23:03:55 2012
@@ -30,6 +30,17 @@ public class PairTest {
}
@Test
+public void testAccessor2() {
+final PairInteger, Double p
+= new PairInteger, Double(new Integer(1), new Double(2));
+
+// Check that both APIs refer to the same data.
+
+Assert.assertTrue(p.getFirst() == p.getKey());
+Assert.assertTrue(p.getSecond() == p.getValue());
+}
+
+@Test
public void testEquals() {
PairInteger, Double p1 = new PairInteger, Double(null, null);
Assert.assertFalse(p1.equals(null));
svn commit: r1357015 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
Author: sebb
Date: Tue Jul 3 23:45:58 2012
New Revision: 1357015
URL: http://svn.apache.org/viewvc?rev=1357015view=rev
Log:
Javadoc
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java?rev=1357015r1=1357014r2=1357015view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
Tue Jul 3 23:45:58 2012
@@ -115,7 +115,7 @@ public abstract class ArchiveOutputStrea
/**
* Increments the counter of already written bytes.
- * Doesn't increment if the EOF has been hit (read == -1)
+ * Doesn't increment if the EOF has been hit ({@code written} == -1)
*
* @param written the number of bytes written
*/
@@ -125,7 +125,7 @@ public abstract class ArchiveOutputStrea
/**
* Increments the counter of already written bytes.
- * Doesn't increment if the EOF has been hit (read == -1)
+ * Doesn't increment if the EOF has been hit ({@code written} == -1)
*
* @param written the number of bytes written
* @since 1.1
svn commit: r1357065 [2/2] - in /commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff: ./ constants/
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java?rev=1357065r1=1357064r2=1357065view=diff == --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java Wed Jul 4 04:21:03 2012 @@ -37,7 +37,7 @@ public interface MicrosoftHdPhotoTagCons * Data4 (char[8]) is endian-independent. */ public static final TagInfoByte EXIF_TAG_PIXEL_FORMAT = new TagInfoByte( -Pixel Format, 0xbc01, 16, +PixelFormat, 0xbc01, 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final BinaryConstant PIXEL_FORMAT_VALUE_BLACK_AND_WHITE = TagConstantsUtils.createMicrosoftHdPhotoGuidEndingWith((byte)0x05); @@ -168,45 +168,46 @@ public interface MicrosoftHdPhotoTagCons public static final int UNCOMPRESSED_VALUE_NO = 0; public static final int UNCOMPRESSED_VALUE_YES = 1; -public static final TagInfoLong EXIF_TAG_IMAGE_TYPE = new TagInfoLong(Image Type, -0xbc04, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); +public static final TagInfoLong EXIF_TAG_IMAGE_TYPE = new TagInfoLong( +ImageType, 0xbc04, 1, +TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_IMAGE_WIDTH = new TagInfoLong( -Image Width, 0xbc80, 1, +ImageWidth, 0xbc80, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_IMAGE_HEIGHT = new TagInfoLong( -Image Height, 0xbc81, 1, +ImageHeight, 0xbc81, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_WIDTH_RESOLUTION = new TagInfoFloat( -Width Resolution, 0xbc82, 1, +WidthResolution, 0xbc82, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoFloat EXIF_TAG_HEIGHT_RESOLUTION = new TagInfoFloat( -Height Resolution, 0xbc83, 1, +HeightResolution, 0xbc83, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); // FIXME: might be an offset? public static final TagInfoLong EXIF_TAG_IMAGE_OFFSET = new TagInfoLong( -Image Offset, 0xbcc0, 1, +ImageOffset, 0xbcc0, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_IMAGE_BYTE_COUNT = new TagInfoLong( -Image Byte Count, 0xbcc1, 1, +ImageByteCount, 0xbcc1, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); // FIXME: might be an offset? public static final TagInfoLong EXIF_TAG_ALPHA_OFFSET = new TagInfoLong( -Alpha Offset, 0xbcc2, 1, +AlphaOffset, 0xbcc2, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoLong EXIF_TAG_ALPHA_BYTE_COUNT = new TagInfoLong( -Alpha Byte Count, 0xbcc3, 1, +AlphaByteCount, 0xbcc3, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final TagInfoByte EXIF_TAG_IMAGE_DATA_DISCARD = new TagInfoByte( -Image Data Discard, 0xbcc4, 1, +ImageDataDiscard, 0xbcc4, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int IMAGE_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; public static final int IMAGE_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; @@ -214,7 +215,7 @@ public interface MicrosoftHdPhotoTagCons public static final int IMAGE_DATA_DISCARD_VALUE_HIGHPASS_AND_LOW_PASS_FREQUENCY_DATA_DISCARDED = 3; public static final TagInfoByte EXIF_TAG_ALPHA_DATA_DISCARD = new TagInfoByte( -Alpha Data Discard, 0xbcc5, 1, +AlphaDataDiscard, 0xbcc5, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); public static final int ALPHA_DATA_DISCARD_VALUE_FULL_RESOLUTION = 0; public static final int ALPHA_DATA_DISCARD_VALUE_FLEXBITS_DISCARDED = 1; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftTagConstants.java?rev=1357065r1=1357064r2=1357065view=diff == ---
