r1919 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers - Jaxx-commits

18 May 2010

Author: tchemit
Date: 2010-05-18 19:59:04 +0200 (Tue, 18 May 2010)
New Revision: 1919

Url: http://nuiton.org/repositories/revision/jaxx/1919

Log:
remove very old comment code

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	2010-05-18 17:58:27 UTC (rev 1918)
+++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/DefaultFinalizer.java	2010-05-18 17:59:04 UTC (rev 1919)
@@ -448,9 +448,6 @@
 
         javaFile.addBodyCode(compiler.getBodyCode().toString());
 
-//        javaFile.addMethod(REGISTER_DATA_BINDING_METHOD);
-//        javaFile.addMethod(GET_DATA_BINDING_METHOD);
-
         if (hasDataBindings) {
 
             // create the $registerDefaultBindings method
@@ -480,9 +477,6 @@
         }
 
         javaFile.addMethod(createCompleteSetupMethod(compiler, javaFile));
-//        javaFile.addMethod(createApplyDataBindingMethod(superclassIsJAXXObject, hasDataBindings));
-//        javaFile.addMethod(createProcessDataBindingMethod(superclassIsJAXXObject, hasDataBindings));
-//        javaFile.addMethod(createRemoveDataBindingMethod(superclassIsJAXXObject, hasDataBindings));
 
         addEventHandlers(compiler, javaFile);
     }
