Author: kmorin Date: 2009-07-24 10:57:21 +0200 (Fri, 24 Jul 2009) New Revision: 1525 Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingImplementationGenerator.java trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingInterfaceGenerator.java Log: changed the return type of the generate method from void to JavaFile Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java =================================================================== --- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) +++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingAbstractClassGenerator.java 2009-07-24 08:57:21 UTC (rev 1525) @@ -20,8 +20,6 @@ //~--- non-JDK imports -------------------------------------------------------- import java.beans.IntrospectionException; -import java.io.File; -import java.util.Map; import org.nuiton.guix.tags.swing.MenuBarHandler; ; import org.nuiton.guix.model.GuixModelObject; @@ -82,8 +80,8 @@ script = sh.decomposeScript(gmo.getClassDescriptor().getScript()); } - public JavaFile generates() { - super.generate(); + public JavaFile generate() { + super.addImports(gmo); //add imports for (String s : (List<String>) script.get(ScriptPart.IMPORTS)) { @@ -625,11 +623,6 @@ gmo.getAttributeDescriptors().addAll(ads); } - @Override - public void generate(File out) { - throw new UnsupportedOperationException("Not supported yet."); - } - public Map<String, Map<String, String>> getBindings2Generate() { return bindings2Generate; } Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java =================================================================== --- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) +++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingGenerator.java 2009-07-24 08:57:21 UTC (rev 1525) @@ -77,11 +77,11 @@ SwingAbstractClassGenerator sacg = new SwingAbstractClassGenerator(gmo, classes); SwingImplementationGenerator simg = new SwingImplementationGenerator(gmo, classes); - sing.generate(out); + sing.generate(); generators.put(sing, out); - JavaFile jf = sacg.generates(); + JavaFile jf = sacg.generate(); generators.put(sacg, outAbstract); - simg.generate(outImpl); + simg.generate(); generators.put(simg, outImpl); if (mainClass) { Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingImplementationGenerator.java =================================================================== --- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingImplementationGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) +++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingImplementationGenerator.java 2009-07-24 08:57:21 UTC (rev 1525) @@ -18,12 +18,7 @@ */ package org.nuiton.guix.generator; -//~--- non-JDK imports -------------------------------------------------------- - import org.nuiton.guix.model.GuixModelObject; - -//~--- JDK imports ------------------------------------------------------------ - import java.io.File; import java.lang.reflect.Modifier; import java.util.List; @@ -52,14 +47,14 @@ } @Override - public void generate(File out) { - super.generate(); + public JavaFile generate() { + super.addImports(gmo); //add the constructor jf.addMethod(new JavaMethod(Modifier.PUBLIC, null, gmo.getClassDescriptor().getName() + "Impl", null, null, "super();", "Constructor")); - saveFile(out); + return jf; } } Modified: trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingInterfaceGenerator.java =================================================================== --- trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingInterfaceGenerator.java 2009-07-24 08:57:09 UTC (rev 1524) +++ trunk/guix-compiler-swing/src/main/java/org/nuiton/guix/generator/SwingInterfaceGenerator.java 2009-07-24 08:57:21 UTC (rev 1525) @@ -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")); jf.addMethod(new JavaMethod(Modifier.PUBLIC, "void", getMethodName(Method.BEFORE_CREATION), null, null, null, "")); @@ -64,7 +64,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; } /**