diff -r 2fa85847ccf7 -r 9b4751828ceb javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java --- a/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Tue Mar 05 19:00:36 2013 +0100 +++ b/javaquery/api/src/main/java/org/apidesign/bck2brwsr/htmlpage/PageProcessor.java Thu Mar 21 15:45:42 2013 +0100 @@ -78,6 +78,7 @@ String pkg = pe.getQualifiedName().toString(); ProcessPage pp; + ElementGenerator eGen = new ElementGenerator(processingEnv); try { InputStream is = openStream(pkg, p.xhtml()); pp = ProcessPage.readPage(is); @@ -105,7 +106,7 @@ } for (String id : pp.ids()) { String tag = pp.tagNameForId(id); - String type = type(tag); + String type = eGen.getType(pkg, tag, e); w.append(" ").append("public final "). append(type).append(' ').append(cnstnt(id)).append(" = new "). append(type).append("(\"").append(id).append("\");\n"); @@ -158,25 +159,6 @@ } } - private static String type(String tag) { - if (tag.equals("title")) { - return "Title"; - } - if (tag.equals("button")) { - return "Button"; - } - if (tag.equals("input")) { - return "Input"; - } - if (tag.equals("canvas")) { - return "Canvas"; - } - if (tag.equals("img")) { - return "Image"; - } - return "Element"; - } - private static String cnstnt(String id) { return id.toUpperCase(Locale.ENGLISH).replace('.', '_').replace('-', '_'); }