svn commit: r740367 - in /commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections: ./ bag/ bidimap/ buffer/ collection/ comparators/ functors/ iterators/ ke
Author: mbenson Date: Tue Feb 3 18:17:29 2009 New Revision: 740367 URL: http://svn.apache.org/viewvc?rev=740367view=rev Log: update javadoc/html files to newer-style ASL headers Modified: commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bidimap/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/collection/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/comparators/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/functors/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/iterators/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/keyvalue/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/list/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/map/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/overview.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/package.html commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/set/package.html Modified: commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/package.html URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/package.html?rev=740367r1=740366r2=740367view=diff == --- commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/package.html (original) +++ commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bag/package.html Tue Feb 3 18:17:29 2009 @@ -1,10 +1,11 @@ !-- $Id$ -- !-- - Copyright 2003-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the License); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Modified: commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bidimap/package.html URL: http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bidimap/package.html?rev=740367r1=740366r2=740367view=diff == --- commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bidimap/package.html (original) +++ commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/bidimap/package.html Tue Feb 3 18:17:29 2009 @@ -1,10 +1,11 @@ !-- $Id$ -- !-- - Copyright 2003-2004 The Apache Software Foundation - - Licensed under the Apache License, Version 2.0 (the License); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Modified: commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/buffer/package.html URL:
svn commit: r740369 - /commons/proper/collections/trunk/pom.xml
Author: mbenson Date: Tue Feb 3 18:29:41 2009 New Revision: 740369 URL: http://svn.apache.org/viewvc?rev=740369view=rev Log: me Modified: commons/proper/collections/trunk/pom.xml Modified: commons/proper/collections/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/pom.xml?rev=740369r1=740368r2=740369view=diff == --- commons/proper/collections/trunk/pom.xml (original) +++ commons/proper/collections/trunk/pom.xml Tue Feb 3 18:29:41 2009 @@ -111,6 +111,10 @@ nameRobert Burrell Donkin/name idrdonkin/id /developer +developer + nameMatt Benson/name + idmbenson/id +/developer /developers contributors @@ -133,9 +137,6 @@ nameSebastian Bazley/name /contributor contributor - nameMatt Benson/name -/contributor -contributor nameOla Berg/name /contributor contributor
svn commit: r740400 - in /commons/proper/math/trunk: pom.xml src/java/org/apache/commons/math/MessagesResources_fr.java src/java/org/apache/commons/math/transform/FastFourierTransformer.java src/site/
Author: luc
Date: Tue Feb 3 19:59:20 2009
New Revision: 740400
URL: http://svn.apache.org/viewvc?rev=740400view=rev
Log:
applied Cyril Briquet's patch (with slight changes) to improve
FastFourierTransform efficiency
JIRA: MATH-216
Modified:
commons/proper/math/trunk/pom.xml
commons/proper/math/trunk/src/java/org/apache/commons/math/MessagesResources_fr.java
commons/proper/math/trunk/src/java/org/apache/commons/math/transform/FastFourierTransformer.java
commons/proper/math/trunk/src/site/xdoc/changes.xml
Modified: commons/proper/math/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/pom.xml?rev=740400r1=740399r2=740400view=diff
==
--- commons/proper/math/trunk/pom.xml (original)
+++ commons/proper/math/trunk/pom.xml Tue Feb 3 19:59:20 2009
@@ -106,6 +106,9 @@
nameR#233;mi Arntzen/name
/contributor
contributor
+ nameCyril Briquet/name
+/contributor
+contributor
namePaul Cowan/name
/contributor
contributor
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/MessagesResources_fr.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/MessagesResources_fr.java?rev=740400r1=740399r2=740400view=diff
==
---
commons/proper/math/trunk/src/java/org/apache/commons/math/MessagesResources_fr.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/MessagesResources_fr.java
Tue Feb 3 19:59:20 2009
@@ -372,6 +372,10 @@
// org.apache.commons.math.transform.FastFourierTransformer
{ cannot compute 0-th root of unity, indefinite result,
impossible de calculer la racine z\u00e9roi\u00e8me de l''unit\u00e9,
r\u00e9sultat ind\u00e9fini },
+ { roots of unity have not been computed yet,
+ les racines de l''unit\u00e9 n''ont pas encore \u00e9t\u00e9
calcul\u00e9es },
+ { out of range root of unity index {0} (must be in [{1};{2}]),
+ index de racine de l''unit\u00e9 hors domaine (devrait \u00eatre dans
[{1}; {2}]) },
{ number of sample is not positive: {0},
le nombre d''\u00e9chantillons n''est pas positif : {0} },
{ {0} is not a power of 2, consider padding for fix,
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/transform/FastFourierTransformer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/transform/FastFourierTransformer.java?rev=740400r1=740399r2=740400view=diff
==
---
commons/proper/math/trunk/src/java/org/apache/commons/math/transform/FastFourierTransformer.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/transform/FastFourierTransformer.java
Tue Feb 3 19:59:20 2009
@@ -48,14 +48,8 @@
/** Serializable version identifier. */
static final long serialVersionUID = 5138259215438106000L;
-/** array of the roots of unity */
-private Complex omega[] = new Complex[0];
-
-/**
- * |omegaCount| is the length of lasted computed omega[]. omegaCount
- * is positive for forward transform and negative for inverse transform.
- */
-private int omegaCount = 0;
+/** roots of unity */
+private RootsOfUnity roots = new RootsOfUnity();
/**
* Construct a default transformer.
@@ -113,7 +107,7 @@
*/
public Complex[] transform(Complex f[])
throws IllegalArgumentException {
-computeOmega(f.length);
+roots.computeOmega(f.length);
return fft(f);
}
@@ -171,7 +165,7 @@
public Complex[] transform2(Complex f[])
throws IllegalArgumentException {
-computeOmega(f.length);
+roots.computeOmega(f.length);
double scaling_coefficient = 1.0 / Math.sqrt(f.length);
return scaleArray(fft(f), scaling_coefficient);
}
@@ -230,7 +224,7 @@
public Complex[] inversetransform(Complex f[])
throws IllegalArgumentException {
-computeOmega(-f.length);// pass negative argument
+roots.computeOmega(-f.length);// pass negative argument
double scaling_coefficient = 1.0 / f.length;
return scaleArray(fft(f), scaling_coefficient);
}
@@ -289,7 +283,7 @@
public Complex[] inversetransform2(Complex f[])
throws IllegalArgumentException {
-computeOmega(-f.length);// pass negative argument
+roots.computeOmega(-f.length);// pass negative argument
double scaling_coefficient = 1.0 / Math.sqrt(f.length);
return scaleArray(fft(f), scaling_coefficient);
}
@@ -319,18 +313,20 @@
for (int i = 0; i N; i++) {
c[i] = new Complex(f[2*i], f[2*i+1]);
}
-computeOmega(isInverse ? -N : N);
+roots.computeOmega(isInverse ? -N
svn commit: r740457 - /commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
Author: mbenson
Date: Tue Feb 3 21:23:15 2009
New Revision: 740457
URL: http://svn.apache.org/viewvc?rev=740457view=rev
Log:
ws
Modified:
commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
Modified:
commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java?rev=740457r1=740456r2=740457view=diff
==
---
commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
(original)
+++
commons/proper/collections/branches/collections_jdk5_branch/src/java/org/apache/commons/collections/MapUtils.java
Tue Feb 3 21:23:15 2009
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the License); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -43,7 +43,7 @@
import org.apache.commons.collections.map.UnmodifiableMap;
import org.apache.commons.collections.map.UnmodifiableSortedMap;
-/**
+/**
* Provides utility methods and decorators for
* {...@link Map} and {...@link SortedMap} instances.
* p
@@ -72,7 +72,7 @@
*
* @since Commons Collections 1.0
* @version $Revision$ $Date$
- *
+ *
* @author a href=mailto:jstrac...@apache.org;James Strachan/a
* @author a href=mailto:nis...@nksystems.com;Nissim Karpenstein/a
* @author a href=mailto:kniel...@apache.org;Kasper Nielsen/a
@@ -87,7 +87,7 @@
* @author Neil O'Toole
*/
public class MapUtils {
-
+
/**
* An empty unmodifiable map.
* This was not provided in JDK1.2.
@@ -109,7 +109,7 @@
* codeMapUtils/code should not normally be instantiated.
*/
public MapUtils() {
-}
+}
// Type safe getters
//-
@@ -382,7 +382,7 @@
* @param key the key of the value to look up in that map
* @param defaultValue what to return if the value is null or if the
* conversion fails
- * @return the value in the map as a string, or defaultValue if the
+ * @return the value in the map as a string, or defaultValue if the
*original value is null, the map is null or the string conversion
*fails
*/
@@ -402,7 +402,7 @@
* @param key the key of the value to look up in that map
* @param defaultValue what to return if the value is null or if the
* conversion fails
- * @return the value in the map as a boolean, or defaultValue if the
+ * @return the value in the map as a boolean, or defaultValue if the
*original value is null, the map is null or the boolean conversion
*fails
*/
@@ -422,7 +422,7 @@
* @param key the key of the value to look up in that map
* @param defaultValue what to return if the value is null or if the
* conversion fails
- * @return the value in the map as a number, or defaultValue if the
+ * @return the value in the map as a number, or defaultValue if the
*original value is null, the map is null or the number conversion
*fails
*/
@@ -442,7 +442,7 @@
* @param key the key of the value to look up in that map
* @param defaultValue what to return if the value is null or if the
* conversion fails
- * @return the value in the map as a number, or defaultValue if the
+ * @return the value in the map as a number, or defaultValue if the
*original value is null, the map is null or the number conversion
*fails
*/
@@ -462,7 +462,7 @@
* @param key the key of the value to look up in that map
* @param defaultValue what to return if the value is null or if the
* conversion fails
- * @return the value in the map as a number, or defaultValue if the
+ * @return the value in the map as a number, or defaultValue if the
*original value is null, the map is null or the number conversion
*fails
*/
@@ -482,7 +482,7 @@
* @param key the key of the value to look up in that map
* @param defaultValue what to return if the value is null or if the
* conversion fails
- * @return the value in the map as a number, or defaultValue if the
+ * @return the value in the map as a number, or defaultValue if the
*original value is null,
svn commit: r740604 - /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Author: bodewig
Date: Wed Feb 4 04:56:10 2009
New Revision: 740604
URL: http://svn.apache.org/viewvc?rev=740604view=rev
Log:
merge revision 738853 from Ant - [SANDBOX-276]
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(contents, props changed)
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java?rev=740604r1=740603r2=740604view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
Wed Feb 4 04:56:10 2009
@@ -147,16 +147,19 @@
public ZipFile(File f, String encoding) throws IOException {
this.encoding = encoding;
archive = new RandomAccessFile(f, r);
+boolean success = false;
try {
populateFromCentralDirectory();
resolveLocalFileHeaderData();
-} catch (IOException e) {
-try {
-archive.close();
-} catch (IOException e2) {
-// swallow, throw the original exception instead
+success = true;
+} finally {
+if (!success) {
+try {
+archive.close();
+} catch (IOException e2) {
+// swallow, throw the original exception instead
+}
}
-throw e;
}
}
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 4 04:56:10 2009
@@ -0,0 +1 @@
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:738853
svn commit: r740605 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip: ./ ExtraFieldUtils.java ZipEntry.java ZipExtraField.java ZipFile.java
Author: bodewig
Date: Wed Feb 4 05:02:08 2009
New Revision: 740605
URL: http://svn.apache.org/viewvc?rev=740605view=rev
Log:
merge revision 739300 from Ant - [SANDBOX-276]
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/
(props changed)
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
(props changed)
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/
--
svn:mergeinfo = /ant/core/trunk/src/main/org/apache/tools/zip:739300
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java?rev=740605r1=740604r2=740605view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
Wed Feb 4 05:02:08 2009
@@ -114,10 +114,6 @@
}
start += (length + WORD);
}
-if (start != data.length) { // array not exhausted
-throw new ZipException(data starting at + start
-+ is in unknown format);
-}
ZipExtraField[] result = new ZipExtraField[v.size()];
v.copyInto(result);
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java?rev=740605r1=740604r2=740605view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java
Wed Feb 4 05:02:08 2009
@@ -269,7 +269,7 @@
try {
setExtraFields(ExtraFieldUtils.parse(extra));
} catch (Exception e) {
-throw new RuntimeException(e.getMessage());
+throw new RuntimeException(e.getMessage(), e);
}
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java?rev=740605r1=740604r2=740605view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
Wed Feb 4 05:02:08 2009
@@ -66,8 +66,8 @@
byte[] getLocalFileDataData();
/**
- * The actual data to put central directory - without Header-ID or length
- * specifier.
+ * The actual data to put into central directory - without Header-ID or
+ * length specifier.
*
* @return The CentralDirectoryData value
* @since 1.1
Propchange:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 4 05:02:08 2009
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:738853
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:738853,739300
