cleanup
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/trunk@1585512 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java b/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
index bc34308..d42de21 100644
--- a/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
+++ b/core/src/main/java/org/apache/commons/proxy2/interceptor/matcher/argument/ArgumentMatcherUtils.java
@@ -110,11 +110,11 @@
}
}
- 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 @@
{
return false;
}
- final int comparison = (comparable).compareTo(argument);
+ final int comparison = comparable.compareTo(argument);
return evaluate(comparison);
}
}
@@ -166,7 +166,7 @@
}
}
- 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 @@
}
}
- 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 @@
}
}
- 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 @@
}
}
- 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)
{
diff --git a/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java b/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java
index c39b0ce..4671011 100644
--- a/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java
+++ b/core/src/main/java/org/apache/commons/proxy2/serialization/package-info.java
@@ -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;
diff --git a/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java b/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
index 4d84963..8e99ee3 100644
--- a/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
+++ b/jdk/src/main/java/org/apache/commons/proxy2/jdk/JdkProxyFactory.java
@@ -33,7 +33,8 @@
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
{
