Author: tchemit Date: 2010-08-30 12:01:11 +0200 (Mon, 30 Aug 2010) New Revision: 2055 Url: http://nuiton.org/repositories/revision/jaxx/2055 Log: reformat Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java 2010-08-30 08:07:12 UTC (rev 2054) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java 2010-08-30 10:01:11 UTC (rev 2055) @@ -36,8 +36,8 @@ * with a JXLayer. * * @author tchemit <chemit@codelutin.com> + * @plexus.component role-hint="boxed" role="jaxx.compiler.CompiledObjectDecorator" * @since 1.2 - * @plexus.component role-hint="boxed" role="jaxx.compiler.CompiledObjectDecorator" */ public class BoxedCompiledObjectDecorator extends DefaultCompiledObjectDecorator { @@ -47,7 +47,13 @@ } @Override - public void finalizeCompiler(JAXXCompiler compiler, CompiledObject root, CompiledObject object, JavaFile javaFile, String packageName, String className, String fullClassName) { + public void finalizeCompiler(JAXXCompiler compiler, + CompiledObject root, + CompiledObject object, + JavaFile javaFile, + String packageName, + String className, + String fullClassName) { CompiledObject parent = object.getParent(); if (parent == null) { parent = root; @@ -55,10 +61,19 @@ for (ChildRef child : parent.getChilds()) { if (child.getChild() == object) { String javaCode = child.getChildJavaCode(); - child.setChildJavaCode(SwingUtil.class.getSimpleName() + ".boxComponentWithJxLayer(" + javaCode + ")"); + child.setChildJavaCode( + SwingUtil.class.getSimpleName() + + ".boxComponentWithJxLayer(" + javaCode + ")"); break; } } - super.finalizeCompiler(compiler, root, object, javaFile, packageName, className, fullClassName); + super.finalizeCompiler(compiler, + root, + object, + javaFile, + packageName, + className, + fullClassName + ); } } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2010-08-30 08:07:12 UTC (rev 2054) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/DefaultCompiledObjectDecorator.java 2010-08-30 10:01:11 UTC (rev 2055) @@ -98,18 +98,34 @@ if (log.isDebugEnabled()) { log.debug("Add specialized getter " + methodName + " : " + body); } - JavaMethod getter = JavaFileGenerator.newMethod(Modifier.PUBLIC, fqn, methodName, body, true); + JavaMethod getter = JavaFileGenerator.newMethod( + Modifier.PUBLIC, + fqn, + methodName, + body, + true + ); javaFile.addMethod(getter); } } else { - int access = id.startsWith("$") ? Modifier.PRIVATE : Modifier.PROTECTED; + int access = id.startsWith("$") ? Modifier.PRIVATE : + Modifier.PROTECTED; if (root.equals(object)) { - JavaField field = JavaFileGenerator.newField(access, className, id, false, "this"); + JavaField field = JavaFileGenerator.newField(access, + className, + id, + false, + "this" + ); javaFile.addSimpleField(field); } else { - - JavaField field = JavaFileGenerator.newField(access, fqn, id, override); + + JavaField field = JavaFileGenerator.newField(access, + fqn, + id, + override + ); javaFile.addField(field, object.isJavaBean()); } } @@ -138,16 +154,19 @@ } @Override - public String getCreationCode(JAXXCompiler compiler, CompiledObject object) throws CompilerException { + public String getCreationCode(JAXXCompiler compiler, + CompiledObject object) throws CompilerException { if (object instanceof ScriptInitializer) { - throw new IllegalStateException("A script initializer can not come in getCreationcode method!"); + throw new IllegalStateException( + "A script initializer can not come in getCreationcode method!"); } String eol = JAXXCompiler.getLineSeparator(); StringBuffer result = new StringBuffer(); StringBuilder init = new StringBuilder(); - if (compiler.getRootObject().equals(object) || compiler.inlineCreation(object)) { + if (compiler.getRootObject().equals(object) || + compiler.inlineCreation(object)) { result.append("// inline creation of ").append(object.getId()); } @@ -225,14 +244,18 @@ } @Override - public String createCompleteSetupMethod(JAXXCompiler compiler, CompiledObject object, JavaFile javaFile) { + public String createCompleteSetupMethod(JAXXCompiler compiler, + CompiledObject object, + JavaFile javaFile) { StringBuffer code = new StringBuffer(); String eol = JAXXCompiler.getLineSeparator(); if (object.getId().startsWith("$")) { String additionCode = object.getAdditionCode(); //TC-20091025 only generate the code if not empty if (!additionCode.isEmpty()) { - code.append("// inline complete setup of ").append(object.getId()).append(eol); + code.append("// inline complete setup of "); + code.append(object.getId()); + code.append(eol); code.append(additionCode); } } else { @@ -247,8 +270,15 @@ String additionCode = object.getAdditionCode(); if (additionCode.length() > 0) { code.append(object.getAdditionMethodName()).append("();").append(eol); - additionCode = "if (!allComponentsCreated) {" + eol + " return;" + eol + "}" + eol + additionCode; - javaFile.addMethod(JavaFileGenerator.newMethod(Modifier.PROTECTED, "void", object.getAdditionMethodName(), additionCode, false)); + additionCode = "if (!allComponentsCreated) {" + eol + + " return;" + eol + "}" + eol + additionCode; + javaFile.addMethod(JavaFileGenerator.newMethod( + Modifier.PROTECTED, + "void", + object.getAdditionMethodName(), + additionCode, + false) + ); } } String result = code.toString(); @@ -256,7 +286,11 @@ } @Override - public boolean createInitializer(JAXXCompiler compiler, CompiledObject root, CompiledObject object, StringBuffer code, boolean lastWasMethodCall) { + public boolean createInitializer(JAXXCompiler compiler, + CompiledObject root, + CompiledObject object, + StringBuffer code, + boolean lastWasMethodCall) { String eol = JAXXCompiler.getLineSeparator(); if (object instanceof ScriptInitializer) { @@ -272,7 +306,9 @@ if (root.equals(object)) { String rootCode = root.getInitializationCode(compiler); if (rootCode != null && rootCode.length() > 0) { - code.append("// inline creation of ").append(object.getId()).append(eol); + code.append("// inline creation of "); + code.append(object.getId()); + code.append(eol); code.append(rootCode); //TC-20091025 generate client properties at creation time (not at setup time) // in some case can save to create a setup method (when there is only client properties @@ -297,12 +333,21 @@ return lastWasMethodCall; } - protected void addClientProperties(CompiledObject object, StringBuffer code, String eol) { + protected void addClientProperties(CompiledObject object, + StringBuffer code, + String eol) { //TC-20090327 generate client properties if (object.hasClientProperties()) { // generate putClientProperty invocations - for (Entry<String, String> entry : object.getClientProperties().entrySet()) { - code.append(object.getJavaCode()).append(".putClientProperty(\"").append(entry.getKey()).append("\", ").append(entry.getValue()).append(");").append(eol); + for (Entry<String, String> entry : + object.getClientProperties().entrySet()) { + code.append(object.getJavaCode()); + code.append(".putClientProperty(\""); + code.append(entry.getKey()); + code.append("\", "); + code.append(entry.getValue()); + code.append(");"); + code.append(eol); } } } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java 2010-08-30 08:07:12 UTC (rev 2054) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/decorators/HelpRootCompiledObjectDecorator.java 2010-08-30 10:01:11 UTC (rev 2055) @@ -42,14 +42,12 @@ * A decorator to place on a root compiled object to process javaHelp on the file. * * @author tchemit <chemit@codelutin.com> + * @plexus.component role-hint="help" role="jaxx.compiler.CompiledObjectDecorator" * @since 1.2 - * @plexus.component role-hint="help" role="jaxx.compiler.CompiledObjectDecorator" */ public class HelpRootCompiledObjectDecorator extends DefaultCompiledObjectDecorator { - /** - * the list of discovered helpId - */ + /** the list of discovered helpId */ protected static Set<String> helpIds = new HashSet<String>(); @Override @@ -71,8 +69,22 @@ } @Override - public void finalizeCompiler(JAXXCompiler compiler, CompiledObject root, CompiledObject object, JavaFile javaFile, String packageName, String className, String fullClassName) { - super.finalizeCompiler(compiler, root, object, javaFile, packageName, className, fullClassName); + public void finalizeCompiler(JAXXCompiler compiler, + CompiledObject root, + CompiledObject object, + JavaFile javaFile, + String packageName, + String className, + String fullClassName) { + super.finalizeCompiler(compiler, + root, + object, + javaFile, + packageName, + className, + fullClassName + ) + ; CompilerConfiguration options = compiler.getConfiguration(); if (options.isGenerateHelp()) { @@ -80,17 +92,29 @@ // add JAXXHelpUI interface Class<?> validatorInterface = JAXXHelpUI.class; String helpBrokerFQN = getBrokerFQN(compiler); - javaFile.addInterface(JAXXCompiler.getCanonicalName(validatorInterface) + "<" + helpBrokerFQN + ">"); + javaFile.addInterface( + JAXXCompiler.getCanonicalName(validatorInterface) + "<" + + helpBrokerFQN + ">"); - javaFile.addMethod(JavaFileGenerator.newMethod(Modifier.PUBLIC, "void", "registerHelpId", - "broker.installUI(component, helpId);", true, + javaFile.addMethod(JavaFileGenerator.newMethod( + Modifier.PUBLIC, + "void", + "registerHelpId", + "broker.installUI(component, helpId);", + true, new JavaArgument(helpBrokerFQN, "broker"), new JavaArgument("Component", "component"), - new JavaArgument("String", "helpId"))); + new JavaArgument("String", "helpId")) + ); - javaFile.addMethod(JavaFileGenerator.newMethod(Modifier.PUBLIC, "void", "showHelp", - "getBroker().showHelp(this, helpId);", true, - new JavaArgument("String", "helpId"))); + javaFile.addMethod(JavaFileGenerator.newMethod( + Modifier.PUBLIC, + "void", + "showHelp", + "getBroker().showHelp(this, helpId);", + true, + new JavaArgument("String", "helpId")) + ); StringBuilder buffer = new StringBuilder(); @@ -107,7 +131,11 @@ if (helpID != null) { buffer.append(eol); // detects a helpId to register - buffer.append("registerHelpId(_broker, ").append(o.getJavaCode()).append(", ").append(helpID).append(");"); + buffer.append("registerHelpId(_broker, "); + buffer.append(o.getJavaCode()); + buffer.append(", "); + buffer.append(helpID); + buffer.append(");"); //keep the helpID for helpSet generation helpIds.add(helpID); } @@ -115,7 +143,8 @@ // } if (buffer.length() > 0) { - StringBuilder extraCode = new StringBuilder(helpBrokerFQN).append(" _broker = getBroker();"); + StringBuilder extraCode = new StringBuilder(helpBrokerFQN); + extraCode.append(" _broker = getBroker();"); buffer.append(eol).append("_broker.prepareUI(this);"); buffer.append(eol);