# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1363966770 -3600
# Node ID ac3b09b93f36baf1d5aa343cbf5ff53cfc792807
# Parent  26513bd377b93f112098aa232956d945c484621e
Report location where non-primitive type is used

diff -r 26513bd377b9 -r ac3b09b93f36 javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java
--- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Fri Feb 22 08:59:40 2013 +0100
+++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Fri Mar 22 16:39:30 2013 +0100
@@ -22,7 +22,6 @@
 import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.io.Writer;
-import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -39,7 +38,6 @@
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -114,7 +112,7 @@
             if (!generateComputedProperties(body, m.properties(), e.getEnclosedElements(), propsGetSet, propsDeps)) {
                 ok = false;
             }
-            if (!generateProperties(body, m.properties(), propsGetSet, propsDeps)) {
+            if (!generateProperties(e, body, m.properties(), propsGetSet, propsDeps)) {
                 ok = false;
             }
             FileObject java = processingEnv.getFiler().createSourceFile(pkg + '.' + className, e);
@@ -169,7 +167,7 @@
             if (!generateComputedProperties(body, p.properties(), e.getEnclosedElements(), propsGetSet, propsDeps)) {
                 ok = false;
             }
-            if (!generateProperties(body, p.properties(), propsGetSet, propsDeps)) {
+            if (!generateProperties(e, body, p.properties(), propsGetSet, propsDeps)) {
                 ok = false;
             }
             
@@ -389,13 +387,14 @@
     }
 
     private boolean generateProperties(
+        Element where,
         Writer w, Property[] properties,
         Collection<String> props, Map<String,Collection<String>> deps
     ) throws IOException {
         boolean ok = true;
         for (Property p : properties) {
             final String tn;
-            tn = typeName(p);
+            tn = typeName(where, p);
             String[] gs = toGetSet(p.name(), tn, p.array());
 
             if (p.array()) {
@@ -556,7 +555,7 @@
         };
     }
 
-    private String typeName(Property p) {
+    private String typeName(Element where, Property p) {
         String ret;
         boolean isModel = false;
         try {
@@ -581,7 +580,11 @@
         if (!isModel && !"java.lang.String".equals(ret)) {
             String bt = findBoxedType(ret);
             if (bt == null) {
-                processingEnv.getMessager().printMessage(Diagnostic.Kind.ERROR, "Only primitive types supported in the mapping. Not " + ret);
+                processingEnv.getMessager().printMessage(
+                    Diagnostic.Kind.ERROR, 
+                    "Only primitive types supported in the mapping. Not " + ret,
+                    where
+                );
             }
         }
         return ret;