Author: kmorin Date: 2009-07-24 10:57:09 +0200 (Fri, 24 Jul 2009) New Revision: 1524 Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator1.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java Log: changed the return type of the generate method from void to JavaFile Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java 2009-07-24 08:56:54 UTC (rev 1523) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtAbstractClassGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) @@ -81,9 +81,9 @@ script = sh.decomposeScript(gmo.getClassDescriptor().getScript()); } - //@Override - public JavaFile generates() { - super.generate(); + @Override + public JavaFile generate() { + super.addImports(gmo); //add imports for (String s : (List<String>) script.get(ScriptPart.IMPORTS)) { @@ -587,9 +587,5 @@ return bindings2Generate; } - @Override - public void generate(File out) { - throw new UnsupportedOperationException("Not supported yet."); - } } Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java 2009-07-24 08:56:54 UTC (rev 1523) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) @@ -111,11 +111,11 @@ ghg.generate(outHtmlMain); } - ging.generate(out); + ging.generate(); generators.put(ging, out); - JavaFile jf = gacg.generates(); + JavaFile jf = gacg.generate(); generators.put(gacg, outAbstract); - gimg.generate(outImpl); + gimg.generate(); generators.put(gimg, outImpl); serializer.startTag("", "bean"); Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator1.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator1.java 2009-07-24 08:56:54 UTC (rev 1523) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtGenerator1.java 2009-07-24 08:57:09 UTC (rev 1524) @@ -87,11 +87,11 @@ ghg.generate(outHtmlMain); } - ging.generate(out); + ging.generate(); generators.put(ging, out); - JavaFile jf = gacg.generates(); + JavaFile jf = gacg.generate(); generators.put(gacg, outAbstract); - gimg.generate(outImpl); + gimg.generate(); generators.put(gimg, outImpl); serializer.startTag("", "bean"); Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java 2009-07-24 08:56:54 UTC (rev 1523) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtImplementationGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) @@ -52,19 +52,11 @@ } @Override - public void generate(File out) { - super.generate(); - - //if (!gmo.getJavadoc().equals("")) { - //sb.append("\n/**\n * "); - //sb.append(gmo.getJavadoc()); - //sb.append("\n */"); - //} - + public JavaFile generate() { + super.addImports(gmo); jf.addMethod(new JavaMethod(Modifier.PUBLIC, null, gmo.getClassDescriptor().getName() + "Impl", null, null, "super();", "Constructor")); - - saveFile(out); + return jf; } public void addMainMethod() { Modified: trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java =================================================================== --- trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java 2009-07-24 08:56:54 UTC (rev 1523) +++ trunk/guix-compiler-gwt/src/main/java/org/nuiton/guix/generator/GwtInterfaceGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) @@ -52,8 +52,8 @@ } @Override - public void generate(File out) { - super.generate(); + public JavaFile generate() { + super.addImports(gmo); addFields(gmo); jf.addMethod(new JavaMethod(Modifier.PUBLIC, "void", "initialize", null, null, null, "initialization")); @@ -65,7 +65,7 @@ jf.addMethod(new JavaMethod(Modifier.PUBLIC, "void", getMethodName(Method.DATABINDING_INIT), null, null, null, "initilization of databinding")); jf.addMethod(new JavaMethod(Modifier.PUBLIC, "void", getMethodName(Method.IN_THE_END), null, null, null, "")); - saveFile(out); + return jf; } /**