@@ -495,7 +489,6 @@
     protected JavaMethod createRegisterDefaultBindingsMethod(JAXXCompiler compiler) {
         DataBinding[] bindings = compiler.getBindingHelper().getDataBindings();
         StringBuilder initCode = new StringBuilder();
-//        if (bindings.legth > 0) {
 
         String eol = JAXXCompiler.getLineSeparator();
         JavaFileGenerator generator = new JavaFileGenerator(eol, true);
@@ -597,10 +590,13 @@
 
     protected void addEventHandlers(JAXXCompiler compiler, JavaFile javaFile) {
         for (Map.Entry<String, Map<ClassDescriptor, List<EventHandler>>> e1 : compiler.getEventHandlers().entrySet()) {
+
             // outer loop is iterating over different objects (well, technically, different Java expressions)
             for (Map.Entry<ClassDescriptor, List<EventHandler>> e2 : e1.getValue().entrySet()) {
+
                 // iterate over different types of listeners for this particular object (MouseListener, ComponentListener, etc.)
                 for (EventHandler handler : e2.getValue()) {
+
                     // iterate over individual event handlers of a single type
                     String methodName = compiler.getEventHandlerMethodName(handler);
                     MethodDescriptor listenerMethod = handler.getListenerMethod();
@@ -763,102 +759,33 @@
         return result.toString();
     }
 
-    //    protected JavaMethod createApplyDataBindingMethod(boolean superclassIsJAXXObject, boolean haveBinding) {
     protected JavaMethod createApplyDataBindingMethod() {
         StringBuilder buffer = new StringBuilder();
         String eol = JAXXCompiler.getLineSeparator();
 
-//        if (haveBinding) {
-//            if (superclassIsJAXXObject)
         buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            else {
-//                buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            }
         buffer.append("    " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_APPLY_DATA_BINDING + "();").append(eol);
         buffer.append("}");
-
-//        }
-//        if (superclassIsJAXXObject) {
-//
-//            if (haveBinding) {
-//                buffer.append(" else {").append(eol).append("    ");
-//            }
-//            buffer.append("super." + METHOD_NAME_APPLY_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");").append(eol);
-//
-//            if (haveBinding) {
-//                buffer.append("    return;").append(eol).append("}");
-//            }
-//
-//        }
-
-//        if (haveBinding) {
-//            if (superclassIsJAXXObject)
-//                buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            else {
-//                buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            }
-//            buffer.append("    " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_APPLY_DATA_BINDING + "();").append(eol);
-//            buffer.append("}");
-//
-//        }
-//        if (superclassIsJAXXObject) {
-//
-//            if (haveBinding) {
-//                buffer.append(" else {").append(eol).append("    ");
-//            }
-//            buffer.append("super." + METHOD_NAME_APPLY_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");").append(eol);
-//
-//            if (haveBinding) {
-//                buffer.append("    return;").append(eol).append("}");
-//            }
-//
-//        }
         buffer.append(eol).append(METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");");
         return newMethod(PUBLIC, TYPE_VOID, METHOD_NAME_APPLY_DATA_BINDING, buffer.toString(), true,
                 new JavaArgument(TYPE_STRING, PARAMETER_NAME_$BINDING));
     }
 
     protected JavaMethod createRemoveDataBindingMethod() {
-//    protected JavaMethod createRemoveDataBindingMethod(boolean superclassIsJAXXObject, boolean haveBinding) {
         StringBuilder buffer = new StringBuilder();
         String eol = JAXXCompiler.getLineSeparator();
 
         buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
         buffer.append("    " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_REMOVE_DATA_BINDING + "();").append(eol);
         buffer.append("}");
-
-//        if (haveBinding) {
-//
-//            if (superclassIsJAXXObject) {
-//                buffer.append("if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            } else {
-//                buffer.append("if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            }
-//            buffer.append("    " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_REMOVE_DATA_BINDING + "();").append(eol);
-//            buffer.append("}");
-//
-//
-//        }
-//        if (superclassIsJAXXObject) {
-//
-//            if (haveBinding) {
-//                buffer.append(" else {").append(eol).append("    ");
-//            }
-//            buffer.append("super." + METHOD_NAME_REMOVE_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ");").append(eol);
-//
-//            if (haveBinding) {
-//                buffer.append("}");
-//            }
-//        }
         return newMethod(PUBLIC, TYPE_VOID, METHOD_NAME_REMOVE_DATA_BINDING, buffer.toString(), true,
                 new JavaArgument(TYPE_STRING, PARAMETER_NAME_$BINDING));
     }
 
     protected JavaMethod createProcessDataBindingMethod() {
-//    protected JavaMethod createProcessDataBindingMethod(boolean superclassIsJAXXObject, boolean haveBinding) {
         StringBuffer code = new StringBuffer();
         String eol = JAXXCompiler.getLineSeparator();
-        //boolean superclassIsJAXXObject = ClassDescriptorHelper.getClassDescriptor(JAXXObject.class).isAssignableFrom(compiler.getRootObject().getObjectClass());
+        
         // the force parameter forces the update to happen even if it is already in activeBindings.  This
         // is used on superclass invocations b/c by the time the call gets to the superclass, it is already
         // marked active and would otherwise be skipped
@@ -874,33 +801,6 @@
         code.append("} finally {").append(eol);
         code.append("    " + FIELD_NAME_$ACTIVE_BINDINGS + ".remove(" + PARAMETER_NAME_$BINDING + ");").append(eol);
         code.append("}").append(eol);
-
-//        if (haveBinding) {
-//            code.append("    if (!$force && " + FIELD_NAME_$ACTIVE_BINDINGS + ".contains(" + PARAMETER_NAME_$BINDING + ")) { ");
-//            code.append(eol);
-//            code.append("    return;").append(eol);
-//            code.append("}").append(eol);
-//            code.append(FIELD_NAME_$ACTIVE_BINDINGS + ".add(" + PARAMETER_NAME_$BINDING + ");").append(eol);
-//            code.append("try {").append(eol);
-//            if (superclassIsJAXXObject) {
-//                code.append("    if (" + FIELD_NAME_ALL_COMPONENTS_CREATED + " && " + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            } else {
-//                code.append("    if (" + FIELD_NAME_$BINDINGS + ".containsKey(" + PARAMETER_NAME_$BINDING + ")) {").append(eol);
-//            }
-//            code.append("        " + FIELD_NAME_$BINDINGS + ".get(" + PARAMETER_NAME_$BINDING + ")." + METHOD_NAME_PROCESS_DATA_BINDING + "();").append(eol);
-//            code.append("    }");
-//            if (superclassIsJAXXObject) {
-//                code.append(" else {").append(eol);
-//                code.append("        super." + METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ", true);").append(eol);
-//                code.append("    }");
-//            }
-//            code.append(eol);
-//            code.append("} finally {").append(eol);
-//            code.append("    " + FIELD_NAME_$ACTIVE_BINDINGS + ".remove(" + PARAMETER_NAME_$BINDING + ");").append(eol);
-//            code.append("}").append(eol);
-//        } else if (superclassIsJAXXObject) {
-//            code.append("super." + METHOD_NAME_PROCESS_DATA_BINDING + "(" + PARAMETER_NAME_$BINDING + ", true);").append(eol);
-//        }
         return newMethod(PUBLIC, TYPE_VOID, METHOD_NAME_PROCESS_DATA_BINDING, code.toString(), true,
                 new JavaArgument(TYPE_STRING, PARAMETER_NAME_$BINDING), new JavaArgument(TYPE_BOOLEAN, "$force"));
     }

    

r1919 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers

tchemit＠users.nuiton.org

tags

participants (1)