Cleaning up checkstyle warnings caused by 5976159 Looks like the workaround for Guava 1635 will be with us for a while on 1.7.x
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0fd7f62e Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0fd7f62e Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0fd7f62e Branch: refs/heads/cleanup-5976159-1.7.x Commit: 0fd7f62ea36a3bef87963b4911acaa2b0e78a574 Parents: 4804edb Author: Andrew Phillips <[email protected]> Authored: Fri Feb 7 13:37:15 2014 +0000 Committer: Andrew Phillips <[email protected]> Committed: Wed Feb 12 00:56:45 2014 -0500 ---------------------------------------------------------------------- core/src/main/java/org/jclouds/internal/BaseView.java | 1 - core/src/main/java/org/jclouds/util/TypeToken2.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/0fd7f62e/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/0fd7f62e/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..091e5be 100644 --- a/core/src/main/java/org/jclouds/util/TypeToken2.java +++ b/core/src/main/java/org/jclouds/util/TypeToken2.java @@ -68,11 +68,11 @@ 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(); return (TypeVariable<?>) ((ParameterizedType) superclass).getActualTypeArguments()[0]; } } -} \ No newline at end of file +}
