Updated Branches: refs/heads/JCLOUDS-415 ffe2b4da9 -> 51cae419e
Addressing Checkstyle warnings introduced in 8ff60020 and ffe2b4da Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/51cae419 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/51cae419 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/51cae419 Branch: refs/heads/JCLOUDS-415 Commit: 51cae419e09a17987f26754fa439f1623f3ab57a Parents: ffe2b4d Author: Andrew Phillips <[email protected]> Authored: Fri Jan 24 20:15:37 2014 -0500 Committer: Andrew Phillips <[email protected]> Committed: Fri Jan 24 20:15:37 2014 -0500 ---------------------------------------------------------------------- core/src/main/java/org/jclouds/internal/BaseView.java | 1 - .../rest/internal/DelegatesToInvocationFunction.java | 10 +++++----- core/src/main/java/org/jclouds/util/TypeToken2.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/51cae419/core/src/main/java/org/jclouds/internal/BaseView.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/internal/BaseView.java b/core/src/main/java/org/jclouds/internal/BaseView.java index 87e7d5f..fea53e5 100644 --- a/core/src/main/java/org/jclouds/internal/BaseView.java +++ b/core/src/main/java/org/jclouds/internal/BaseView.java @@ -31,7 +31,6 @@ import org.jclouds.rest.ApiContext; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ForwardingObject; -import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/51cae419/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java index f046366..8d94c3e 100644 --- a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java +++ b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java @@ -157,7 +157,7 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj } } - private static final boolean isCloseMethod(Invokable<?, ?> invokable) { + private static boolean isCloseMethod(Invokable<?, ?> invokable) { /* * Tests equality according to the Javadoc for java.lang.reflect.Method: * @@ -167,10 +167,10 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj * Invokable now uses the *owning* class (not the declaring class) in * its equals check. */ - return (CLOSE.getDeclaringClass().equals(invokable.getDeclaringClass()) - && CLOSE.getName().equals(invokable.getName()) - && CLOSE.getParameters().equals(invokable.getParameters()) - && CLOSE.getReturnType().equals(invokable.getReturnType())); + return CLOSE.getDeclaringClass().equals(invokable.getDeclaringClass()) + && CLOSE.getName().equals(invokable.getName()) + && CLOSE.getParameters().equals(invokable.getParameters()) + && CLOSE.getReturnType().equals(invokable.getReturnType()); } protected final Injector injector; http://git-wip-us.apache.org/repos/asf/jclouds/blob/51cae419/core/src/main/java/org/jclouds/util/TypeToken2.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/util/TypeToken2.java b/core/src/main/java/org/jclouds/util/TypeToken2.java index 99e47e5..dc92e5a 100644 --- a/core/src/main/java/org/jclouds/util/TypeToken2.java +++ b/core/src/main/java/org/jclouds/util/TypeToken2.java @@ -68,7 +68,7 @@ public class TypeToken2<T> extends TypeToken<T> { return where(typeParam1, of(typeArg1), typeParam2, of(typeArg2)); } - public static abstract class TypeParameter2<T> extends TypeParameter<T> { + public abstract static class TypeParameter2<T> extends TypeParameter<T> { TypeVariable<?> getTypeVariable() { // duplicated from TypeCapture, where it's package-private Type superclass = getClass().getGenericSuperclass();
