1.1 --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Tue Mar 05 19:00:36 2013 +0100
     1.2 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java	Thu Mar 21 15:45:42 2013 +0100
     1.3 @@ -78,6 +78,7 @@
     1.4              String pkg = pe.getQualifiedName().toString();
     1.5              
     1.6              ProcessPage pp;
     1.7 +            ElementGenerator eGen = new ElementGenerator(processingEnv);
     1.8              try {
     1.9                  InputStream is = openStream(pkg, p.xhtml());
    1.10                  pp = ProcessPage.readPage(is);
    1.11 @@ -105,7 +106,7 @@
    1.12                      }
    1.13                      for (String id : pp.ids()) {
    1.14                          String tag = pp.tagNameForId(id);
    1.15 -                        String type = type(tag);
    1.16 +                        String type = eGen.getType(pkg, tag, e);
    1.17                          w.append("  ").append("public final ").
    1.18                              append(type).append(' ').append(cnstnt(id)).append(" = new ").
    1.19                              append(type).append("(\"").append(id).append("\");\n");
    1.20 @@ -158,25 +159,6 @@
    1.21          }
    1.22      }
    1.23  
    1.24 -    private static String type(String tag) {
    1.25 -        if (tag.equals("title")) {
    1.26 -            return "Title";
    1.27 -        }
    1.28 -        if (tag.equals("button")) {
    1.29 -            return "Button";
    1.30 -        }
    1.31 -        if (tag.equals("input")) {
    1.32 -            return "Input";
    1.33 -        }
    1.34 -        if (tag.equals("canvas")) {
    1.35 -            return "Canvas";
    1.36 -        }
    1.37 -        if (tag.equals("img")) {
    1.38 -            return "Image";
    1.39 -        }
    1.40 -        return "Element";
    1.41 -    }
    1.42 -
    1.43      private static String cnstnt(String id) {
    1.44          return id.toUpperCase(Locale.ENGLISH).replace('.', '_').replace('-', '_');
    1.45      }