From e31e339d8b6fe26252bd42fe60c5d4ce83cc923e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Sun, 19 Apr 2009 16:14:49 +0000 Subject: [PATCH] --- .../com/mysema/query/apt/general/TypeHelper.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/querydsl-apt/src/main/java/com/mysema/query/apt/general/TypeHelper.java b/querydsl-apt/src/main/java/com/mysema/query/apt/general/TypeHelper.java index 1d47a1a97..fc0639f03 100644 --- a/querydsl-apt/src/main/java/com/mysema/query/apt/general/TypeHelper.java +++ b/querydsl-apt/src/main/java/com/mysema/query/apt/general/TypeHelper.java @@ -207,8 +207,7 @@ public class TypeHelper extends SimpleTypeVisitor { } else if (isComparableSupported(fullName) && Comparable.class.isAssignableFrom(type)){ fieldType = FieldType.COMPARABLE; - } else if (fullName.startsWith("org.joda.time")){ - // can't be Comparable, since joda types don't implement Comparable with generic type parameter + } else if (asSimpleType(fullName)){ fieldType = FieldType.SIMPLE; } @@ -237,8 +236,7 @@ public class TypeHelper extends SimpleTypeVisitor { } else if (isComparableSupported(fullName) && Comparable.class.isAssignableFrom(Class.forName(fullName))) { fieldType = FieldType.COMPARABLE; - } else if (fullName.startsWith("org.joda.time")){ - // can't be Comparable, since joda types don't implement Comparable with generic type parameter + } else if (asSimpleType(fullName)){ fieldType = FieldType.SIMPLE; } @@ -252,7 +250,12 @@ public class TypeHelper extends SimpleTypeVisitor { } private boolean isComparableSupported(String fullName){ - return fullName.startsWith("java"); + return fullName.startsWith("java.") || fullName.startsWith("javax."); + } + + private boolean asSimpleType(String fullName){ + // can't be Comparable, since joda types don't implement Comparable with generic type parameter + return fullName.startsWith("org.joda.time"); } public void visitEnumType(Class type) {