This commit is contained in:
Timo Westkämper 2010-08-03 16:58:52 +00:00
parent d159b4c715
commit a24dd76ac9
3 changed files with 7 additions and 12 deletions

View File

@ -5,6 +5,7 @@
*/
package com.mysema.codegen.model;
import java.util.Collections;
import java.util.Set;
import javax.annotation.Nullable;
@ -30,11 +31,7 @@ public class TypeExtends extends TypeAdapter{
@Override
public String getGenericName(boolean asArgType){
if (!asArgType){
return "? extends " + super.getGenericName(true);
}else{
return super.getGenericName(asArgType);
}
return getGenericName(asArgType, Collections.<String>emptySet(),Collections.<String>emptySet());
}
@Override

View File

@ -5,6 +5,7 @@
*/
package com.mysema.codegen.model;
import java.util.Collections;
import java.util.Set;
import javax.annotation.Nullable;
@ -37,11 +38,7 @@ public class TypeSuper extends TypeAdapter{
@Override
public String getGenericName(boolean asArgType){
if (!asArgType){
return "? super " + superType.getGenericName(true);
}else{
return super.getGenericName(asArgType);
}
return getGenericName(asArgType, Collections.<String>emptySet(),Collections.<String>emptySet());
}
@Override

View File

@ -18,6 +18,7 @@ import java.util.Set;
* @author tiwe
*
*/
@SuppressWarnings("unchecked")
public final class Types {
public static final ClassType<Object> OBJECT = new ClassType<Object>(TypeCategory.SIMPLE,Object.class);
@ -33,7 +34,7 @@ public final class Types {
public static final ClassType<Byte> BYTE = new ClassType<Byte>(TypeCategory.NUMERIC,Byte.class, byte.class);
public static final ClassType<Character> CHAR = new ClassType<Character>(TypeCategory.COMPARABLE,Character.class, char.class);
public static final ClassType<Collection> COLLECTION = new ClassType<Collection>(TypeCategory.COLLECTION, Collection.class, OBJECT);
public static final ClassType<Double> DOUBLE = new ClassType<Double>(TypeCategory.NUMERIC,Double.class, double.class);
@ -62,4 +63,4 @@ public final class Types {
private Types(){}
}
}