Author: tchemit Date: 2011-04-21 17:14:35 +0200 (Thu, 21 Apr 2011) New Revision: 2267 Url: http://nuiton.org/repositories/revision/jaxx/2267 Log: add getDataBinding in JAXXObject and generate it 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-04-21 15:14:10 UTC (rev 2266) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java 2011-04-21 15:14:35 UTC (rev 2267) @@ -384,7 +384,7 @@ /** * */ - protected static final JavaMethod GET_DATA_BINDING_METHOD = newMethod( + protected static final JavaMethod GET_DATA_BINDINGS_METHOD = newMethod( PUBLIC, JAXXBinding.class.getName() + "[]", "getDataBindings", @@ -392,7 +392,19 @@ true ); + /** + * + */ + protected static final JavaMethod GET_DATA_BINDING_METHOD = newMethod( + PUBLIC, + JAXXBinding.class.getName(), + "getDataBinding", + "return " + FIELD_NAME_$BINDINGS + ".get(bindingId);", + true, + newArgument(TYPE_STRING, "bindingId") + ); + /** * */ @@ -669,6 +681,7 @@ addSimpleField(javaFile, BINDINGS_FIELD); javaFile.addMethod(GET_OBJECT_BY_ID_METHOD); addMethod(javaFile, REGISTER_DATA_BINDING_METHOD); + addMethod(javaFile, GET_DATA_BINDINGS_METHOD, JAXXBinding.class.getSimpleName()); addMethod(javaFile, GET_DATA_BINDING_METHOD, JAXXBinding.class.getSimpleName()); javaFile.addMethod(createApplyDataBindingMethod()); @@ -1216,7 +1229,7 @@ buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {"); buffer.append(eol); - buffer.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_APPLY_DATA_BINDING + "();"); + buffer.append(" getDataBinding(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_APPLY_DATA_BINDING + "();"); buffer.append(eol); buffer.append("}"); buffer.append(eol); @@ -1237,7 +1250,7 @@ buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {"); buffer.append(eol); - buffer.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_REMOVE_DATA_BINDING + "();"); + buffer.append(" getDataBinding(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_REMOVE_DATA_BINDING + "();"); buffer.append(eol); buffer.append("}"); return JavaElementFactory.newMethod( @@ -1268,7 +1281,7 @@ code.append("try {").append(eol); code.append(" if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {"); code.append(eol); - code.append(" " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_PROCESS_DATA_BINDING + "();"); + code.append(" getDataBinding(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_PROCESS_DATA_BINDING + "();"); code.append(eol); code.append(" }").append(eol); code.append("} finally {").append(eol);