javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java
branchmodel
changeset 911 fdf840690861
parent 909 e51a474fcf79
child 914 81dcd71877d5
     1.1 --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Sun Mar 31 12:01:38 2013 +0200
     1.2 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Sun Mar 31 13:26:27 2013 +0200
     1.3 @@ -535,6 +535,7 @@
     1.4      private String typeName(Element where, Property p) {
     1.5          String ret;
     1.6          boolean isModel = false;
     1.7 +        boolean isEnum = false;
     1.8          try {
     1.9              ret = p.type().getName();
    1.10          } catch (MirroredTypeException ex) {
    1.11 @@ -548,6 +549,9 @@
    1.12              } else {
    1.13                  ret = tm.toString();
    1.14              }
    1.15 +            TypeMirror enm = processingEnv.getElementUtils().getTypeElement("java.lang.Enum").asType();
    1.16 +            enm = processingEnv.getTypeUtils().erasure(enm);
    1.17 +            isEnum = processingEnv.getTypeUtils().isSubtype(tm, enm);
    1.18          }
    1.19          if (p.array()) {
    1.20              String bt = findBoxedType(ret);
    1.21 @@ -555,7 +559,7 @@
    1.22                  return bt;
    1.23              }
    1.24          }
    1.25 -        if (!isModel && !"java.lang.String".equals(ret)) {
    1.26 +        if (!isModel && !"java.lang.String".equals(ret) && !isEnum) {
    1.27              String bt = findBoxedType(ret);
    1.28              if (bt == null) {
    1.29                  processingEnv.getMessager().printMessage(