Author: tchemit Date: 2011-03-18 12:45:43 +0100 (Fri, 18 Mar 2011) New Revision: 2245 Url: http://nuiton.org/repositories/revision/jaxx/2245 Log: Evolution #1405: Improve import manager usage Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2011-03-18 11:20:11 UTC (rev 2244) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2011-03-18 11:45:43 UTC (rev 2245) @@ -388,7 +388,7 @@ PUBLIC, JAXXBinding.class.getName() + "[]", "getDataBindings", - "return " + FIELD_NAME_$BINDINGS + ".values().toArray(new " + JAXXBinding.class.getSimpleName() + "[" + FIELD_NAME_$BINDINGS + ".size()]);", + "return " + FIELD_NAME_$BINDINGS + ".values().toArray(new %s[" + FIELD_NAME_$BINDINGS + ".size()]);", true ); @@ -668,8 +668,8 @@ addSimpleField(javaFile, ACTIVE_BINDINGS_FIELD); addSimpleField(javaFile, BINDINGS_FIELD); javaFile.addMethod(GET_OBJECT_BY_ID_METHOD); - javaFile.addMethod(REGISTER_DATA_BINDING_METHOD); - javaFile.addMethod(GET_DATA_BINDING_METHOD); + addMethod(javaFile, REGISTER_DATA_BINDING_METHOD); + addMethod(javaFile, GET_DATA_BINDING_METHOD, JAXXBinding.class.getSimpleName()); javaFile.addMethod(createApplyDataBindingMethod()); javaFile.addMethod(createProcessDataBindingMethod()); @@ -712,14 +712,16 @@ protected void addLoggerSupport(JAXXCompiler compiler, JavaFile javaFile, String className) { if (compiler.getConfiguration().isAddLogger()) { - javaFile.addImport(LogFactory.class); +// javaFile.addImport(LogFactory.class); javaFile.addSimpleField(newField( PRIVATE | STATIC | FINAL, Log.class.getName(), "log", false, - "LogFactory.getLog(" + className + ".class)") + "%s.getLog(" + className + ".class)", + LogFactory.class.getName() + ) ); } } @@ -865,17 +867,18 @@ } else { addField(javaFile, PROPERTY_CHANGE_SUPPORT_FIELD); - javaFile.addMethod(GET_PROPERTY_CHANGE_SUPPORT_METHOD); - javaFile.addMethod(ADD_PROPERTY_CHANGE_SUPPORT_METHOD); - javaFile.addMethod(ADD_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD); - javaFile.addMethod(REMOVE_PROPERTY_CHANGE_SUPPORT_METHOD); - javaFile.addMethod(REMOVE_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD); - javaFile.addMethod(FIRE_PROPERTY_CHANGE_NAMED_METHOD); + addMethod(javaFile, GET_PROPERTY_CHANGE_SUPPORT_METHOD, + PropertyChangeSupport.class.getName()); + addMethod(javaFile, ADD_PROPERTY_CHANGE_SUPPORT_METHOD); + addMethod(javaFile, ADD_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD); + addMethod(javaFile, REMOVE_PROPERTY_CHANGE_SUPPORT_METHOD); + addMethod(javaFile, REMOVE_PROPERTY_CHANGE_SUPPORT_NAMED_METHOD); + addMethod(javaFile, FIRE_PROPERTY_CHANGE_NAMED_METHOD); } } protected JavaMethod addRegisteredDefaultBindingsMethod(JAXXCompiler compiler, - JavaFile javaFile) { + JavaFile javaFile) { DataBinding[] bindings = compiler.getBindingHelper().getDataBindings(); StringBuilder initCode = new StringBuilder(); @@ -898,10 +901,10 @@ } } JavaMethod method = newMethod(PRIVATE, - TYPE_VOID, - METHOD_NAME_$REGISTER_DEFAULT_BINDINGS, - initCode.toString(), - false + TYPE_VOID, + METHOD_NAME_$REGISTER_DEFAULT_BINDINGS, + initCode.toString(), + false ); javaFile.addMethod(method); return method;