Author: tchemit Date: 2013-11-28 18:07:12 +0100 (Thu, 28 Nov 2013) New Revision: 2760 Url: http://nuiton.org/projects/jaxx/repository/revisions/2760 Log: refs #2946: Introduce UIHandler contract and a way to glue it to any generated jaxx object (still some bad code...) Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2013-11-28 15:45:30 UTC (rev 2759) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2013-11-28 17:07:12 UTC (rev 2760) @@ -1086,7 +1086,9 @@ code.append(" return;").append(eol); code.append("}").append(eol); code.append(JavaFileGenerator.addDebugLoggerInvocation(compiler, "this")); - if (compiler.isUseHandler()) { + boolean useHandler = compiler.isUseHandler(); + + if (useHandler) { code.append("handler." + METHOD_NAME$BEFORE_INIT + "(this);").append(eol); } code.append(FIELD_NAME_$OBJECT_MAP + ".put("); @@ -1133,6 +1135,10 @@ } code.append(METHOD_NAME_$COMPLETE_SETUP + "();"); code.append(eol); + + if (useHandler) { + code.append("handler." + METHOD_NAME$AFTER_INIT + "(this);").append(eol); + } JavaMethod method = JavaElementFactory.newMethod(PRIVATE, TYPE_VOID, METHOD_NAME_$INITIALIZE, @@ -1170,17 +1176,12 @@ MethodDescriptor method = compiler.getScriptMethod(METHOD_NAME_$AFTER_COMPLETE_SETUP); - boolean useHandler = compiler.isUseHandler(); - if (useHandler) { + if (method != null) { + if (compiler.isUseHandler()) { - code.append("handler." + METHOD_NAME$AFTER_INIT + "(this);").append(eol); + compiler.reportWarning("Should not use deprecated api $afterCompleteSetup, prefer declare a 'handler' attribute on root object."); - if (method != null) { - compiler.reportWarning("Should not use deprecated api $afterCompleteSetup, prefer declare a 'handler' attribute on root object."); } - } - - if (method != null) { code.append(METHOD_NAME_$AFTER_COMPLETE_SETUP + "();").append(eol); } JavaMethod javaMethod = JavaElementFactory.newMethod(PRIVATE, Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java 2013-11-28 15:45:30 UTC (rev 2759) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tasks/GenerateConstructorsTask.java 2013-11-28 17:07:12 UTC (rev 2760) @@ -422,7 +422,6 @@ code.append(");").append(eol); } - addHandlerBeforeInitInvocation(compiler, code); code.append(DefaultFinalizer.METHOD_NAME_$INITIALIZE + "();"); code.append(eol); JavaConstructor constructor = JavaElementFactory.newConstructor(PUBLIC, @@ -433,12 +432,6 @@ compiler.getJavaFile().addConstructor(constructor); } - public void addHandlerBeforeInitInvocation(JAXXCompiler compiler, StringBuilder code) { - if (compiler.isUseHandler()) { - code.append("handler." + METHOD_NAME$BEFORE_INIT + "(this);"); - } - } - protected void addConstructorWithInitialContext(JAXXCompiler compiler, String className, List<String> constructorTypes, @@ -507,7 +500,6 @@ code.append(".initContext(this, " + PARAMETER_NAME_PARENT_CONTEXT + ");"); code.append(eol); } - addHandlerBeforeInitInvocation(compiler, code); code.append(DefaultFinalizer.METHOD_NAME_$INITIALIZE + "();"); code.append(eol); JavaConstructor constructor = JavaElementFactory.newConstructor(PUBLIC,