svn commit: r903086 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Author: bodewig
Date: Tue Jan 26 05:24:17 2010
New Revision: 903086
URL: http://svn.apache.org/viewvc?rev=903086&view=rev
Log:
complete equals implementation. COMPRESS-94
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=903086&r1=903085&r2=903086&view=diff
==
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
Tue Jan 26 05:24:17 2010
@@ -18,6 +18,7 @@
package org.apache.commons.compress.archivers.zip;
import java.io.File;
+import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.zip.ZipException;
@@ -469,6 +470,26 @@
} else if (!myName.equals(otherName)) {
return false;
}
-return true;
+String myComment = getComment();
+String otherComment = other.getComment();
+if (myComment == null) {
+if (otherComment != null) {
+return false;
+}
+} else if (!myComment.equals(otherComment)) {
+return false;
+}
+return getTime() == other.getTime()
+&& getInternalAttributes() == other.getInternalAttributes()
+&& getPlatform() == other.getPlatform()
+&& getExternalAttributes() == other.getExternalAttributes()
+&& getMethod() == other.getMethod()
+&& getSize() == other.getSize()
+&& getCrc() == other.getCrc()
+&& getCompressedSize() == other.getCompressedSize()
+&& Arrays.equals(getCentralDirectoryExtra(),
+ other.getCentralDirectoryExtra())
+&& Arrays.equals(getLocalFileDataExtra(),
+ other.getLocalFileDataExtra());
}
}
svn commit: r903059 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java
Author: sebb
Date: Tue Jan 26 02:53:00 2010
New Revision: 903059
URL: http://svn.apache.org/viewvc?rev=903059&view=rev
Log:
Document why OK to suppress unchecked warning
Move tag as close as possible to site of warning
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java?rev=903059&r1=903058&r2=903059&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/SparseFieldVector.java
Tue Jan 26 02:53:00 2010
@@ -584,7 +584,7 @@
* @param length size of the array to build
* @return a new array
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings("unchecked") // field is type T
private T[] buildArray(final int length) {
return (T[]) Array.newInstance(field.getZero().getClass(), length);
}
@@ -608,7 +608,6 @@
/** {...@inheritdoc} */
-@SuppressWarnings("unchecked")
@Override
public boolean equals(Object obj) {
@@ -620,10 +619,12 @@
return false;
}
-if (!(obj instanceof SparseFieldVector)) {
+if (!(obj instanceof SparseFieldVector)) {
return false;
}
+@SuppressWarnings("unchecked") // OK, because "else if" check below
ensures that
+ // other must be the same type as this
SparseFieldVector other = (SparseFieldVector) obj;
if (field == null) {
if (other.field != null) {
svn commit: r903047 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
Author: sebb
Date: Tue Jan 26 02:07:42 2010
New Revision: 903047
URL: http://svn.apache.org/viewvc?rev=903047&view=rev
Log:
Document why OK to suppress unchecked warning
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java?rev=903047&r1=903046&r2=903047&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/OpenIntToFieldHashMap.java
Tue Jan 26 02:07:42 2010
@@ -622,7 +622,7 @@
* @param length size of the array to build
* @return a new array
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings("unchecked") // field is of type T
private T[] buildArray(final int length) {
return (T[]) Array.newInstance(field.getZero().getClass(), length);
}
svn commit: r903046 - in /commons/proper/math/trunk/src/main/java/org/apache/commons/math: genetics/OnePointCrossover.java linear/AbstractFieldMatrix.java linear/ArrayFieldVector.java linear/FieldLUDe
Author: sebb
Date: Tue Jan 26 02:07:26 2010
New Revision: 903046
URL: http://svn.apache.org/viewvc?rev=903046&view=rev
Log:
Document why OK to suppress unchecked warning
Move tag as close as possible to site of warning
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/FieldLUDecompositionImpl.java
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/MatrixUtils.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java?rev=903046&r1=903045&r2=903046&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/OnePointCrossover.java
Tue Jan 26 02:07:26 2010
@@ -66,9 +66,9 @@
* @param second second parent (p2)
* @return pair of two children (c1,c2)
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings("unchecked") // OK because of instanceof checks
public ChromosomePair crossover(Chromosome first, Chromosome second) {
-if (! (first instanceof AbstractListChromosome && second instanceof
AbstractListChromosome)) {
+if (! (first instanceof AbstractListChromosome && second instanceof
AbstractListChromosome)) {
throw new IllegalArgumentException("One point crossover works on
FixedLengthChromosomes only.");
}
return crossover((AbstractListChromosome) first,
(AbstractListChromosome) second);
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java?rev=903046&r1=903045&r2=903046&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/AbstractFieldMatrix.java
Tue Jan 26 02:07:26 2010
@@ -146,9 +146,9 @@
* @param length of the array
* @return a new array
*/
-@SuppressWarnings("unchecked")
protected static > T[] buildArray(final Field
field,
final int
length) {
+@SuppressWarnings("unchecked") // OK because field must be correct
class
T[] array = (T[]) Array.newInstance(field.getZero().getClass(),
length);
Arrays.fill(array, field.getZero());
return array;
@@ -970,16 +970,15 @@
* @param object the object to test equality against.
* @return true if object equals this
*/
-@SuppressWarnings("unchecked")
@Override
public boolean equals(final Object object) {
if (object == this ) {
return true;
}
-if (object instanceof FieldMatrix == false) {
+if (object instanceof FieldMatrix == false) {
return false;
}
-FieldMatrix m = (FieldMatrix) object;
+FieldMatrix m = (FieldMatrix) object;
final int nRows = getRowDimension();
final int nCols = getColumnDimension();
if (m.getColumnDimension() != nCols || m.getRowDimension() != nRows) {
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java?rev=903046&r1=903045&r2=903046&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/ArrayFieldVector.java
Tue Jan 26 02:07:26 2010
@@ -223,7 +223,7 @@
* @param length size of the array to build
* @return a new array
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings("unchecked") // field is of type T
private T[] buildArray(final int length) {
return (T[]) Array.newInstance(field.getZero().getClass(), length);
}
@@ -739,7 +739,6 @@
* not equal to this Vector3D instance
*
*/
-@SuppressWarnings("unchecked")
@Override
public boolean equals(Object other) {
@@ -752,7 +751,7 @
svn commit: r903044 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java
Author: sebb
Date: Tue Jan 26 02:00:09 2010
New Revision: 903044
URL: http://svn.apache.org/viewvc?rev=903044&view=rev
Log:
Document why OK to suppress unchecked warning
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java?rev=903044&r1=903043&r2=903044&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/ArrayFieldVectorTest.java
Tue Jan 26 02:00:09 2010
@@ -72,7 +72,7 @@
* @param length size of the array to build
* @return a new array
*/
-@SuppressWarnings("unchecked")
+@SuppressWarnings("unchecked") // field is of type T
private T[] buildArray(final int length) {
return (T[]) Array.newInstance(field.getZero().getClass(), length);
}
svn commit: r902960 - in /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent: CallableBackgroundInitializerTest.java TimedSemaphoreTest.java
Author: sebb
Date: Mon Jan 25 19:47:41 2010
New Revision: 902960
URL: http://svn.apache.org/viewvc?rev=902960&view=rev
Log:
Explicit boxing
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java?rev=902960&r1=902959&r2=902960&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/CallableBackgroundInitializerTest.java
Mon Jan 25 19:47:41 2010
@@ -29,7 +29,7 @@
*/
public class CallableBackgroundInitializerTest extends TestCase {
/** Constant for the result of the call() invocation. */
-private static final Integer RESULT = 42;
+private static final Integer RESULT = Integer.valueOf(42);
/**
* Tries to create an instance without a Callable. This should cause an
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java?rev=902960&r1=902959&r2=902960&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
Mon Jan 25 19:47:41 2010
@@ -187,7 +187,7 @@
.createMock(ScheduledExecutorService.class);
ScheduledFuture future = EasyMock.createMock(ScheduledFuture.class);
prepareStartTimer(service, future);
-EasyMock.expect(future.cancel(false)).andReturn(true);
+
EasyMock.expect(Boolean.valueOf(future.cancel(false))).andReturn(Boolean.TRUE);
EasyMock.replay(service, future);
TimedSemaphoreTestImpl semaphore = new TimedSemaphoreTestImpl(service,
PERIOD, UNIT, LIMIT);
svn commit: r902958 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java
Author: sebb Date: Mon Jan 25 19:44:41 2010 New Revision: 902958 URL: http://svn.apache.org/viewvc?rev=902958&view=rev Log: Explicit boxing Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java?rev=902958&r1=902957&r2=902958&view=diff == --- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java (original) +++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/concurrent/TimedSemaphoreTest.java Mon Jan 25 19:44:41 2010 @@ -168,7 +168,7 @@ .createMock(ScheduledExecutorService.class); ScheduledFuture future = EasyMock.createMock(ScheduledFuture.class); prepareStartTimer(service, future); -EasyMock.expect(future.cancel(false)).andReturn(true); + EasyMock.expect(Boolean.valueOf(future.cancel(false))).andReturn(Boolean.TRUE); EasyMock.replay(service, future); TimedSemaphoreTestImpl semaphore = new TimedSemaphoreTestImpl(service, PERIOD, UNIT, LIMIT);
svn commit: r902955 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Author: sebb
Date: Mon Jan 25 19:40:38 2010
New Revision: 902955
URL: http://svn.apache.org/viewvc?rev=902955&view=rev
Log:
Simplify code (eliminate conditional check) and avoid NPE warning
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java?rev=902955&r1=902954&r2=902955&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Mon Jan 25 19:40:38 2010
@@ -312,7 +312,8 @@
throw new IllegalArgumentException("Date and Patterns must not be
null");
}
-SimpleDateFormat parser = null;
+SimpleDateFormat parser = new SimpleDateFormat();
+parser.setLenient(lenient);
ParsePosition pos = new ParsePosition(0);
for (int i = 0; i < parsePatterns.length; i++) {
@@ -323,12 +324,7 @@
pattern = pattern.substring(0, pattern.length() - 1);
}
-if (i == 0) {
-parser = new SimpleDateFormat(pattern);
-parser.setLenient(lenient);
-} else {
-parser.applyPattern(pattern); // cannot be null if i != 0
-}
+parser.applyPattern(pattern);
pos.setIndex(0);
String str2 = str;
svn commit: r902948 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Author: sebb
Date: Mon Jan 25 19:32:33 2010
New Revision: 902948
URL: http://svn.apache.org/viewvc?rev=902948&view=rev
Log:
Javadoc correction
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java?rev=902948&r1=902947&r2=902948&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/time/DateUtils.java
Mon Jan 25 19:32:33 2010
@@ -298,15 +298,14 @@
*
* @param str the date to parse, not null
* @param parsePatterns the date format patterns to use, see
SimpleDateFormat, not null
- * @param lenient Specify whether or not date/time parsing is to be
lenient.
* @return the parsed date
* @throws IllegalArgumentException if the date string or pattern array is
null
* @throws ParseException if none of the date patterns were suitable
- * @see java.util.Calender#isLenient()
*/
public static Date parseDateStrictly(String str, String[] parsePatterns)
throws ParseException {
return parseDateWithLeniency(str, parsePatterns, false);
}
+
private static Date parseDateWithLeniency(String str, String[]
parsePatterns,
boolean lenient) throws ParseException {
if (str == null || parsePatterns == null) {
svn commit: r902944 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
Author: sebb
Date: Mon Jan 25 19:32:08 2010
New Revision: 902944
URL: http://svn.apache.org/viewvc?rev=902944&view=rev
Log:
Fix raw types
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java?rev=902944&r1=902943&r2=902944&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/text/StrSubstitutor.java
Mon Jan 25 19:32:08 2010
@@ -119,7 +119,7 @@
/**
* Variable resolution is delegated to an implementor of VariableResolver.
*/
-private StrLookup variableResolver;
+private StrLookup variableResolver;
//---
/**
@@ -167,7 +167,7 @@
* and the escaping character.
*/
public StrSubstitutor() {
-this((StrLookup) null, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
+this((StrLookup) null, DEFAULT_PREFIX, DEFAULT_SUFFIX,
DEFAULT_ESCAPE);
}
/**
@@ -210,7 +210,7 @@
*
* @param variableResolver the variable resolver, may be null
*/
-public StrSubstitutor(StrLookup variableResolver) {
+public StrSubstitutor(StrLookup variableResolver) {
this(variableResolver, DEFAULT_PREFIX, DEFAULT_SUFFIX, DEFAULT_ESCAPE);
}
@@ -223,7 +223,7 @@
* @param escape the escape character
* @throws IllegalArgumentException if the prefix or suffix is null
*/
-public StrSubstitutor(StrLookup variableResolver, String prefix, String
suffix, char escape) {
+public StrSubstitutor(StrLookup variableResolver, String prefix, String
suffix, char escape) {
this.setVariableResolver(variableResolver);
this.setVariablePrefix(prefix);
this.setVariableSuffix(suffix);
@@ -240,7 +240,7 @@
* @throws IllegalArgumentException if the prefix or suffix is null
*/
public StrSubstitutor(
-StrLookup variableResolver, StrMatcher prefixMatcher, StrMatcher
suffixMatcher, char escape) {
+StrLookup variableResolver, StrMatcher prefixMatcher,
StrMatcher suffixMatcher, char escape) {
this.setVariableResolver(variableResolver);
this.setVariablePrefixMatcher(prefixMatcher);
this.setVariableSuffixMatcher(suffixMatcher);
@@ -648,7 +648,7 @@
* @return the variable's value or null if the variable is unknown
*/
protected String resolveVariable(String variableName, StrBuilder buf, int
startPos, int endPos) {
-StrLookup resolver = getVariableResolver();
+StrLookup resolver = getVariableResolver();
if (resolver == null) {
return null;
}
@@ -814,7 +814,7 @@
*
* @return the VariableResolver
*/
-public StrLookup getVariableResolver() {
+public StrLookup getVariableResolver() {
return this.variableResolver;
}
@@ -823,7 +823,7 @@
*
* @param variableResolver the VariableResolver
*/
-public void setVariableResolver(StrLookup variableResolver) {
+public void setVariableResolver(StrLookup variableResolver) {
this.variableResolver = variableResolver;
}
svn commit: r902934 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java
Author: sebb Date: Mon Jan 25 19:09:17 2010 New Revision: 902934 URL: http://svn.apache.org/viewvc?rev=902934&view=rev Log: Fix typo in copy() code Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java?rev=902934&r1=902933&r2=902934&view=diff == --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java (original) +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/stat/descriptive/moment/FirstMoment.java Mon Jan 25 19:09:17 2010 @@ -154,6 +154,6 @@ dest.n = source.n; dest.m1 = source.m1; dest.dev = source.dev; -dest.nDev = dest.nDev; +dest.nDev = source.nDev; } }
svn commit: r902931 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java
Author: sebb Date: Mon Jan 25 19:05:00 2010 New Revision: 902931 URL: http://svn.apache.org/viewvc?rev=902931&view=rev Log: Does not make sense for count variable to be public Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java Modified: commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java?rev=902931&r1=902930&r2=902931&view=diff == --- commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java (original) +++ commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/FitnessCachingTest.java Mon Jan 25 19:05:00 2010 @@ -36,7 +36,7 @@ private static final double ELITISM_RATE = 0.2; // how many times was the fitness computed -public static int fitnessCalls = 0; +private static int fitnessCalls = 0; @Test
svn commit: r902930 - in /commons/proper/math/trunk/src/test/java/org/apache/commons/math: genetics/GeneticAlgorithmTestPermutations.java ode/TestProblemFactory.java
Author: sebb
Date: Mon Jan 25 19:04:32 2010
New Revision: 902930
URL: http://svn.apache.org/viewvc?rev=902930&view=rev
Log:
Make private static fields final
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblemFactory.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java?rev=902930&r1=902929&r2=902930&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/genetics/GeneticAlgorithmTestPermutations.java
Mon Jan 25 19:04:32 2010
@@ -41,7 +41,7 @@
private static final int TOURNAMENT_ARITY = 2;
// numbers from 0 to N-1
-private static List sequence = new ArrayList();
+private static final List sequence = new ArrayList();
static {
for (int i=0; ihttp://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblemFactory.java?rev=902930&r1=902929&r2=902930&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblemFactory.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/ode/TestProblemFactory.java
Mon Jan 25 19:04:32 2010
@@ -23,7 +23,7 @@
public class TestProblemFactory {
/** Problems pool. */
- private static TestProblemAbstract[] pool = {
+ private static final TestProblemAbstract[] pool = {
new TestProblem1(),
new TestProblem2(),
new TestProblem3(),
svn commit: r902929 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java
Author: sebb
Date: Mon Jan 25 19:03:56 2010
New Revision: 902929
URL: http://svn.apache.org/viewvc?rev=902929&view=rev
Log:
Document field thread-safety
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java?rev=902929&r1=902928&r2=902929&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/genetics/GeneticAlgorithm.java
Mon Jan 25 19:03:56 2010
@@ -34,6 +34,7 @@
* Use {...@link #setRandomGenerator(RandomGenerator)} to supply an
alternative
* to the default JDK-provided PRNG.
*/
+//@GuardedBy("this")
private static RandomGenerator randomGenerator = new JDKRandomGenerator();
/** the crossover policy used by the algorithm. */
svn commit: r902928 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java
Author: sebb
Date: Mon Jan 25 19:03:26 2010
New Revision: 902928
URL: http://svn.apache.org/viewvc?rev=902928&view=rev
Log:
Make private constant final
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java?rev=902928&r1=902927&r2=902928&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java
Mon Jan 25 19:03:26 2010
@@ -45,7 +45,7 @@
final class SaddlePointExpansion {
/** 1/2 * log(2 π). */
-private static double HALF_LOG_2_PI = 0.5 * Math.log(MathUtils.TWO_PI);
+private static final double HALF_LOG_2_PI = 0.5 *
Math.log(MathUtils.TWO_PI);
/** exact Stirling expansion error for certain values. */
private static final double[] EXACT_STIRLING_ERRORS = { 0.0, /* 0.0 */
svn commit: r902919 [1/2] - in /commons/sandbox/runtime/trunk/src/main/native: configure os/win32/subsys.c port/wcslcat.c port/wcslcpy.c support/win32/wsuexec.c
Author: mturk
Date: Mon Jan 25 18:46:03 2010
New Revision: 902919
URL: http://svn.apache.org/viewvc?rev=902919&view=rev
Log:
Stage 2 of wsuexec
Modified:
commons/sandbox/runtime/trunk/src/main/native/configure
commons/sandbox/runtime/trunk/src/main/native/os/win32/subsys.c
commons/sandbox/runtime/trunk/src/main/native/port/wcslcat.c
commons/sandbox/runtime/trunk/src/main/native/port/wcslcpy.c
commons/sandbox/runtime/trunk/src/main/native/support/win32/wsuexec.c
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=902919&r1=902918&r2=902919&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Jan 25 18:46:03
2010
@@ -579,7 +579,7 @@
varadds cppopts -DWIN32 -DWINNT -D_WIN32 -D_WINDOWS -D_WINNT
varadds cppopts -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0600 -D$mcpu
-D__CC$bits
varadds cxxopts -TP
-varadds ldflags kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
ole32.lib
+varadds ldflags kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
ole32.lib crypt32.lib
varadds ldflags shell32.lib rpcrt4.lib user32.lib gdi32.lib
userenv.lib wtsapi32.lib
varadds ldflags psapi.lib shlwapi.lib wldap32.lib netapi32.lib
iphlpapi.lib urlmon.lib
varadds shflags /NOLOGO /OPT:REF
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/subsys.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/subsys.c?rev=902919&r1=902918&r2=902919&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/subsys.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/subsys.c Mon Jan 25
18:46:03 2010
@@ -35,6 +35,7 @@
* Session zero.
*/
+
#ifdef ACR_ENABLE_TEST
/* Rundll32 Test exports.
@@ -49,11 +50,11 @@
* Rundll32 is missing console, so redirection must be performed, and it
requires
* the short names for locating the .dll.
*/
-ACR_DECLARE(void) TestRunW(HWND hwnd, HINSTANCE hinst,
- LPWSTR lpszCmdLine, int nCmdShow)
+ACR_DECLARE(int) TestRunW(HINSTANCE hInstance, HINSTANCE hPrevInstance,
+ LPWSTR lpszCmdLine, int nCmdShow)
{
int rc = 0;
-
+OutputDebugStringA("Running TestRunW");
if ((rc = ACR_Initialize(NULL))) {
fprintf(stderr, "Failed to initialize the ACR error=%d\n", rc);
fflush(stderr);
@@ -64,20 +65,20 @@
fflush(stderr);
goto cleanup;
}
-
fprintf(stdout, "Running TestRunW ...\n");
-fprintf(stdout, "HWND : %p\n", hwnd);
+fprintf(stdout, "HINST : %p\n", hInstance);
fprintf(stdout, "show : %08x\n", nCmdShow);
fprintf(stdout, "cmdline: %S\n", lpszCmdLine);
fflush(stdout);
cleanup:
-ExitProcess(rc);
+return rc;
}
-ACR_DECLARE(void) TestRunA(HWND hwnd, HINSTANCE hinst,
- LPSTR lpszCmdLine, int nCmdShow)
+
+ACR_DECLARE(int) TestRunA(HWND hwnd, HINSTANCE hinst,
+ LPSTR lpszCmdLine, int nCmdShow)
{
int rc = 0;
Modified: commons/sandbox/runtime/trunk/src/main/native/port/wcslcat.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/port/wcslcat.c?rev=902919&r1=902918&r2=902919&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/port/wcslcat.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/port/wcslcat.c Mon Jan 25
18:46:03 2010
@@ -64,21 +64,21 @@
size_t dlen;
/* Find the end of dst and adjust bytes left but don't go past end */
-while (*d != '\0' && n-- != 0)
+while (*d != L'\0' && n-- != 0)
d++;
dlen = d - dst;
n = siz - dlen;
if (n == 0)
return(dlen + wcslen(s));
-while (*s != '\0') {
+while (*s != L'\0') {
if (n != 1) {
*d++ = *s;
n--;
}
s++;
}
-*d = '\0';
+*d = L'\0';
return(dlen + (s - src)); /* count does not include NUL */
}
Modified: commons/sandbox/runtime/trunk/src/main/native/port/wcslcpy.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/port/wcslcpy.c?rev=902919&r1=902918&r2=902919&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/port/wcslcpy.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/port/wcslcpy.c Mon Jan 25
18:46:03 2010
@@ -63,7 +63,7 @@
/* Copy as many bytes as will fit */
if (n != 0) {
while (--n != 0) {
-if ((*d++ = *s++) == '\0'
svn commit: r902824 [1/2] - /commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/ArrayUtils.java
Author: niallp Date: Mon Jan 25 14:36:12 2010 New Revision: 902824 URL: http://svn.apache.org/viewvc?rev=902824&view=rev Log: Formatting changes only Modified: commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/ArrayUtils.java
svn commit: r902790 - in /commons/proper/lang/branches/LANG_2_X: default.properties pom.xml src/java/ src/main/ src/main/java/ src/test/java/ src/test/java/org/ src/test/org/
Author: niallp Date: Mon Jan 25 12:07:50 2010 New Revision: 902790 URL: http://svn.apache.org/viewvc?rev=902790&view=rev Log: Re-organize to normal m2 layout (as trunk has) Added: commons/proper/lang/branches/LANG_2_X/src/main/ commons/proper/lang/branches/LANG_2_X/src/main/java/ - copied from r902785, commons/proper/lang/branches/LANG_2_X/src/java/ commons/proper/lang/branches/LANG_2_X/src/test/java/ commons/proper/lang/branches/LANG_2_X/src/test/java/org/ - copied from r902785, commons/proper/lang/branches/LANG_2_X/src/test/org/ Removed: commons/proper/lang/branches/LANG_2_X/src/java/ commons/proper/lang/branches/LANG_2_X/src/test/org/ Modified: commons/proper/lang/branches/LANG_2_X/default.properties commons/proper/lang/branches/LANG_2_X/pom.xml Modified: commons/proper/lang/branches/LANG_2_X/default.properties URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/default.properties?rev=902790&r1=902789&r2=902790&view=diff == --- commons/proper/lang/branches/LANG_2_X/default.properties (original) +++ commons/proper/lang/branches/LANG_2_X/default.properties Mon Jan 25 12:07:50 2010 @@ -48,10 +48,10 @@ dist.home = dist # The base directory for component sources -source.home = src/java +source.home = src/main/java # The base directory for unit test sources -test.home = src/test +test.home = src/test/java # Should Java compilations set the 'debug' compiler option? compile.debug = true Modified: commons/proper/lang/branches/LANG_2_X/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/pom.xml?rev=902790&r1=902789&r2=902790&view=diff == --- commons/proper/lang/branches/LANG_2_X/pom.xml (original) +++ commons/proper/lang/branches/LANG_2_X/pom.xml Mon Jan 25 12:07:50 2010 @@ -399,8 +399,6 @@ -src/java -src/test org.apache.maven.plugins
svn commit: r902785 - /commons/proper/lang/branches/LANG_2_X/pom.xml
Author: niallp Date: Mon Jan 25 11:46:28 2010 New Revision: 902785 URL: http://svn.apache.org/viewvc?rev=902785&view=rev Log: Change version from 3.0-SNAPSHOT back to to 2.5-SNAPSHOT Modified: commons/proper/lang/branches/LANG_2_X/pom.xml Modified: commons/proper/lang/branches/LANG_2_X/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/pom.xml?rev=902785&r1=902784&r2=902785&view=diff == --- commons/proper/lang/branches/LANG_2_X/pom.xml (original) +++ commons/proper/lang/branches/LANG_2_X/pom.xml Mon Jan 25 11:46:28 2010 @@ -27,7 +27,7 @@ 4.0.0 commons-lang commons-lang - 3.0-SNAPSHOT + 2.5-SNAPSHOT Commons Lang 2001
svn commit: r902784 - /commons/proper/lang/branches/LANG_2_X/
Author: niallp Date: Mon Jan 25 11:38:51 2010 New Revision: 902784 URL: http://svn.apache.org/viewvc?rev=902784&view=rev Log: Create Lang 2.x branch from before JDK 1.5 changes started to be applied (r749095) Added: commons/proper/lang/branches/LANG_2_X/ - copied from r739041, commons/proper/lang/trunk/
svn commit: r902783 - /commons/proper/lang/branches/LANG_2_X/
Author: niallp Date: Mon Jan 25 11:36:32 2010 New Revision: 902783 URL: http://svn.apache.org/viewvc?rev=902783&view=rev Log: Remove branch (there were JDK 1.5 changes before the pom.xml was changed to 1.5) Removed: commons/proper/lang/branches/LANG_2_X/
svn commit: r902781 - /commons/proper/lang/branches/LANG_2_X/
Author: niallp Date: Mon Jan 25 11:23:48 2010 New Revision: 902781 URL: http://svn.apache.org/viewvc?rev=902781&view=rev Log: Create Lang 2.x branch from before JDK 1.5 changes started to be applied (r749165) Added: commons/proper/lang/branches/LANG_2_X/ - copied from r749151, commons/proper/lang/trunk/
