You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mb...@apache.org on 2014/04/07 17:55:35 UTC
svn commit: r1585512 - in /commons/proper/proxy/trunk:
core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/
core/src/main/java/org/apache/commons/proxy2/serialization/
jdk/src/main/java/org/apache/commons/proxy2/jdk/
Author: mbenson
Date: Mon Apr 7 15:55:35 2014
New Revision: 1585512
URL: http://svn.apache.org/r1585512
Log:
cleanup
Modified:
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java
commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
Modified: commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java?rev=1585512&r1=1585511&r2=1585512&view=diff
==============================================================================
--- commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java (original)
+++ commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java Mon Apr 7 15:55:35 2014
@@ -110,11 +110,11 @@ public final class ArgumentMatcherUtils
}
}
- private abstract static class ComparatorMatcher<C extends Comparable<C>> implements ArgumentMatcher<C>
+ private abstract static class ComparableMatcher<C extends Comparable<C>> implements ArgumentMatcher<C>
{
private final C comparable;
- protected ComparatorMatcher(C comparable)
+ protected ComparableMatcher(C comparable)
{
this.comparable = Validate.notNull(comparable);
}
@@ -128,7 +128,7 @@ public final class ArgumentMatcherUtils
{
return false;
}
- final int comparison = (comparable).compareTo(argument);
+ final int comparison = comparable.compareTo(argument);
return evaluate(comparison);
}
}
@@ -166,7 +166,7 @@ public final class ArgumentMatcherUtils
}
}
- private static final class GreaterThanMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
+ private static final class GreaterThanMatcher<C extends Comparable<C>> extends ComparableMatcher<C>
{
private GreaterThanMatcher(C comparable)
{
@@ -180,7 +180,7 @@ public final class ArgumentMatcherUtils
}
}
- private static final class GreaterThanOrEqualMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
+ private static final class GreaterThanOrEqualMatcher<C extends Comparable<C>> extends ComparableMatcher<C>
{
private GreaterThanOrEqualMatcher(C comparable)
{
@@ -219,7 +219,7 @@ public final class ArgumentMatcherUtils
}
}
- private static final class LessThanMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
+ private static final class LessThanMatcher<C extends Comparable<C>> extends ComparableMatcher<C>
{
private LessThanMatcher(C comparable)
{
@@ -233,7 +233,7 @@ public final class ArgumentMatcherUtils
}
}
- private static final class LessThanOrEqualMatcher<C extends Comparable<C>> extends ComparatorMatcher<C>
+ private static final class LessThanOrEqualMatcher<C extends Comparable<C>> extends ComparableMatcher<C>
{
private LessThanOrEqualMatcher(C comparable)
{
Modified: commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java?rev=1585512&r1=1585511&r2=1585512&view=diff
==============================================================================
--- commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java (original)
+++ commons/proper/proxy/trunk/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java Mon Apr 7 15:55:35 2014
@@ -26,12 +26,14 @@
* <li>{@link org.apache.commons.proxy2.serialization.WriteReplace WriteReplace}</li>
* </ul>
*
- * Typically, you should define your proxy to include {@link org.apache.commons.proxy2.serialization.WriteReplace WriteReplace} among its interfaces, and implement it to
- * return some object that implements {@link org.apache.commons.proxy2.serialization.ReadResolve ReadResolve} (or simply declares the {@code Object readResolve()} method
- * in any scope, but using the interface brings compiler assistance).
+ * Typically, you should define your proxy to include
+ * {@link org.apache.commons.proxy2.serialization.WriteReplace WriteReplace} among its interfaces, and implement it to
+ * return some object that implements {@link org.apache.commons.proxy2.serialization.ReadResolve ReadResolve} (or simply
+ * declares the {@code Object readResolve()} method in any scope, but using the interface brings compiler assistance).
*
- * Hint: Your {@link org.apache.commons.proxy2.serialization.ReadResolve ReadResolve#readResolve()} implementation will typically use serialized information to recreate an
- * equivalent proxy object, which probably implies some form of {@code static} access.
+ * Hint: Your {@link org.apache.commons.proxy2.serialization.ReadResolve ReadResolve#readResolve()} implementation will
+ * typically use serialized information to recreate an equivalent proxy object, which probably implies some form of
+ * {@code static} access.
*/
package org.apache.commons.proxy2.serialization;
Modified: commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java?rev=1585512&r1=1585511&r2=1585512&view=diff
==============================================================================
--- commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java (original)
+++ commons/proper/proxy/trunk/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java Mon Apr 7 15:55:35 2014
@@ -33,7 +33,8 @@ import org.apache.commons.proxy2.ProxyUt
import org.apache.commons.proxy2.impl.AbstractProxyFactory;
/**
- * {@link org.apache.commons.proxy2.ProxyFactory ProxyFactory} implementation that uses {@link java.lang.reflect.Proxy} proxies.
+ * {@link org.apache.commons.proxy2.ProxyFactory ProxyFactory} implementation that uses {@link java.lang.reflect.Proxy}
+ * proxies.
*/
public class JdkProxyFactory extends AbstractProxyFactory
{