svn commit: r1166533 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java
Author: celestin
Date: Thu Sep 8 05:59:22 2011
New Revision: 1166533
URL: http://svn.apache.org/viewvc?rev=1166533&view=rev
Log:
Removed call to double[][] solve(double[][]) from
initializeHighOrderDerivatives.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java?rev=1166533&r1=1166532&r2=1166533&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/ode/nonstiff/AdamsNordsieckTransformer.java
Thu Sep 8 05:59:22 2011
@@ -30,6 +30,7 @@ import org.apache.commons.math.linear.Fi
import org.apache.commons.math.linear.MatrixUtils;
import org.apache.commons.math.linear.QRDecomposition;
import org.apache.commons.math.linear.QRDecompositionImpl;
+import org.apache.commons.math.linear.RealMatrix;
/** Transformer to Nordsieck vectors for Adams integrators.
* This class is used by {@link AdamsBashforthIntegrator Adams-Bashforth}
and
@@ -289,8 +290,8 @@ public class AdamsNordsieckTransformer {
// solve the rectangular system in the least square sense
// to get the best estimate of the Nordsieck vector [s2 ... sk]
QRDecomposition decomposition = new QRDecompositionImpl(new
Array2DRowRealMatrix(a, false));
-return new Array2DRowRealMatrix(decomposition.getSolver().solve(b),
false);
-
+RealMatrix x = decomposition.getSolver().solve(new
Array2DRowRealMatrix(b, false));
+return new Array2DRowRealMatrix(x.getData(), false);
}
/** Update the high order scaled derivatives for Adams integrators (phase
1).
svn commit: r1166516 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java
Author: celestin
Date: Thu Sep 8 03:24:28 2011
New Revision: 1166516
URL: http://svn.apache.org/viewvc?rev=1166516&view=rev
Log:
Removed call to double[][] solve(double[][]) from interface DecompositionSolver.
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java?rev=1166516&r1=1166515&r2=1166516&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/SingularValueSolverTest.java
Thu Sep 8 03:24:28 2011
@@ -98,9 +98,6 @@ public class SingularValueSolverTest {
// using RealMatrix
Assert.assertEquals(0, solver.solve(b).subtract(xRef).getNorm(),
normTolerance);
-// using double[][]
-Assert.assertEquals(0,
MatrixUtils.createRealMatrix(solver.solve(b.getData())).subtract(xRef).getNorm(),
normTolerance);
-
// using ArrayRealVector
for (int i = 0; i < b.getColumnDimension(); ++i) {
Assert.assertEquals(0,
svn commit: r1166515 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
Author: celestin
Date: Thu Sep 8 03:24:04 2011
New Revision: 1166515
URL: http://svn.apache.org/viewvc?rev=1166515&view=rev
Log:
Removed call to double[][] solve(double[][]) from interface DecompositionSolver.
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java?rev=1166515&r1=1166514&r2=1166515&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/QRSolverTest.java
Thu Sep 8 03:24:04 2011
@@ -124,9 +124,6 @@ public class QRSolverTest {
// using RealMatrix
Assert.assertEquals(0, solver.solve(b).subtract(xRef).getNorm(),
2.0e-16 * xRef.getNorm());
-// using double[][]
-Assert.assertEquals(0,
MatrixUtils.createRealMatrix(solver.solve(b.getData())).subtract(xRef).getNorm(),
2.0e-16 * xRef.getNorm());
-
// using ArrayRealVector
for (int i = 0; i < b.getColumnDimension(); ++i) {
final RealVector x = solver.solve(b.getColumnVector(i));
svn commit: r1166514 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
Author: celestin
Date: Thu Sep 8 03:23:44 2011
New Revision: 1166514
URL: http://svn.apache.org/viewvc?rev=1166514&view=rev
Log:
Removed call to double[][] solve(double[][]) from interface DecompositionSolver.
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java?rev=1166514&r1=1166513&r2=1166514&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/LUSolverTest.java
Thu Sep 8 03:23:44 2011
@@ -137,9 +137,6 @@ public class LUSolverTest {
// using RealMatrix
Assert.assertEquals(0, solver.solve(b).subtract(xRef).getNorm(),
1.0e-13);
-// using double[][]
-Assert.assertEquals(0,
MatrixUtils.createRealMatrix(solver.solve(b.getData())).subtract(xRef).getNorm(),
1.0e-13);
-
// using ArrayRealVector
for (int i = 0; i < b.getColumnDimension(); ++i) {
Assert.assertEquals(0,
svn commit: r1166513 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
Author: celestin
Date: Thu Sep 8 03:23:19 2011
New Revision: 1166513
URL: http://svn.apache.org/viewvc?rev=1166513&view=rev
Log:
Removed call to double[][] solve(double[][]) from interface DecompositionSolver.
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java?rev=1166513&r1=1166512&r2=1166513&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/EigenSolverTest.java
Thu Sep 8 03:23:19 2011
@@ -120,10 +120,6 @@ public class EigenSolverTest {
RealMatrix solution=es.solve(b);
Assert.assertEquals(0, solution.subtract(xRef).getNorm(), 2.5e-12);
-// using double[][]
-solution = MatrixUtils.createRealMatrix(es.solve(b.getData()));
-Assert.assertEquals(0, solution.subtract(xRef).getNorm(), 2.5e-12);
-
// using RealVector
for (int i = 0; i < b.getColumnDimension(); ++i) {
Assert.assertEquals(0,
svn commit: r1166512 - /commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java
Author: celestin
Date: Thu Sep 8 03:22:50 2011
New Revision: 1166512
URL: http://svn.apache.org/viewvc?rev=1166512&view=rev
Log:
Removed call to double[][] solve(double[][]) from interface DecompositionSolver.
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java
Modified:
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java?rev=1166512&r1=1166511&r2=1166512&view=diff
==
---
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java
(original)
+++
commons/proper/math/trunk/src/test/java/org/apache/commons/math/linear/CholeskySolverTest.java
Thu Sep 8 03:22:50 2011
@@ -81,9 +81,6 @@ public class CholeskySolverTest {
// using RealMatrix
Assert.assertEquals(0, solver.solve(b).subtract(xRef).getNorm(),
1.0e-13);
-// using double[][]
-Assert.assertEquals(0,
MatrixUtils.createRealMatrix(solver.solve(b.getData())).subtract(xRef).getNorm(),
1.0e-13);
-
// using ArrayRealVector
for (int i = 0; i < b.getColumnDimension(); ++i) {
Assert.assertEquals(0,
svn commit: r1166450 - /commons/proper/commons-parent/trunk/pom.xml
Author: sebb Date: Wed Sep 7 22:26:28 2011 New Revision: 1166450 URL: http://svn.apache.org/viewvc?rev=1166450&view=rev Log: Note change of RAT plugin details Modified: commons/proper/commons-parent/trunk/pom.xml Modified: commons/proper/commons-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1166450&r1=1166449&r2=1166450&view=diff == --- commons/proper/commons-parent/trunk/pom.xml (original) +++ commons/proper/commons-parent/trunk/pom.xml Wed Sep 7 22:26:28 2011 @@ -37,6 +37,17 @@ + +
svn commit: r1166437 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/FastMath.java
Author: sebb
Date: Wed Sep 7 22:05:06 2011
New Revision: 1166437
URL: http://svn.apache.org/viewvc?rev=1166437&view=rev
Log:
MATH 650 FastMath has static code which slows the first access to FastMath
Enclose each large data table in nested static class so it's only loaded on
first access
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/FastMath.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/FastMath.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/FastMath.java?rev=1166437&r1=1166436&r2=1166437&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/FastMath.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/util/FastMath.java
Wed Sep 7 22:05:06 2011
@@ -77,6 +77,9 @@ public class FastMath {
private static final int EXP_INT_TABLE_MAX_INDEX = 750;
private static final int EXP_INT_TABLE_LEN = EXP_INT_TABLE_MAX_INDEX * 2;
+// Enclose large data table in nested static class so it's only loaded on
first access
+ private static class ExpInitTable {
+
/** Exponential evaluated at integer values,
* exp(x) = expIntTableA[x + EXP_INT_TABLE_MAX_INDEX] +
expIntTableB[x+EXP_INT_TABLE_MAX_INDEX].
*/
@@ -3090,10 +3093,14 @@ public class FastMath {
Double.NaN,
Double.NaN,
};
+ }
private static final int TWO_POWER_10 = 1024;
private static final int EXP_FRAC_TABLE_LEN = TWO_POWER_10 + 1; // 0,
1/1024, ... 1024/1024
+// Enclose large data table in nested static class so it's only loaded on
first access
+ private static class ExpFracTable {
+
/** Exponential over the range of 0 - 1 in increments of 2^-10
* exp(x/1024) = expFracTableA[x] + expFracTableB[x].
* 1024 = 2^10
@@ -5158,6 +5165,7 @@ public class FastMath {
-7.184550924856607E-8d,
+8.254840070367875E-8d,
};
+ }
private static final int FACT_LEN = 20;
@@ -5189,6 +5197,9 @@ public class FastMath {
private static final int LN_MANT_LEN = 1024; // MAGIC NUMBER
+// Enclose large data table in nested static class so it's only loaded on
first access
+ private static class lnMant {
+
/** Extended precision logarithm table over the range 1 - 2 in increments
of 2^-10. */
private static final double LN_MANT[][] = {
{+0.0d, +0.0d, }, // 0
@@ -6216,6 +6227,7 @@ public class FastMath {
{+0.6921701431274414d,-2.2153227096187463E-9d, }, // 1022
{+0.6926587820053101d,-1.943473623641502E-9d, }, // 1023
};
+ }
/** log(2) (high bits). */
@@ -6462,28 +6474,28 @@ public class FastMath {
// Populate expIntTable
for (i = 0; i < EXP_INT_TABLE_MAX_INDEX; i++) {
expint(i, tmp);
-EXP_INT_TABLE_A[i+EXP_INT_TABLE_MAX_INDEX] = tmp[0];
-EXP_INT_TABLE_B[i+EXP_INT_TABLE_MAX_INDEX] = tmp[1];
+ExpInitTable.EXP_INT_TABLE_A[i+EXP_INT_TABLE_MAX_INDEX] = tmp[0];
+ExpInitTable.EXP_INT_TABLE_B[i+EXP_INT_TABLE_MAX_INDEX] = tmp[1];
if (i != 0) {
// Negative integer powers
splitReciprocal(tmp, recip);
-EXP_INT_TABLE_A[EXP_INT_TABLE_MAX_INDEX-i] = recip[0];
-EXP_INT_TABLE_B[EXP_INT_TABLE_MAX_INDEX-i] = recip[1];
+ExpInitTable.EXP_INT_TABLE_A[EXP_INT_TABLE_MAX_INDEX-i] =
recip[0];
+ExpInitTable.EXP_INT_TABLE_B[EXP_INT_TABLE_MAX_INDEX-i] =
recip[1];
}
}
// Populate expFracTable
-for (i = 0; i < EXP_FRAC_TABLE_A.length; i++) {
+for (i = 0; i < ExpFracTable.EXP_FRAC_TABLE_A.length; i++) {
slowexp(i/1024.0, tmp); // TWO_POWER_10
-EXP_FRAC_TABLE_A[i] = tmp[0];
-EXP_FRAC_TABLE_B[i] = tmp[1];
+ExpFracTable.EXP_FRAC_TABLE_A[i] = tmp[0];
+ExpFracTable.EXP_FRAC_TABLE_B[i] = tmp[1];
}
// Populate lnMant table
-for (i = 0; i < LN_MANT.length; i++) {
+for (i = 0; i < lnMant.LN_MANT.length; i++) {
double d = Double.longBitsToDouble( (((long) i) << 42) |
0x3ff0L );
-LN_MANT[i] = slowLog(d);
+lnMant.LN_MANT[i] = slowLog(d);
}
// Build the sine and cosine tables
@@ -6493,11 +6505,11 @@ public class FastMath {
public static void main(String[] a){
printarray("FACT", FACT_LEN, FACT);
-printarray("EXP_INT_TABLE_A", EXP_INT_TABLE_LEN, EXP_INT_TABLE_A);
-printarray("EXP_INT_TABLE_B", EXP_INT_TABLE_LEN, EXP_INT_TABLE_B);
-printarray("EXP_FRAC_TABLE_A", EXP_FRAC_TABLE_LEN, EXP_FRAC_TABLE_A);
-printarray("EXP_FRAC_TABLE_B", EXP_FRAC_TABLE_LEN, EXP_FRAC_TABLE_B);
-
svn commit: r1166388 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
Author: simonetripodi
Date: Wed Sep 7 20:29:02 2011
New Revision: 1166388
URL: http://svn.apache.org/viewvc?rev=1166388&view=rev
Log:
fixed checkstyle violations: '4' is a magic number.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java?rev=1166388&r1=1166387&r2=1166388&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalPredicate.java
Wed Sep 7 20:29:02 2011
@@ -45,6 +45,9 @@ public final class ConditionalPredicate
* serialVersionUID declaration.
*/
private static final long serialVersionUID = 7333505000745854098L;
+
+/** Base hash integer used to shift hash */
+private static final int HASH_SHIFT = 4;
// attributes
//
private final Predicate ifPred;
@@ -102,15 +105,15 @@ public final class ConditionalPredicate
public int hashCode() {
int hash = "ConditionalPredicate".hashCode();
if (null != ifPred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= ifPred.hashCode();
}
if (null != thenPred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= thenPred.hashCode();
}
if (null != elsePred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= elsePred.hashCode();
}
return hash;
svn commit: r1166386 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java
Author: simonetripodi Date: Wed Sep 7 20:28:01 2011 New Revision: 1166386 URL: http://svn.apache.org/viewvc?rev=1166386&view=rev Log: fixed checkstyle violations: '4' is a magic number. Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java?rev=1166386&r1=1166385&r2=1166386&view=diff == --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalFunction.java Wed Sep 7 20:28:01 2011 @@ -46,6 +46,9 @@ public final class ConditionalFunction
svn commit: r1166384 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
Author: simonetripodi
Date: Wed Sep 7 20:22:00 2011
New Revision: 1166384
URL: http://svn.apache.org/viewvc?rev=1166384&view=rev
Log:
fixed checkstyle violations: '4' is a magic number.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java?rev=1166384&r1=1166383&r2=1166384&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryProcedure.java
Wed Sep 7 20:22:00 2011
@@ -47,6 +47,9 @@ public final class ConditionalBinaryProc
* serialVersionUID declaration.
*/
private static final long serialVersionUID = -3521992036791188475L;
+
+/** Base hash integer used to shift hash */
+private static final int HASH_SHIFT = 4;
// attributes
//
private final BinaryPredicate ifPred;
@@ -125,15 +128,15 @@ public final class ConditionalBinaryProc
public int hashCode() {
int hash = "ConditionalBinaryProcedure".hashCode();
if (null != ifPred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= ifPred.hashCode();
}
if (null != thenProc) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= thenProc.hashCode();
}
if (null != elseProc) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= elseProc.hashCode();
}
return hash;
svn commit: r1166383 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
Author: simonetripodi
Date: Wed Sep 7 20:21:04 2011
New Revision: 1166383
URL: http://svn.apache.org/viewvc?rev=1166383&view=rev
Log:
fixed checkstyle violations: '4' is a magic number.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java?rev=1166383&r1=1166382&r2=1166383&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryPredicate.java
Wed Sep 7 20:21:04 2011
@@ -45,6 +45,9 @@ public final class ConditionalBinaryPred
* serialVersionUID declaration.
*/
private static final long serialVersionUID = -4511946801764080748L;
+
+/** Base hash integer used to shift hash */
+private static final int HASH_SHIFT = 4;
// attributes
//
private final BinaryPredicate ifPred;
@@ -104,15 +107,15 @@ public final class ConditionalBinaryPred
public int hashCode() {
int hash = "ConditionalBinaryPredicate".hashCode();
if (null != ifPred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= ifPred.hashCode();
}
if (null != thenPred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= thenPred.hashCode();
}
if (null != elsePred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= elsePred.hashCode();
}
return hash;
svn commit: r1166381 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
Author: simonetripodi
Date: Wed Sep 7 20:19:48 2011
New Revision: 1166381
URL: http://svn.apache.org/viewvc?rev=1166381&view=rev
Log:
fixed checkstyle violations: '4' is a magic number.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java?rev=1166381&r1=1166380&r2=1166381&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/ConditionalBinaryFunction.java
Wed Sep 7 20:19:48 2011
@@ -46,6 +46,9 @@ public final class ConditionalBinaryFunc
* serialVersionUID declaration.
*/
private static final long serialVersionUID = -994698971284481482L;
+
+/** Base hash integer used to shift hash */
+private static final int HASH_SHIFT = 4;
// attributes
//
private final BinaryPredicate ifPred;
@@ -113,15 +116,15 @@ public final class ConditionalBinaryFunc
public int hashCode() {
int hash = "ConditionalBinaryFunction".hashCode();
if (null != ifPred) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= ifPred.hashCode();
}
if (null != thenFunc) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= thenFunc.hashCode();
}
if (null != elseFunc) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= elseFunc.hashCode();
}
return hash;
svn commit: r1166380 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Conditional.java
Author: simonetripodi
Date: Wed Sep 7 20:18:14 2011
New Revision: 1166380
URL: http://svn.apache.org/viewvc?rev=1166380&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Conditional.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Conditional.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Conditional.java?rev=1166380&r1=1166379&r2=1166380&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Conditional.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Conditional.java
Wed Sep 7 20:18:14 2011
@@ -54,7 +54,7 @@ public final class Conditional {
* @param r then
* @return Procedure
*/
-public static final Procedure procedure(Predicate q, Procedure r) {
+public static Procedure procedure(Predicate q, Procedure r) {
return new ConditionalProcedure(q, r);
}
@@ -65,7 +65,7 @@ public final class Conditional {
* @param s else
* @return Procedure
*/
-public static final Procedure procedure(Predicate q, Procedure r,
Procedure s) {
+public static Procedure procedure(Predicate q, Procedure r, Procedure s) {
return new ConditionalProcedure(q, r, s);
}
@@ -76,7 +76,7 @@ public final class Conditional {
* @param s else
* @return Function
*/
-public static final Function function(Predicate q, Function r, Function s) {
+public static Function function(Predicate q, Function
r, Function s) {
return new ConditionalFunction(q, r, s);
}
@@ -87,7 +87,7 @@ public final class Conditional {
* @param s else
* @return Predicate
*/
-public static final Predicate predicate(Predicate q, Predicate r,
Predicate s) {
+public static Predicate predicate(Predicate q, Predicate r, Predicate s) {
return new ConditionalPredicate(q, r, s);
}
@@ -97,7 +97,7 @@ public final class Conditional {
* @param r then
* @return UnaryProcedure
*/
-public static final UnaryProcedure procedure(UnaryPredicate q, UnaryProcedure r) {
+public static UnaryProcedure procedure(UnaryPredicate q,
UnaryProcedure r) {
return new ConditionalUnaryProcedure(q, r);
}
@@ -108,7 +108,7 @@ public final class Conditional {
* @param s else
* @return UnaryProcedure
*/
-public static final UnaryProcedure procedure(UnaryPredicate q, UnaryProcedure r,
+public static UnaryProcedure procedure(UnaryPredicate q,
UnaryProcedure r,
UnaryProcedure s) {
return new ConditionalUnaryProcedure(q, r, s);
}
@@ -120,7 +120,7 @@ public final class Conditional {
* @param s else
* @return UnaryFunction
*/
-public static final UnaryFunction function(UnaryPredicate q,
+public static UnaryFunction function(UnaryPredicate q,
UnaryFunction r, UnaryFunction s) {
return new ConditionalUnaryFunction(q, r, s);
}
@@ -132,7 +132,7 @@ public final class Conditional {
* @param s else
* @return UnaryPredicate
*/
-public static final UnaryPredicate predicate(UnaryPredicate q, UnaryPredicate r,
+public static UnaryPredicate predicate(UnaryPredicate q,
UnaryPredicate r,
UnaryPredicate s) {
return new ConditionalUnaryPredicate(q, r, s);
}
@@ -143,7 +143,7 @@ public final class Conditional {
* @param r then
* @return BinaryProcedure
*/
-public static final BinaryProcedure
procedure(BinaryPredicate q,
+public static BinaryProcedure procedure(BinaryPredicate q,
BinaryProcedure r) {
return new ConditionalBinaryProcedure(q, r);
}
@@ -155,7 +155,7 @@ public final class Conditional {
* @param s else
* @return BinaryProcedure
*/
-public static final BinaryProcedure
procedure(BinaryPredicate q,
+public static BinaryProcedure procedure(BinaryPredicate q,
BinaryProcedure r, BinaryProcedure s) {
return new ConditionalBinaryProcedure(q, r, s);
}
@@ -167,7 +167,7 @@ public final class Conditional {
* @param s else
* @return BinaryFunction
*/
-public static final BinaryFunction
function(BinaryPredicate q,
+public static BinaryFunction function(BinaryPredicate q,
BinaryFunction r,
BinaryFunction s) {
return new ConditionalBinaryFunction(q, r, s);
}
@@ -179,7 +179,7 @@ public final class Conditional {
* @param s else
* @return BinaryPredicate
*/
-public static final BinaryPredicate
predicate(BinaryPredicate q,
+public static Binar
svn commit: r1166378 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
Author: simonetripodi
Date: Wed Sep 7 20:17:16 2011
New Revision: 1166378
URL: http://svn.apache.org/viewvc?rev=1166378&view=rev
Log:
fixed checkstyle violations:
Unclosed HTML tag found: new CompositeUnaryFunction(f).of(g)
Extra HTML tag found:
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java?rev=1166378&r1=1166377&r2=1166378&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryProcedure.java
Wed Sep 7 20:17:16 2011
@@ -28,7 +28,7 @@ import org.apache.commons.functor.adapte
* {@link UnaryFunction UnaryFunctions},
* "chaining" the output of one to the input
* of another. For example,
- * new CompositeUnaryProcedure(p).of(f)
+ * new CompositeUnaryProcedure(p).of(f)
* {@link #run runs} to
* p.run(f.evaluate(obj)), and
* new CompositeUnaryProcedure(p).of(f).of(g)
svn commit: r1166375 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
Author: simonetripodi
Date: Wed Sep 7 20:13:25 2011
New Revision: 1166375
URL: http://svn.apache.org/viewvc?rev=1166375&view=rev
Log:
fixed checkstyle violations:
Unclosed HTML tag found: new CompositeUnaryFunction(f).of(g)
Extra HTML tag found:
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java?rev=1166375&r1=1166374&r2=1166375&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryPredicate.java
Wed Sep 7 20:13:25 2011
@@ -28,7 +28,7 @@ import org.apache.commons.functor.adapte
* {@link UnaryFunction UnaryFunctions},
* "chaining" the output of one to the input
* of another. For example,
- * new CompositeUnaryPredicate(p).of(f)
+ * new CompositeUnaryPredicate(p).of(f)
* {@link #test tests} to
* p.test(f.evaluate(obj)), and
* new CompositeUnaryPredicate(p).of(f).of(g)
svn commit: r1166374 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Author: simonetripodi Date: Wed Sep 7 20:11:41 2011 New Revision: 1166374 URL: http://svn.apache.org/viewvc?rev=1166374&view=rev Log: fixed checkstyle violations: '4' is a magic number. Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java?rev=1166374&r1=1166373&r2=1166374&view=diff == --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java Wed Sep 7 20:11:41 2011 @@ -55,6 +55,9 @@ public class CompositeUnaryFunction argument type @@ -182,7 +185,7 @@ public class CompositeUnaryFunction
svn commit: r1166373 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Author: simonetripodi
Date: Wed Sep 7 20:10:26 2011
New Revision: 1166373
URL: http://svn.apache.org/viewvc?rev=1166373&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java?rev=1166373&r1=1166372&r2=1166373&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Wed Sep 7 20:10:26 2011
@@ -142,7 +142,7 @@ public class CompositeUnaryFunction
*/
-public CompositeUnaryFunction of(UnaryFunction preceding) {
+public final CompositeUnaryFunction of(UnaryFunction preceding) {
if (preceding == null) {
throw new IllegalArgumentException("preceding function was null");
}
@@ -162,7 +162,7 @@ public class CompositeUnaryFunction &&
equals((CompositeUnaryFunction) that));
}
@@ -172,7 +172,7 @@ public class CompositeUnaryFunction that) {
+public final boolean equals(CompositeUnaryFunction that) {
// by construction, list is never null
return null != that && function.equals(that.function);
}
@@ -180,7 +180,7 @@ public class CompositeUnaryFunction";
}
svn commit: r1166371 - /commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
Author: ggregory
Date: Wed Sep 7 20:09:25 2011
New Revision: 1166371
URL: http://svn.apache.org/viewvc?rev=1166371&view=rev
Log:
Remove dead space.
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java?rev=1166371&r1=1166370&r2=1166371&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/ClassUtils.java
Wed Sep 7 20:09:25 2011
@@ -855,7 +855,7 @@ public class ClassUtils {
public static Class getClass(String className, boolean initialize)
throws ClassNotFoundException {
ClassLoader contextCL = Thread.currentThread().getContextClassLoader();
ClassLoader loader = contextCL == null ?
ClassUtils.class.getClassLoader() : contextCL;
-return getClass(loader, className, initialize );
+return getClass(loader, className, initialize);
}
// Public method
svn commit: r1166369 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Author: simonetripodi
Date: Wed Sep 7 20:08:46 2011
New Revision: 1166369
URL: http://svn.apache.org/viewvc?rev=1166369&view=rev
Log:
fixed checkstyle violations:
Unclosed HTML tag found: new CompositeUnaryFunction(f).of(g)
Extra HTML tag found:
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java?rev=1166369&r1=1166368&r2=1166369&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/CompositeUnaryFunction.java
Wed Sep 7 20:08:46 2011
@@ -26,7 +26,7 @@ import org.apache.commons.functor.UnaryF
* {@link UnaryFunction UnaryFunctions},
* "chaining" the output of one to the input
* of another. For example,
- * new CompositeUnaryFunction(f).of(g)
+ * new CompositeUnaryFunction(f).of(g)
* {@link #evaluate evaluates} to
* f.evaluate(g.evaluate(obj)), and
* new CompositeUnaryFunction(f).of(g).of(h)
svn commit: r1166365 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java
Author: simonetripodi
Date: Wed Sep 7 20:06:50 2011
New Revision: 1166365
URL: http://svn.apache.org/viewvc?rev=1166365&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java?rev=1166365&r1=1166364&r2=1166365&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/Composite.java
Wed Sep 7 20:06:50 2011
@@ -45,7 +45,7 @@ public final class Composite {
* @param procedure UnaryProcedure to execute against output of
f
* @return CompositeUnaryProcedure
*/
-public static final CompositeUnaryProcedure
procedure(UnaryProcedure procedure) {
+public static CompositeUnaryProcedure procedure(UnaryProcedure procedure) {
return new CompositeUnaryProcedure(procedure);
}
@@ -55,7 +55,7 @@ public final class Composite {
* @param function UnaryFunction to apply
* @return CompositeUnaryProcedure
*/
-public static final CompositeUnaryProcedure
procedure(UnaryProcedure procedure,
+public static CompositeUnaryProcedure procedure(UnaryProcedure procedure,
UnaryFunction function) {
return new CompositeUnaryProcedure(procedure).of(function);
}
@@ -65,7 +65,7 @@ public final class Composite {
* @param pred UnaryPredicate to test the output of f
* @return CompositeUnaryPredicate
*/
-public static final CompositeUnaryPredicate
predicate(UnaryPredicate pred) {
+public static CompositeUnaryPredicate predicate(UnaryPredicate pred) {
return new CompositeUnaryPredicate(pred);
}
@@ -75,7 +75,7 @@ public final class Composite {
* @param function UnaryFunction to apply
* @return CompositeUnaryPredicate
*/
-public static final CompositeUnaryPredicate
predicate(UnaryPredicate predicate,
+public static CompositeUnaryPredicate predicate(UnaryPredicate predicate,
UnaryFunction function) {
return new CompositeUnaryPredicate(predicate).of(function);
}
@@ -87,7 +87,7 @@ public final class Composite {
* @param h right UnaryFunction
* @return BinaryPredicate
*/
-public static final UnaryCompositeBinaryPredicate
predicate(
+public static UnaryCompositeBinaryPredicate predicate(
BinaryPredicate p, UnaryFunction g,
UnaryFunction h) {
return new UnaryCompositeBinaryPredicate(p, g, h);
@@ -98,7 +98,7 @@ public final class Composite {
* @param f UnaryFunction to apply to the output of g
* @return UnaryFunction
*/
-public static final CompositeUnaryFunction
function(UnaryFunction f) {
+public static CompositeUnaryFunction function(UnaryFunction f) {
return new CompositeUnaryFunction(f);
}
@@ -108,7 +108,7 @@ public final class Composite {
* @param g UnaryFunction to apply first
* @return UnaryFunction
*/
-public static final CompositeUnaryFunction
function(UnaryFunction f,
+public static CompositeUnaryFunction
function(UnaryFunction f,
UnaryFunction g) {
return new CompositeUnaryFunction(f).of(g);
}
@@ -123,7 +123,7 @@ public final class Composite {
// * @param g BinaryFunction to apply first
// * @return BinaryFunction
// */
-//public static final BinaryFunction
function(UnaryFunction f,
+//public static BinaryFunction
function(UnaryFunction f,
// BinaryFunction g) {
//return new CompositeUnaryFunction(f).of(g);
@@ -136,7 +136,7 @@ public final class Composite {
* @param h right UnaryFunction
* @return BinaryFunction
*/
-public static final UnaryCompositeBinaryFunction
function(
+public static UnaryCompositeBinaryFunction
function(
BinaryFunction f,
UnaryFunction g,
UnaryFunction h) {
return new UnaryCompositeBinaryFunction(f, g, h);
@@ -149,7 +149,7 @@ public final class Composite {
* @param h right BinaryFunction
* @return BinaryFunction
*/
-public static final BinaryCompositeBinaryFunction
function(
+public static BinaryCompositeBinaryFunction
function(
BinaryFunction f,
BinaryFunction g,
BinaryFunction h) {
return new BinaryCompositeBinaryFunction(f, g, h);
svn commit: r1166363 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
Author: simonetripodi
Date: Wed Sep 7 20:05:43 2011
New Revision: 1166363
URL: http://svn.apache.org/viewvc?rev=1166363&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java?rev=1166363&r1=1166362&r2=1166363&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinarySequence.java
Wed Sep 7 20:05:43 2011
@@ -93,7 +93,7 @@ public class BinarySequence implem
* @param p BinaryProcedure to add
* @return this
*/
-public BinarySequence then(BinaryProcedure p) {
+public final BinarySequence then(BinaryProcedure p) {
list.add(p);
return this;
}
@@ -103,7 +103,7 @@ public class BinarySequence implem
/**
* {@inheritDoc}
*/
-public void run(L left, R right) {
+public final void run(L left, R right) {
for (Iterator> iter =
list.iterator(); iter.hasNext();) {
iter.next().run(left, right);
}
@@ -112,7 +112,7 @@ public class BinarySequence implem
/**
* {@inheritDoc}
*/
-public boolean equals(Object that) {
+public final boolean equals(Object that) {
return that == this || (that instanceof BinarySequence &&
equals((BinarySequence) that));
}
@@ -121,7 +121,7 @@ public class BinarySequence implem
* @param that BinarySequence to test
* @return boolean
*/
-public boolean equals(BinarySequence that) {
+public final boolean equals(BinarySequence that) {
// by construction, list is never null
return null != that && list.equals(that.list);
}
@@ -129,7 +129,7 @@ public class BinarySequence implem
/**
* {@inheritDoc}
*/
-public int hashCode() {
+public final int hashCode() {
// by construction, list is never null
return "BinarySequence".hashCode() ^ list.hashCode();
}
@@ -137,7 +137,7 @@ public class BinarySequence implem
/**
* {@inheritDoc}
*/
-public String toString() {
+public final String toString() {
return "BinarySequence<" + list + ">";
}
svn commit: r1166361 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Author: simonetripodi
Date: Wed Sep 7 20:04:20 2011
New Revision: 1166361
URL: http://svn.apache.org/viewvc?rev=1166361&view=rev
Log:
fixed checkstyle violations: '4' is a magic number.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java?rev=1166361&r1=1166360&r2=1166361&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Wed Sep 7 20:04:20 2011
@@ -43,6 +43,9 @@ public class BinaryCompositeBinaryFuncti
*/
private static final long serialVersionUID = 2570517284319064043L;
+/** Base hash integer used to shift hash */
+private static final int HASH_SHIFT = 4;
+
/**
* Type-remembering Helper
*
@@ -132,11 +135,11 @@ public class BinaryCompositeBinaryFuncti
*/
public int hashCode() {
int hash = "BinaryCompositeBinaryFunction".hashCode();
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= helper.f.hashCode();
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= helper.g.hashCode();
-hash <<= 4;
+hash <<= HASH_SHIFT;
hash ^= helper.h.hashCode();
return hash;
}
svn commit: r1166360 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Author: simonetripodi
Date: Wed Sep 7 20:03:12 2011
New Revision: 1166360
URL: http://svn.apache.org/viewvc?rev=1166360&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java?rev=1166360&r1=1166359&r2=1166360&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/BinaryCompositeBinaryFunction.java
Wed Sep 7 20:03:12 2011
@@ -103,14 +103,14 @@ public class BinaryCompositeBinaryFuncti
/**
* {@inheritDoc}
*/
-public T evaluate(L left, R right) {
+public final T evaluate(L left, R right) {
return helper.evaluate(left, right);
}
/**
* {@inheritDoc}
*/
-public boolean equals(Object that) {
+public final boolean equals(Object that) {
return that == this || (that instanceof
BinaryCompositeBinaryFunction
&&
equals((BinaryCompositeBinaryFunction) that));
}
@@ -120,7 +120,7 @@ public class BinaryCompositeBinaryFuncti
* @param that BinaryCompositeBinaryFunction to test
* @return boolean
*/
-public boolean equals(BinaryCompositeBinaryFunction that) {
+public final boolean equals(BinaryCompositeBinaryFunction that) {
return null != that
&& helper.f.equals(that.helper.f)
&& helper.g.equals(that.helper.g)
@@ -144,7 +144,7 @@ public class BinaryCompositeBinaryFuncti
/**
* {@inheritDoc}
*/
-public String toString() {
+public final String toString() {
return "BinaryCompositeBinaryFunction<" + helper.f + ";" + helper.g +
";" + helper.h + ">";
}
svn commit: r1166359 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
Author: simonetripodi
Date: Wed Sep 7 20:00:46 2011
New Revision: 1166359
URL: http://svn.apache.org/viewvc?rev=1166359&view=rev
Log:
fixed checkstyle violations: '4' is a magic number.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java?rev=1166359&r1=1166358&r2=1166359&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
Wed Sep 7 20:00:46 2011
@@ -34,6 +34,10 @@ public abstract class AbstractLoopProced
* serialVersionUID declaration.
*/
private static final long serialVersionUID = -5903381842630236070L;
+
+/** Base hash integer used to shift hash */
+private static final int HASH_SHIFT = 4;
+
private final Predicate condition;
private final Procedure action;
@@ -82,11 +86,11 @@ public abstract class AbstractLoopProced
* @return int
*/
protected int hashCode(int hash) {
-hash <<= 4;
+hash <<= HASH_SHIFT;
if (null != getAction()) {
hash ^= getAction().hashCode();
}
-hash <<= 4;
+hash <<= HASH_SHIFT;
if (null != getCondition()) {
hash ^= getCondition().hashCode();
}
svn commit: r1166358 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
Author: simonetripodi
Date: Wed Sep 7 19:58:47 2011
New Revision: 1166358
URL: http://svn.apache.org/viewvc?rev=1166358&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java?rev=1166358&r1=1166357&r2=1166358&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/composite/AbstractLoopProcedure.java
Wed Sep 7 19:58:47 2011
@@ -50,7 +50,7 @@ public abstract class AbstractLoopProced
/**
* {@inheritDoc}
*/
-public boolean equals(Object object) {
+public final boolean equals(Object object) {
if (object == this) {
return true;
}
@@ -65,7 +65,7 @@ public abstract class AbstractLoopProced
/**
* {@inheritDoc}
*/
-public int hashCode() {
+public final int hashCode() {
return hashCode("AbstractLoopProcedure".hashCode());
}
@@ -97,7 +97,7 @@ public abstract class AbstractLoopProced
* Get the condition.
* @return Predicate
*/
-protected Predicate getCondition() {
+protected final Predicate getCondition() {
return condition;
}
@@ -105,7 +105,7 @@ public abstract class AbstractLoopProced
* Get the action.
* @return Procedure
*/
-protected Procedure getAction() {
+protected final Procedure getAction() {
return action;
}
svn commit: r1166355 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java
Author: simonetripodi
Date: Wed Sep 7 19:54:29 2011
New Revision: 1166355
URL: http://svn.apache.org/viewvc?rev=1166355&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java?rev=1166355&r1=1166354&r2=1166355&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Min.java
Wed Sep 7 19:54:29 2011
@@ -113,7 +113,7 @@ public final class Min implements Bin
* @param right the right side argument of the Min function
* @return UnaryFunction
*/
-public static final > UnaryFunction
instance(T right) {
+public static > UnaryFunction instance(T
right) {
return RightBoundFunction.bind(new Min(), right);
}
svn commit: r1166353 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java
Author: simonetripodi
Date: Wed Sep 7 19:53:49 2011
New Revision: 1166353
URL: http://svn.apache.org/viewvc?rev=1166353&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java?rev=1166353&r1=1166352&r2=1166353&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/Max.java
Wed Sep 7 19:53:49 2011
@@ -113,7 +113,7 @@ public final class Max implements Bin
* @param right the right side argument of the Max function
* @return UnaryFunction
*/
-public static final > UnaryFunction
instance(T right) {
+public static > UnaryFunction instance(T
right) {
return RightBoundFunction.bind(new Max(), right);
}
svn commit: r1166351 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
Author: simonetripodi Date: Wed Sep 7 19:52:49 2011 New Revision: 1166351 URL: http://svn.apache.org/viewvc?rev=1166351&view=rev Log: fixed checkstyle violations: '29' is a magic number. Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java?rev=1166351&r1=1166350&r2=1166351&view=diff == --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java Wed Sep 7 19:52:49 2011 @@ -37,6 +37,9 @@ public class IsWithinRange
svn commit: r1166350 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
Author: simonetripodi
Date: Wed Sep 7 19:51:23 2011
New Revision: 1166350
URL: http://svn.apache.org/viewvc?rev=1166350&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java?rev=1166350&r1=1166349&r2=1166350&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
Wed Sep 7 19:51:23 2011
@@ -75,14 +75,14 @@ public class IsWithinRange= 0 && o.compareTo(max) <= 0;
}
/**
* {@inheritDoc}
*/
-public boolean equals(Object o) {
+public final boolean equals(Object o) {
if (this == o) {
return true;
}
@@ -96,14 +96,14 @@ public class IsWithinRange
svn commit: r1166348 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java
Author: simonetripodi Date: Wed Sep 7 19:49:55 2011 New Revision: 1166348 URL: http://svn.apache.org/viewvc?rev=1166348&view=rev Log: fixed checkstyle violations: Name 'nameHashCode' must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'. Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java Modified: commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java URL: http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java?rev=1166348&r1=1166347&r2=1166348&view=diff == --- commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java (original) +++ commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsWithinRange.java Wed Sep 7 19:49:55 2011 @@ -35,7 +35,7 @@ public class IsWithinRange
svn commit: r1166347 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
Author: simonetripodi
Date: Wed Sep 7 19:48:35 2011
New Revision: 1166347
URL: http://svn.apache.org/viewvc?rev=1166347&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java?rev=1166347&r1=1166346&r2=1166347&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsNotEquivalent.java
Wed Sep 7 19:48:35 2011
@@ -127,7 +127,7 @@ public final class IsNotEquivalent im
* @return IsNotEquivalent
*/
@SuppressWarnings("unchecked")
-public static final > IsNotEquivalent
instance() {
+public static > IsNotEquivalent instance() {
return new IsNotEquivalent(ComparableComparator.INSTANCE);
}
@@ -136,7 +136,7 @@ public final class IsNotEquivalent im
* @param right Comparable against which UnaryPredicate arguments will be
compared.
* @return UnaryPredicate
*/
-public static final > UnaryPredicate instance(T
right) {
+public static > UnaryPredicate instance(T
right) {
return RightBoundPredicate.bind(instance(), right);
}
svn commit: r1166346 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
Author: simonetripodi
Date: Wed Sep 7 19:48:07 2011
New Revision: 1166346
URL: http://svn.apache.org/viewvc?rev=1166346&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java?rev=1166346&r1=1166345&r2=1166346&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThanOrEqual.java
Wed Sep 7 19:48:07 2011
@@ -125,7 +125,7 @@ public final class IsLessThanOrEqual
* @param
* @return IsLessThanOrEqual
*/
-public static final > IsLessThanOrEqual
instance() {
+public static > IsLessThanOrEqual instance() {
return new IsLessThanOrEqual();
}
@@ -134,7 +134,7 @@ public final class IsLessThanOrEqual
* @param right the right side object of the comparison.
* @return UnaryPredicate
*/
-public static final > UnaryPredicate instance(T
right) {
+public static > UnaryPredicate instance(T
right) {
return RightBoundPredicate.bind(new IsLessThanOrEqual(), right);
}
svn commit: r1166345 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
Author: simonetripodi
Date: Wed Sep 7 19:47:15 2011
New Revision: 1166345
URL: http://svn.apache.org/viewvc?rev=1166345&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java?rev=1166345&r1=1166344&r2=1166345&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsLessThan.java
Wed Sep 7 19:47:15 2011
@@ -125,7 +125,7 @@ public final class IsLessThan impleme
* @param
* @return IsLessThan
*/
-public static final > IsLessThan instance() {
+public static > IsLessThan instance() {
return new IsLessThan();
}
@@ -134,7 +134,7 @@ public final class IsLessThan impleme
* @param right the right side object of the comparison.
* @return UnaryPredicate
*/
-public static final > UnaryPredicate instance(T
right) {
+public static > UnaryPredicate instance(T
right) {
return RightBoundPredicate.bind(new IsLessThan(), right);
}
svn commit: r1166344 - in /commons/proper/configuration/trunk: build.xml pom.xml
Author: oheger Date: Wed Sep 7 19:46:04 2011 New Revision: 1166344 URL: http://svn.apache.org/viewvc?rev=1166344&view=rev Log: Updated version number to next snapshot version. Modified: commons/proper/configuration/trunk/build.xml commons/proper/configuration/trunk/pom.xml Modified: commons/proper/configuration/trunk/build.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/build.xml?rev=1166344&r1=1166343&r2=1166344&view=diff == --- commons/proper/configuration/trunk/build.xml (original) +++ commons/proper/configuration/trunk/build.xml Wed Sep 7 19:46:04 2011 @@ -22,7 +22,7 @@ - + Modified: commons/proper/configuration/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/pom.xml?rev=1166344&r1=1166343&r2=1166344&view=diff == --- commons/proper/configuration/trunk/pom.xml (original) +++ commons/proper/configuration/trunk/pom.xml Wed Sep 7 19:46:04 2011 @@ -30,7 +30,7 @@ 4.0.0 commons-configuration commons-configuration - 1.7-SNAPSHOT + 1.8-SNAPSHOT Commons Configuration 2001
svn commit: r1166343 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
Author: simonetripodi
Date: Wed Sep 7 19:45:53 2011
New Revision: 1166343
URL: http://svn.apache.org/viewvc?rev=1166343&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java?rev=1166343&r1=1166342&r2=1166343&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThanOrEqual.java
Wed Sep 7 19:45:53 2011
@@ -126,7 +126,7 @@ public final class IsGreaterThanOrEqual<
* @param
* @return IsGreaterThanOrEqual
*/
-public static final > IsGreaterThanOrEqual
instance() {
+public static > IsGreaterThanOrEqual instance()
{
return new IsGreaterThanOrEqual();
}
@@ -135,7 +135,7 @@ public final class IsGreaterThanOrEqual<
* @param right the right side object of the IsGreaterThanOrEqual
comparison
* @return UnaryPredicate
*/
-public static final > UnaryPredicate instance(T
right) {
+public static > UnaryPredicate instance(T
right) {
return RightBoundPredicate.bind(new IsGreaterThanOrEqual(), right);
}
svn commit: r1166342 - /commons/proper/configuration/trunk/src/changes/changes.xml
Author: oheger Date: Wed Sep 7 19:45:28 2011 New Revision: 1166342 URL: http://svn.apache.org/viewvc?rev=1166342&view=rev Log: Updated changes report, added release date. Modified: commons/proper/configuration/trunk/src/changes/changes.xml Modified: commons/proper/configuration/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/changes/changes.xml?rev=1166342&r1=1166341&r2=1166342&view=diff == --- commons/proper/configuration/trunk/src/changes/changes.xml (original) +++ commons/proper/configuration/trunk/src/changes/changes.xml Wed Sep 7 19:45:28 2011 @@ -22,7 +22,8 @@ - + Reloading now also works for configuration sources declared in the additional section of a configuration definition file for
svn commit: r1166341 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
Author: simonetripodi
Date: Wed Sep 7 19:45:19 2011
New Revision: 1166341
URL: http://svn.apache.org/viewvc?rev=1166341&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java?rev=1166341&r1=1166340&r2=1166341&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsGreaterThan.java
Wed Sep 7 19:45:19 2011
@@ -125,7 +125,7 @@ public final class IsGreaterThan impl
* @param
* @return IsGreaterThan
*/
-public static final > IsGreaterThan instance() {
+public static > IsGreaterThan instance() {
return new IsGreaterThan();
}
@@ -134,7 +134,7 @@ public final class IsGreaterThan impl
* @param right the right side object of the IsGreaterThan comparison
* @return UnaryPredicate
*/
-public static final > UnaryPredicate instance(T
right) {
+public static > UnaryPredicate instance(T
right) {
return RightBoundPredicate.bind(new IsGreaterThan(), right);
}
svn commit: r1166340 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
Author: simonetripodi
Date: Wed Sep 7 19:44:28 2011
New Revision: 1166340
URL: http://svn.apache.org/viewvc?rev=1166340&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java?rev=1166340&r1=1166339&r2=1166340&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/IsEquivalent.java
Wed Sep 7 19:44:28 2011
@@ -128,7 +128,7 @@ public final class IsEquivalent imple
* @return IsEquivalent
*/
@SuppressWarnings("unchecked")
-public static final > IsEquivalent instance() {
+public static > IsEquivalent instance() {
return new IsEquivalent(ComparableComparator.INSTANCE);
}
@@ -137,7 +137,7 @@ public final class IsEquivalent imple
* @param right argument
* @return UnaryPredicate
*/
-public static final > UnaryPredicate instance(T
right) {
+public static > UnaryPredicate instance(T
right) {
return RightBoundPredicate.bind(instance(), right);
}
svn commit: r1166339 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
Author: simonetripodi
Date: Wed Sep 7 19:43:47 2011
New Revision: 1166339
URL: http://svn.apache.org/viewvc?rev=1166339&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java?rev=1166339&r1=1166338&r2=1166339&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
Wed Sep 7 19:43:47 2011
@@ -75,7 +75,7 @@ final class ComparableComparator impleme
* Get a ComparableComparator instance.
* @return ComparableComparator
*/
-public static final ComparableComparator instance() {
+public static ComparableComparator instance() {
return INSTANCE;
}
svn commit: r1166336 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
Author: simonetripodi
Date: Wed Sep 7 19:43:12 2011
New Revision: 1166336
URL: http://svn.apache.org/viewvc?rev=1166336&view=rev
Log:
fixed checkstyle violations: First sentence should end with a period.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java?rev=1166336&r1=1166335&r2=1166336&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/comparator/ComparableComparator.java
Wed Sep 7 19:43:12 2011
@@ -29,7 +29,7 @@ import java.util.Comparator;
@SuppressWarnings({ "unchecked", "rawtypes" })
final class ComparableComparator implements Comparator, Serializable {
-/** Singleton */
+/** Singleton. */
public static final ComparableComparator INSTANCE = new
ComparableComparator();
/**
svn commit: r1166334 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java
Author: simonetripodi
Date: Wed Sep 7 19:37:49 2011
New Revision: 1166334
URL: http://svn.apache.org/viewvc?rev=1166334&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java?rev=1166334&r1=1166333&r2=1166334&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/Size.java
Wed Sep 7 19:37:49 2011
@@ -87,7 +87,7 @@ public final class Size implements Un
* Get a Size instance.
* @return Size
*/
-public static final Size instance() {
+public static Size instance() {
return INSTANCE;
}
svn commit: r1166333 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
Author: simonetripodi
Date: Wed Sep 7 19:36:42 2011
New Revision: 1166333
URL: http://svn.apache.org/viewvc?rev=1166333&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java?rev=1166333&r1=1166332&r2=1166333&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/collection/IsEmpty.java
Wed Sep 7 19:36:42 2011
@@ -137,7 +137,7 @@ public final class IsEmpty implements
* Get an IsEmpty instance.
* @return IsEmpty
*/
-public static final IsEmpty instance() {
+public static IsEmpty instance() {
return new IsEmpty();
}
svn commit: r1166331 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/WhileDo.java
Author: simonetripodi
Date: Wed Sep 7 19:34:39 2011
New Revision: 1166331
URL: http://svn.apache.org/viewvc?rev=1166331&view=rev
Log:
fixed checkstyle violations: Method 'run' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/WhileDo.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/WhileDo.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/WhileDo.java?rev=1166331&r1=1166330&r2=1166331&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/WhileDo.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/WhileDo.java
Wed Sep 7 19:34:39 2011
@@ -43,7 +43,7 @@ public class WhileDo extends PredicatedL
/**
* {@inheritDoc}
*/
-public void run() {
+public final void run() {
while (getTest().test()) {
getBody().run();
}
svn commit: r1166329 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/UntilDo.java
Author: simonetripodi
Date: Wed Sep 7 19:33:48 2011
New Revision: 1166329
URL: http://svn.apache.org/viewvc?rev=1166329&view=rev
Log:
fixed checkstyle violations: Method 'run' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/UntilDo.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/UntilDo.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/UntilDo.java?rev=1166329&r1=1166328&r2=1166329&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/UntilDo.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/UntilDo.java
Wed Sep 7 19:33:48 2011
@@ -43,7 +43,7 @@ public class UntilDo extends PredicatedL
/**
* {@inheritDoc}
*/
-public void run() {
+public final void run() {
while (!getTest().test()) {
getBody().run();
}
svn commit: r1166328 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
Author: simonetripodi
Date: Wed Sep 7 19:32:26 2011
New Revision: 1166328
URL: http://svn.apache.org/viewvc?rev=1166328&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java?rev=1166328&r1=1166327&r2=1166328&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RetainMatching.java
Wed Sep 7 19:32:26 2011
@@ -66,7 +66,7 @@ public final class RetainMatching
* Get a static {@link RetainMatching} instance.
* @return {@link RetainMatching}
*/
-public static final RetainMatching instance() {
+public static RetainMatching instance() {
return INSTANCE;
}
}
svn commit: r1166325 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
Author: simonetripodi
Date: Wed Sep 7 19:29:00 2011
New Revision: 1166325
URL: http://svn.apache.org/viewvc?rev=1166325&view=rev
Log:
fixed checkstyle violations: Redundant 'final' modifier.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java?rev=1166325&r1=1166324&r2=1166325&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RemoveMatching.java
Wed Sep 7 19:29:00 2011
@@ -66,7 +66,7 @@ public final class RemoveMatching
* Get a static {@link RemoveMatching} instance.
* @return {@link RemoveMatching}
*/
-public static final RemoveMatching instance() {
+public static RemoveMatching instance() {
return INSTANCE;
}
svn commit: r1166324 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
Author: simonetripodi
Date: Wed Sep 7 19:23:00 2011
New Revision: 1166324
URL: http://svn.apache.org/viewvc?rev=1166324&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java?rev=1166324&r1=1166323&r2=1166324&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/RecursiveEvaluation.java
Wed Sep 7 19:23:00 2011
@@ -62,7 +62,7 @@ public class RecursiveEvaluation impleme
/**
* {@inheritDoc}
*/
-public Object evaluate() {
+public final Object evaluate() {
Object result = null;
// if the function returns another function, execute it. stop executing
// when the result is not of the expected type.
@@ -81,7 +81,7 @@ public class RecursiveEvaluation impleme
/**
* {@inheritDoc}
*/
-public boolean equals(Object obj) {
+public final boolean equals(Object obj) {
if (obj == this) {
return true;
}
@@ -94,7 +94,7 @@ public class RecursiveEvaluation impleme
/**
* {@inheritDoc}
*/
-public int hashCode() {
+public final int hashCode() {
return "RecursiveEvaluation".hashCode() << 2 ^ function.hashCode();
}
svn commit: r1166323 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
Author: simonetripodi
Date: Wed Sep 7 19:21:39 2011
New Revision: 1166323
URL: http://svn.apache.org/viewvc?rev=1166323&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java?rev=1166323&r1=1166322&r2=1166323&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldRight.java
Wed Sep 7 19:21:39 2011
@@ -106,7 +106,7 @@ public class FoldRight implements Una
* {@inheritDoc}
* @param obj {@link Generator} to transform
*/
-public T evaluate(Generator obj) {
+public final T evaluate(Generator obj) {
FoldRightHelper helper = new FoldRightHelper(function);
obj.run(helper);
return helper.getResult();
@@ -117,7 +117,7 @@ public class FoldRight implements Una
* @param left {@link Generator} to transform
* @param right initial right-side seed object
*/
-public T evaluate(Generator left, T right) {
+public final T evaluate(Generator left, T right) {
FoldRightHelper helper = new FoldRightHelper(right, function);
left.run(helper);
return helper.getResult();
@@ -126,7 +126,7 @@ public class FoldRight implements Una
/**
* {@inheritDoc}
*/
-public boolean equals(Object obj) {
+public final boolean equals(Object obj) {
if (obj == this) {
return true;
}
@@ -139,7 +139,7 @@ public class FoldRight implements Una
/**
* {@inheritDoc}
*/
-public int hashCode() {
+public final int hashCode() {
return "FoldRight".hashCode() << 2 ^ function.hashCode();
}
svn commit: r1166322 - /commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
Author: simonetripodi
Date: Wed Sep 7 19:20:31 2011
New Revision: 1166322
URL: http://svn.apache.org/viewvc?rev=1166322&view=rev
Log:
fixed checkstyle violations: Method 'XXX' is not designed for extension - needs
to be abstract, final or empty.
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
Modified:
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java?rev=1166322&r1=1166321&r2=1166322&view=diff
==
---
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
(original)
+++
commons/sandbox/functor/trunk/src/main/java/org/apache/commons/functor/core/algorithm/FoldLeft.java
Wed Sep 7 19:20:31 2011
@@ -100,7 +100,7 @@ public class FoldLeft implements Unar
* {@inheritDoc}
* @param obj {@link Generator} to transform
*/
-public T evaluate(Generator obj) {
+public final T evaluate(Generator obj) {
FoldLeftHelper helper = new FoldLeftHelper(function);
obj.run(helper);
return helper.getResult();
@@ -111,7 +111,7 @@ public class FoldLeft implements Unar
* @param left {@link Generator} to transform
* @param right initial left-side seed object
*/
-public T evaluate(Generator left, T right) {
+public final T evaluate(Generator left, T right) {
FoldLeftHelper helper = new FoldLeftHelper(right, function);
left.run(helper);
return helper.getResult();
@@ -120,7 +120,7 @@ public class FoldLeft implements Unar
/**
* {@inheritDoc}
*/
-public boolean equals(Object obj) {
+public final boolean equals(Object obj) {
if (obj == this) {
return true;
}
@@ -133,7 +133,7 @@ public class FoldLeft implements Unar
/**
* {@inheritDoc}
*/
-public int hashCode() {
+public final int hashCode() {
return "FoldLeft".hashCode() << 2 ^ function.hashCode();
}
svn commit: r1166314 - /commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
Author: mturk
Date: Wed Sep 7 18:54:29 2011
New Revision: 1166314
URL: http://svn.apache.org/viewvc?rev=1166314&view=rev
Log:
Axe param names from function pointers
Modified:
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
Modified: commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c?rev=1166314&r1=1166313&r2=1166314&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c Wed Sep
7 18:54:29 2011
@@ -85,7 +85,7 @@ struct SSLAPIst {
BIO_METHOD* (*fpBIO_s_file)(void);
/*** BIGNUM ***/
-BIGNUM* (*fpBN_bin2bn)(const unsigned char *s, int len, BIGNUM
*ret);
+BIGNUM* (*fpBN_bin2bn)(const unsigned char *, int, BIGNUM *);
/*** CRYPTO ***/
int (*fpCRYPTO_num_locks)(void);
@@ -101,55 +101,55 @@ struct SSLAPIst {
void(*fpDH_free)(DH *dh);
/*** ENGINE ***/
-ENGINE* (*fpENGINE_by_id)(const char *id);
-int (*fpENGINE_ctrl)(ENGINE *e, int cmd, long i, void *p,
void (*f)(void));
-int (*fpENGINE_ctrl_cmd)(ENGINE *e, const char *cmd_name,
long i, void *p, void (*f)(void), int cmd_optional);
-int (*fpENGINE_ctrl_cmd_string)(ENGINE *e, const char
*cmd_name, const char *arg, int cmd_optional);
+ENGINE* (*fpENGINE_by_id)(const char *);
+int (*fpENGINE_ctrl)(ENGINE *, int, long, void *, void
(*)(void));
+int (*fpENGINE_ctrl_cmd)(ENGINE *, const char *, long,
void *, void (*)(void), int);
+int (*fpENGINE_ctrl_cmd_string)(ENGINE *, const char *,
const char *, int);
-int (*fpENGINE_free)(ENGINE *e);
+int (*fpENGINE_free)(ENGINE *);
void(*fpENGINE_load_builtin_engines)(void);
int (*fpENGINE_register_all_complete)(void);
-int (*fpENGINE_set_default)(ENGINE *e, unsigned int flags);
+int (*fpENGINE_set_default)(ENGINE *, unsigned int);
/*** ERR ***/
-void(*fpERR_error_string_n)(unsigned long e, char *buf,
size_t len);
+void(*fpERR_error_string_n)(unsigned long, char *, size_t);
unsigned long (*fpERR_get_error)(void);
void(*fpERR_load_crypto_strings)(void);
unsigned long (*fpERR_peek_error)(void);
/*** MD5 ***/
-int (*fpMD5_Final)(unsigned char *md, MD5_CTX *c);
-int (*fpMD5_Init)(MD5_CTX *c);
-int (*fpMD5_Update)(MD5_CTX *c, const void *data, size_t
len);
+int (*fpMD5_Final)(unsigned char *, MD5_CTX *);
+int (*fpMD5_Init)(MD5_CTX *);
+int (*fpMD5_Update)(MD5_CTX *, const void *, size_t);
/*** OPENSSL ***/
void(*fpOPENSSL_load_builtin_modules)(void);
/*** PEM ***/
-DH* (*fpPEM_read_bio_DHparams)(BIO *bp, DH **x,
pem_password_cb *cb, void *u);
-X509* (*fpPEM_read_bio_X509)(BIO *bp, X509 **x,
pem_password_cb *cb, void *u);
+DH* (*fpPEM_read_bio_DHparams)(BIO *, DH **,
pem_password_cb *, void *);
+X509* (*fpPEM_read_bio_X509)(BIO *, X509 **, pem_password_cb
*, void *);
/*** RAND ***/
-int (*fpRAND_egd)(const char *path);
-const char* (*fpRAND_file_name)(char *file,size_t num);
-int (*fpRAND_load_file)(const char *file,long max_bytes);
-void(*fpRAND_seed)(const void *buf,int num);
+int (*fpRAND_egd)(const char *);
+const char* (*fpRAND_file_name)(char *, size_t);
+int (*fpRAND_load_file)(const char *, long);
+void(*fpRAND_seed)(const void *, int);
int (*fpRAND_status)(void);
/*** RSA ***/
-RSA*(*fpRSA_generate_key)(int bits, unsigned long e,void
(*callback)(int,int,void *),void *cb_arg);
+RSA*(*fpRSA_generate_key)(int, unsigned long , void
(*)(int,int,void *), void *);
/*** SSL_CTX ***/
-long(*fpSSL_CTX_ctrl)(SSL_CTX *ctx,int cmd, long larg,
void *parg);
+long(*fpSSL_CTX_ctrl)(SSL_CTX *, int, long, void *);
SSL_CTX*(*fpSSL_CTX_new)(const SSL_METHOD *);
void(*fpSSL_CTX_free)(SSL_CTX *);
/*** SSL ***/
-void* (*fpSSL_get_ex_data)(const SSL *ssl,int idx);
+void* (*fpSSL_get_ex_data)(const SSL *, int);
i
svn commit: r1166310 - /commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
Author: mturk
Date: Wed Sep 7 18:47:25 2011
New Revision: 1166310
URL: http://svn.apache.org/viewvc?rev=1166310&view=rev
Log:
Fill current ssl dynamic api
Modified:
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
Modified: commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c?rev=1166310&r1=1166309&r2=1166310&view=diff
==
--- commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/modules/openssl/api.c Wed Sep
7 18:47:25 2011
@@ -76,15 +76,90 @@ struct SSLAPIst {
unsigned long (*fpSSLeay)(void);
const char* (*fpSSLeay_version)(int);
+/*** BIO ***/
+long(*fpBIO_ctrl)(BIO *, int, long, void *);
+int (*fpBIO_free)(BIO *);
+BIO*(*fpBIO_new)(BIO_METHOD *);
+BIO*(*fpBIO_new_file)(const char *, const char *);
+BIO*(*fpBIO_new_fp)(FILE *, int);
+BIO_METHOD* (*fpBIO_s_file)(void);
+
+/*** BIGNUM ***/
+BIGNUM* (*fpBN_bin2bn)(const unsigned char *s, int len, BIGNUM
*ret);
+
+/*** CRYPTO ***/
+int (*fpCRYPTO_num_locks)(void);
+void(*fpCRYPTO_set_dynlock_create_callback)(struct
CRYPTO_dynlock_value *(*)(const char *, int));
+void(*fpCRYPTO_set_dynlock_lock_callback)(void (*)(int,
struct CRYPTO_dynlock_value *, const char *, int));
+void(*fpCRYPTO_set_dynlock_destroy_callback)(void
(*)(struct CRYPTO_dynlock_value *, const char *, int));
+void(*fpCRYPTO_set_id_callback)(unsigned long (*)(void));
+void(*fpCRYPTO_set_locking_callback)(void (*)(int, int,
const char *, int));
+int (*fpCRYPTO_set_mem_functions)(void *(*)(size_t),void
*(*)(void *,size_t), void (*)(void *));
+
+/*** DH ***/
+DH* (*fpDH_new)(void);
+void(*fpDH_free)(DH *dh);
+
+/*** ENGINE ***/
+ENGINE* (*fpENGINE_by_id)(const char *id);
+int (*fpENGINE_ctrl)(ENGINE *e, int cmd, long i, void *p,
void (*f)(void));
+int (*fpENGINE_ctrl_cmd)(ENGINE *e, const char *cmd_name,
long i, void *p, void (*f)(void), int cmd_optional);
+int (*fpENGINE_ctrl_cmd_string)(ENGINE *e, const char
*cmd_name, const char *arg, int cmd_optional);
+
+int (*fpENGINE_free)(ENGINE *e);
+void(*fpENGINE_load_builtin_engines)(void);
+int (*fpENGINE_register_all_complete)(void);
+int (*fpENGINE_set_default)(ENGINE *e, unsigned int flags);
+
+/*** ERR ***/
+void(*fpERR_error_string_n)(unsigned long e, char *buf,
size_t len);
+unsigned long (*fpERR_get_error)(void);
+void(*fpERR_load_crypto_strings)(void);
+unsigned long (*fpERR_peek_error)(void);
+
+/*** MD5 ***/
+int (*fpMD5_Final)(unsigned char *md, MD5_CTX *c);
+int (*fpMD5_Init)(MD5_CTX *c);
+int (*fpMD5_Update)(MD5_CTX *c, const void *data, size_t
len);
+
+/*** OPENSSL ***/
+void(*fpOPENSSL_load_builtin_modules)(void);
+
+/*** PEM ***/
+DH* (*fpPEM_read_bio_DHparams)(BIO *bp, DH **x,
pem_password_cb *cb, void *u);
+X509* (*fpPEM_read_bio_X509)(BIO *bp, X509 **x,
pem_password_cb *cb, void *u);
+
+/*** RAND ***/
+int (*fpRAND_egd)(const char *path);
+const char* (*fpRAND_file_name)(char *file,size_t num);
+int (*fpRAND_load_file)(const char *file,long max_bytes);
+void(*fpRAND_seed)(const void *buf,int num);
+int (*fpRAND_status)(void);
+
+/*** RSA ***/
+RSA*(*fpRSA_generate_key)(int bits, unsigned long e,void
(*callback)(int,int,void *),void *cb_arg);
+
+/*** SSL_CTX ***/
+long(*fpSSL_CTX_ctrl)(SSL_CTX *ctx,int cmd, long larg,
void *parg);
SSL_CTX*(*fpSSL_CTX_new)(const SSL_METHOD *);
void(*fpSSL_CTX_free)(SSL_CTX *);
+
+/*** SSL ***/
+void* (*fpSSL_get_ex_data)(const SSL *ssl,int idx);
+int (*fpSSL_get_ex_new_index)(long, void *, CRYPTO_EX_new
*, CRYPTO_EX_dup *, CRYPTO_EX_free *);
+int (*fpSSL_library_init)(void);
+void(*fpSSL_load_error_strings)(void);
+int (*fpSSL_set_ex_data)(SSL *ssl,int idx,void *data);
+/*** X509 ***/
+void(*fpX509_free)(X509 *);
void
svn commit: r1166253 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/reflect/MethodUtils.java site/changes/changes.xml test/java/org/apache/commons/lang3/reflect/MethodUtilsTes
Author: ggregory
Date: Wed Sep 7 16:27:42 2011
New Revision: 1166253
URL: http://svn.apache.org/viewvc?rev=1166253&view=rev
Log:
Revert changes from r1166233: [LANG-750] Add MethodUtil APIs to call methods
without parameters.
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
commons/proper/lang/trunk/src/site/changes/changes.xml
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java?rev=1166253&r1=1166252&r2=1166253&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
Wed Sep 7 16:27:42 2011
@@ -59,33 +59,6 @@ public class MethodUtils {
}
/**
- * Invokes a named method without parameters.
- *
- * This method delegates the method search to {@link
#getMatchingAccessibleMethod(Class, String, Class[])}.
- *
- * This method supports calls to methods taking primitive parameters
- * via passing in wrapping classes. So, for example, a
Boolean object
- * would match a boolean primitive.
- *
- * This is a convenient wrapper for
- * {@link #invokeMethod(Object object,String methodName, Object[] args,
Class[] parameterTypes)}.
- *
- *
- * @param object invoke method on this object
- * @param methodName get method with this name
- * @return The value returned by the invoked method
- *
- * @throws NoSuchMethodException if there is no such accessible method
- * @throws InvocationTargetException wraps an exception thrown by the
method invoked
- * @throws IllegalAccessException if the requested method is not
accessible via reflection
- * @since 3.0.2
- */
-public static Object invokeMethod(Object object, String methodName) throws
NoSuchMethodException,
-IllegalAccessException, InvocationTargetException {
-return invokeMethod(object, methodName, ArrayUtils.EMPTY_OBJECT_ARRAY);
-}
-
-/**
* Invokes a named method whose parameter type matches the object
type.
*
* This method delegates the method search to {@link
#getMatchingAccessibleMethod(Class, String, Class[])}.
@@ -161,28 +134,6 @@ public class MethodUtils {
}
/**
- * Invokes a method without parameters.
- *
- * This uses reflection to invoke the method obtained from a call to
- * getAccessibleMethod().
- *
- * @param object invoke method on this object
- * @param methodName get method with this name
- * @return The value returned by the invoked method
- *
- * @throws NoSuchMethodException if there is no such accessible method
- * @throws InvocationTargetException wraps an exception thrown by the
- * method invoked
- * @throws IllegalAccessException if the requested method is not accessible
- * via reflection
- * @since 3.0.2
- */
-public static Object invokeExactMethod(Object object, String methodName)
throws NoSuchMethodException,
-IllegalAccessException, InvocationTargetException {
-return invokeExactMethod(object, methodName,
ArrayUtils.EMPTY_OBJECT_ARRAY);
-}
-
-/**
* Invokes a method whose parameter types match exactly the object
* types.
*
@@ -291,35 +242,6 @@ public class MethodUtils {
}
/**
- * Invokes a named static method without parameters.
- *
- * This method delegates the method search to {@link
#getMatchingAccessibleMethod(Class, String, Class[])}.
- *
- * This method supports calls to methods taking primitive parameters
- * via passing in wrapping classes. So, for example, a
Boolean class
- * would match a boolean primitive.
- *
- * This is a convenient wrapper for
- * {@link #invokeStaticMethod(Class objectClass,String methodName,Object
[] args,Class[] parameterTypes)}.
- *
- *
- * @param cls invoke static method on this class
- * @param methodName get method with this name
- * @return The value returned by the invoked method
- *
- * @throws NoSuchMethodException if there is no such accessible method
- * @throws InvocationTargetException wraps an exception thrown by the
- * method invoked
- * @throws IllegalAccessException if the requested method is not accessible
- * via reflection
- * @since 3.0.2
- */
-public static Object invokeStaticMethod(Class cls, String methodName)
throws NoSuchMethodException,
-IllegalAccessException, InvocationTargetException {
-return invokeStaticMet
svn commit: r1166243 - /commons/proper/commons-parent/trunk/pom.xml
Author: ggregory
Date: Wed Sep 7 15:59:19 2011
New Revision: 1166243
URL: http://svn.apache.org/viewvc?rev=1166243&view=rev
Log:
Remove maven-idea-plugin (bye, bye warnings on every single commons build.)
Modified:
commons/proper/commons-parent/trunk/pom.xml
Modified: commons/proper/commons-parent/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/commons-parent/trunk/pom.xml?rev=1166243&r1=1166242&r2=1166243&view=diff
==
--- commons/proper/commons-parent/trunk/pom.xml (original)
+++ commons/proper/commons-parent/trunk/pom.xml Wed Sep 7 15:59:19 2011
@@ -333,17 +333,6 @@
org.apache.maven.plugins
-maven-idea-plugin
-
-
- ${maven.compile.source}
-
-
-
-org.apache.maven.plugins
maven-surefire-plugin
${commons.surefire.java}
svn commit: r1166237 - /commons/proper/io/trunk/src/changes/changes.xml
Author: ggregory Date: Wed Sep 7 15:49:24 2011 New Revision: 1166237 URL: http://svn.apache.org/viewvc?rev=1166237&view=rev Log: [IO-284] Add IOUtils API toString for URL and URI to get contents Modified: commons/proper/io/trunk/src/changes/changes.xml Modified: commons/proper/io/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/io/trunk/src/changes/changes.xml?rev=1166237&r1=1166236&r2=1166237&view=diff == --- commons/proper/io/trunk/src/changes/changes.xml (original) +++ commons/proper/io/trunk/src/changes/changes.xml Wed Sep 7 15:49:24 2011 @@ -40,6 +40,9 @@ The type attribute can be add,u + +Add IOUtils API toString for URL and URI to get contents + Dubious use of mkdirs() return code
svn commit: r1166233 - in /commons/proper/lang/trunk/src: main/java/org/apache/commons/lang3/reflect/MethodUtils.java site/changes/changes.xml test/java/org/apache/commons/lang3/reflect/MethodUtilsTes
Author: ggregory
Date: Wed Sep 7 15:39:45 2011
New Revision: 1166233
URL: http://svn.apache.org/viewvc?rev=1166233&view=rev
Log:
[LANG-750] Add MethodUtil APIs to call methods without parameters.
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
commons/proper/lang/trunk/src/site/changes/changes.xml
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java?rev=1166233&r1=1166232&r2=1166233&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/MethodUtils.java
Wed Sep 7 15:39:45 2011
@@ -59,6 +59,33 @@ public class MethodUtils {
}
/**
+ * Invokes a named method without parameters.
+ *
+ * This method delegates the method search to {@link
#getMatchingAccessibleMethod(Class, String, Class[])}.
+ *
+ * This method supports calls to methods taking primitive parameters
+ * via passing in wrapping classes. So, for example, a
Boolean object
+ * would match a boolean primitive.
+ *
+ * This is a convenient wrapper for
+ * {@link #invokeMethod(Object object,String methodName, Object[] args,
Class[] parameterTypes)}.
+ *
+ *
+ * @param object invoke method on this object
+ * @param methodName get method with this name
+ * @return The value returned by the invoked method
+ *
+ * @throws NoSuchMethodException if there is no such accessible method
+ * @throws InvocationTargetException wraps an exception thrown by the
method invoked
+ * @throws IllegalAccessException if the requested method is not
accessible via reflection
+ * @since 3.0.2
+ */
+public static Object invokeMethod(Object object, String methodName) throws
NoSuchMethodException,
+IllegalAccessException, InvocationTargetException {
+return invokeMethod(object, methodName, ArrayUtils.EMPTY_OBJECT_ARRAY);
+}
+
+/**
* Invokes a named method whose parameter type matches the object
type.
*
* This method delegates the method search to {@link
#getMatchingAccessibleMethod(Class, String, Class[])}.
@@ -134,6 +161,28 @@ public class MethodUtils {
}
/**
+ * Invokes a method without parameters.
+ *
+ * This uses reflection to invoke the method obtained from a call to
+ * getAccessibleMethod().
+ *
+ * @param object invoke method on this object
+ * @param methodName get method with this name
+ * @return The value returned by the invoked method
+ *
+ * @throws NoSuchMethodException if there is no such accessible method
+ * @throws InvocationTargetException wraps an exception thrown by the
+ * method invoked
+ * @throws IllegalAccessException if the requested method is not accessible
+ * via reflection
+ * @since 3.0.2
+ */
+public static Object invokeExactMethod(Object object, String methodName)
throws NoSuchMethodException,
+IllegalAccessException, InvocationTargetException {
+return invokeExactMethod(object, methodName,
ArrayUtils.EMPTY_OBJECT_ARRAY);
+}
+
+/**
* Invokes a method whose parameter types match exactly the object
* types.
*
@@ -242,6 +291,35 @@ public class MethodUtils {
}
/**
+ * Invokes a named static method without parameters.
+ *
+ * This method delegates the method search to {@link
#getMatchingAccessibleMethod(Class, String, Class[])}.
+ *
+ * This method supports calls to methods taking primitive parameters
+ * via passing in wrapping classes. So, for example, a
Boolean class
+ * would match a boolean primitive.
+ *
+ * This is a convenient wrapper for
+ * {@link #invokeStaticMethod(Class objectClass,String methodName,Object
[] args,Class[] parameterTypes)}.
+ *
+ *
+ * @param cls invoke static method on this class
+ * @param methodName get method with this name
+ * @return The value returned by the invoked method
+ *
+ * @throws NoSuchMethodException if there is no such accessible method
+ * @throws InvocationTargetException wraps an exception thrown by the
+ * method invoked
+ * @throws IllegalAccessException if the requested method is not accessible
+ * via reflection
+ * @since 3.0.2
+ */
+public static Object invokeStaticMethod(Class cls, String methodName)
throws NoSuchMethodException,
+IllegalAccessException, InvocationTargetException {
+return invokeStaticMethod(cls, methodName,
ArrayUtil
svn commit: r1166221 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Author: ggregory
Date: Wed Sep 7 15:18:43 2011
New Revision: 1166221
URL: http://svn.apache.org/viewvc?rev=1166221&view=rev
Log:
Convert to JUnit 4 from 3.
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java?rev=1166221&r1=1166220&r2=1166221&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Wed Sep 7 15:18:43 2011
@@ -197,7 +197,7 @@ public class MethodUtilsTest {
@Test
public void testInvokeExactMethodNoParam() throws Exception {
-assertEquals("foo()", MethodUtils.invokeExactMethod(testBean, "foo"));
+//assertEquals("foo()", MethodUtils.invokeExactMethod(testBean,
"foo"));
}
@Test
svn commit: r1166220 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Author: ggregory
Date: Wed Sep 7 15:18:06 2011
New Revision: 1166220
URL: http://svn.apache.org/viewvc?rev=1166220&view=rev
Log:
Convert to JUnit 4 from 3.
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java?rev=1166220&r1=1166219&r2=1166220&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/MethodUtilsTest.java
Wed Sep 7 15:18:06 2011
@@ -16,23 +16,32 @@
*/
package org.apache.commons.lang3.reflect;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.commons.lang3.mutable.MutableObject;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
/**
* Unit tests MethodUtils
* @version $Id$
*/
-public class MethodUtilsTest extends TestCase {
+public class MethodUtilsTest {
private static interface PrivateInterface {}
@@ -96,6 +105,10 @@ public class MethodUtilsTest extends Tes
public String foo(Object o) {
return "foo(Object)";
}
+
+public void oneParameter(String s) {
+// empty
+}
}
private static class TestMutable implements Mutable {
@@ -108,24 +121,20 @@ public class MethodUtilsTest extends Tes
}
private TestBean testBean;
-private Map, Class[]> classCache;
-
-public MethodUtilsTest(String name) {
-super(name);
-classCache = new HashMap, Class[]>();
-}
+private Map, Class[]> classCache = new HashMap,
Class[]>();
-@Override
-protected void setUp() throws Exception {
-super.setUp();
+@Before
+public void setUp() throws Exception {
testBean = new TestBean();
classCache.clear();
}
+@Test
public void testConstructor() throws Exception {
assertNotNull(MethodUtils.class.newInstance());
}
+@Test
public void testInvokeMethod() throws Exception {
assertEquals("foo()", MethodUtils.invokeMethod(testBean, "foo",
(Object[]) ArrayUtils.EMPTY_CLASS_ARRAY));
@@ -149,6 +158,7 @@ public class MethodUtilsTest extends Tes
NumberUtils.DOUBLE_ONE));
}
+@Test
public void testInvokeExactMethod() throws Exception {
assertEquals("foo()", MethodUtils.invokeExactMethod(testBean, "foo",
(Object[]) ArrayUtils.EMPTY_CLASS_ARRAY));
@@ -185,6 +195,12 @@ public class MethodUtilsTest extends Tes
}
}
+@Test
+public void testInvokeExactMethodNoParam() throws Exception {
+assertEquals("foo()", MethodUtils.invokeExactMethod(testBean, "foo"));
+}
+
+@Test
public void testInvokeStaticMethod() throws Exception {
assertEquals("bar()", MethodUtils.invokeStaticMethod(TestBean.class,
"bar", (Object[]) ArrayUtils.EMPTY_CLASS_ARRAY));
@@ -214,6 +230,7 @@ public class MethodUtilsTest extends Tes
}
}
+@Test
public void testInvokeExactStaticMethod() throws Exception {
assertEquals("bar()",
MethodUtils.invokeExactStaticMethod(TestBean.class,
"bar", (Object[]) ArrayUtils.EMPTY_CLASS_ARRAY));
@@ -251,8 +268,8 @@ public class MethodUtilsTest extends Tes
}
}
+@Test
public void testGetAccessibleInterfaceMethod() throws Exception {
-
Class[][] p = { ArrayUtils.EMPTY_CLASS_ARRAY, null };
for (Class[] element : p) {
Method method = TestMutable.class.getMethod("getValue", element);
@@ -262,6 +279,7 @@ public class MethodUtilsTest extends Tes
}
}
+@Test
public void testGetAccessibleMethodPrivateInterface() throws Exception {
Method expected = TestBeanWithInterfaces.class.getMethod("foo");
assertNotNull(expected);
@@ -269,6 +287,7 @@ public class MethodUtilsTest extends Tes
assertNull(actual);
}
+@Test
public void testGetAccessibleInterfaceMethodFromDescription()
throws Exception {
Cla
svn commit: r1166147 - in /commons/sandbox/runtime/trunk/src/main: java/org/apache/commons/runtime/ssl/ native/ native/include/acr/ native/modules/openssl/
Author: mturk
Date: Wed Sep 7 12:15:40 2011
New Revision: 1166147
URL: http://svn.apache.org/viewvc?rev=1166147&view=rev
Log:
Start adding SSL api
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/Local.java
(with props)
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/LocalStrings.properties
(with props)
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSL.java
(with props)
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/ShutdownType.java
(with props)
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/init.c
(with props)
commons/sandbox/runtime/trunk/src/main/native/modules/openssl/util.c
(with props)
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.unx.in
commons/sandbox/runtime/trunk/src/main/native/include/acr/jnidefs.h
commons/sandbox/runtime/trunk/src/main/native/include/acr/ssl.h
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/Local.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/Local.java?rev=1166147&view=auto
==
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/Local.java
(added)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/Local.java
Wed Sep 7 12:15:40 2011
@@ -0,0 +1,35 @@
+/*
+ * 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
+ *
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.commons.runtime.ssl;
+
+import org.apache.commons.runtime.util.StringManager;
+
+/** SSL package private constants
+ */
+class Local
+{
+
+public static final String Package = "org.apache.commons.runtime.ssl";
+public static final StringManager sm;
+
+static {
+sm = StringManager.getManager(Package);
+}
+
+}
Propchange:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/Local.java
--
svn:eol-style = native
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/LocalStrings.properties?rev=1166147&view=auto
==
---
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/LocalStrings.properties
(added)
+++
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/LocalStrings.properties
Wed Sep 7 12:15:40 2011
@@ -0,0 +1,14 @@
+# 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
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
Propchange:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/LocalStrings.properties
--
svn:eol-style = native
Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSL.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ssl/SSL.java?rev=1166147&view=auto
==
---
commons/sandbox/runtime/trunk/src/main/java/org/apach
svn commit: r1166105 - /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
Author: sebb Date: Wed Sep 7 10:49:09 2011 New Revision: 1166105 URL: http://svn.apache.org/viewvc?rev=1166105&view=rev Log: Typo Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java?rev=1166105&r1=1166104&r2=1166105&view=diff == --- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java (original) +++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java Wed Sep 7 10:49:09 2011 @@ -148,6 +148,6 @@ public abstract class BaseKeyedObjectPoo } } -/** Whether or not the pool is close */ +/** Whether or not the pool is closed */ private volatile boolean closed = false; }
svn commit: r1166099 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java
Author: erans
Date: Wed Sep 7 10:34:49 2011
New Revision: 1166099
URL: http://svn.apache.org/viewvc?rev=1166099&view=rev
Log:
Added "final".
Moved declaration of "sum" where it is used.
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java?rev=1166099&r1=1166098&r2=1166099&view=diff
==
---
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java
(original)
+++
commons/proper/math/trunk/src/main/java/org/apache/commons/math/linear/LUDecompositionImpl.java
Wed Sep 7 10:34:49 2011
@@ -36,9 +36,9 @@ public class LUDecompositionImpl impleme
/** Default bound to determine effective singularity in LU decomposition.
*/
private static final double DEFAULT_TOO_SMALL = 1e-11;
/** Entries of LU decomposition. */
-private double lu[][];
+private final double lu[][];
/** Pivot permutation associated with LU decomposition */
-private int[] pivot;
+private final int[] pivot;
/** Parity of the permutation associated with the LU decomposition */
private boolean even;
/** Singularity indicator. */
@@ -92,12 +92,10 @@ public class LUDecompositionImpl impleme
// Loop over columns
for (int col = 0; col < m; col++) {
-double sum = 0;
-
// upper
for (int row = 0; row < col; row++) {
final double[] luRow = lu[row];
-sum = luRow[col];
+double sum = luRow[col];
for (int i = 0; i < row; i++) {
sum -= luRow[i] * lu[i][col];
}
@@ -109,7 +107,7 @@ public class LUDecompositionImpl impleme
double largest = Double.NEGATIVE_INFINITY;
for (int row = col; row < m; row++) {
final double[] luRow = lu[row];
-sum = luRow[col];
+double sum = luRow[col];
for (int i = 0; i < col; i++) {
sum -= luRow[i] * lu[i][col];
}
