Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andrew Phillips 2014-02-07 13:37:15 +00:00
parent 4804edb7e8
commit b1a2baee62
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/org/jclouds/internal/BaseView.java
View File

@ -31,7 +31,6 @@ import org.jclouds.rest.ApiContext;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper; import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingObject; import com.google.common.collect.ForwardingObject;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
/** /**

4
core/src/main/java/org/jclouds/util/TypeToken2.java
View File

@ -68,11 +68,11 @@ public class TypeToken2<T> extends TypeToken<T> {
return where(typeParam1, of(typeArg1), typeParam2, of(typeArg2)); 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() { TypeVariable<?> getTypeVariable() {
// duplicated from TypeCapture, where it's package-private // duplicated from TypeCapture, where it's package-private
Type superclass = getClass().getGenericSuperclass(); Type superclass = getClass().getGenericSuperclass();
return (TypeVariable<?>) ((ParameterizedType) superclass).getActualTypeArguments()[0]; return (TypeVariable<?>) ((ParameterizedType) superclass).getActualTypeArguments()[0];
} }
} }
} }