r1597 - branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/css - Jaxx-commits

26 Oct 2009

Author: tchemit
Date: 2009-10-26 03:40:51 +0100 (Mon, 26 Oct 2009)
New Revision: 1597

Modified:
   branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java
Log:
remove commented unused code
clean code

Modified: branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java
===================================================================

--- branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java	2009-10-26 02:36:35 UTC (rev 1596)
+++ branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/css/StylesheetHelper.java	2009-10-26 02:40:51 UTC (rev 1597)
@@ -158,70 +158,6 @@
         } catch (NoSuchMethodException e) {
             compiler.reportError("mouseover pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
         }
-
-        /*if (pseudoClass.equals("mouseover")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".add", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mouseEntered",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mouseover pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.equals("mouseout")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".add", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mouseExited",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        compiler.appendInitDataBindings("{" + propertyCode + "}");
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mouseout pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.equals("mousedown")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".add", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mousePressed",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mousedown pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.equals("mouseup")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".add", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mouseReleased",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        compiler.appendInitDataBindings("{" + propertyCode + "}");
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mouseup pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.startsWith("{")) {
-        pseudoClass = pseudoClass.substring(1, pseudoClass.length() - 1).trim();
-        pseudoClass = replaceObjectReferences(pseudoClass, object.getJavaCode());
-        String dest = object.getId() + ".style." + pseudoClass + ".add";
-        String destCode = TypeManager.getJavaCode(dest);
-        if (compiler.hasProcessDataBinding()) {
-        compiler.appendProcessDataBinding("else ");
-        }
-        compiler.appendProcessDataBinding("if ($dest.equals(" +  destCode + ")) { if (" + pseudoClass + ") { "+ propertyCode + "} }");
-        new DataSource(dest, pseudoClass, compiler).compile("new jaxx.runtime.DataBindingListener(" + compiler.getRootObject().getJavaCode() + ", " + destCode + ")");
-        compiler.appendInitDataBindings("applyDataBinding("+ destCode + ");");
-        } else
-        throw new IllegalArgumentException("unrecognized pseudoclass: " + pseudoClass);*/
     }
 
     public static void compilePseudoClassRemove(String pseudoClass, CompiledObject object, String propertyCode, JAXXCompiler compiler) throws CompilerException {
@@ -268,69 +204,6 @@
         } catch (NoSuchMethodException e) {
             compiler.reportError("mouseover pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
         }
-
-        /*if (pseudoClass.equals("mouseover")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".remove", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mouseExited",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mouseover pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.equals("mouseout")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".remove", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mouseEntered",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mouseout pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.equals("mousedown")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".remove", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mouseReleased",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mousedown pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.equals("mouseup")) {
-        try {
-        MethodDescriptor addMouseListener = object.getObjectClass().getMethodDescriptor("addMouseListener",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseListener.class)});
-        object.addEventHandler("style." + pseudoClass + ".remove", addMouseListener,
-        ClassDescriptorLoader.getClassDescriptor(MouseListener.class).getMethodDescriptor("mousePressed",
-        new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(MouseEvent.class)}),
-        propertyCode, compiler);
-        }
-        catch (NoSuchMethodException e) {
-        compiler.reportError("mouseup pseudoclass cannot be applied to object " + object.getObjectClass().getName() + " (no addMouseListener method)");
-        }
-        } else if (pseudoClass.startsWith("{")) {
-        pseudoClass = pseudoClass.substring(1, pseudoClass.length() - 1).trim();
-        pseudoClass = replaceObjectReferences(pseudoClass, object.getJavaCode());
-        String dest = object.getId() + ".style." + pseudoClass + ".remove";
-        String destCode = TypeManager.getJavaCode(dest);
-        if (compiler.hasProcessDataBinding()) {
-        compiler.appendProcessDataBinding("else ");
-        }
-        compiler.appendProcessDataBinding("if ($dest.equals(" + destCode + ")) { if (" + invert(pseudoClass) + ") { " + propertyCode + "} }");
-        new DataSource(dest, pseudoClass, compiler).compile("new jaxx.runtime.DataBindingListener(" + compiler.getRootObject().getJavaCode() + ", " + destCode + ")");
-        compiler.appendInitDataBindings("applyDataBinding(" + destCode + ");");
-        } else {
-        throw new IllegalArgumentException("unrecognized pseudoclass: " + pseudoClass);
-        }*/
     }
 
     public static String invert(String javaCode) {
@@ -366,9 +239,10 @@
             pseudoClass = pseudoClass.substring(0, pseudoClass.indexOf("["));
         }
         final StringBuffer buffer = new StringBuffer();
-        
+
         DefaultObjectHandler handler = TagManager.getTagHandler(object.getObjectClass());
         boolean valueDeclared = false;
+        String eol = JAXXCompiler.getLineSeparator();
         for (Map.Entry<String, String> e : properties.entrySet()) {
             String property = e.getKey();
             ClassDescriptor type = handler.getPropertyType(object, property, compiler);
@@ -376,8 +250,8 @@
             String valueCode;
             if (dataBinding != null) {
                 valueCode = "new jaxx.runtime.css.DataBinding(" + compiler.getJavaCode(object.getId() + "." + property + "." + priority) + ")";
-                new DataBinding(dataBinding, object.getId() + "." + property + "." + priority, handler.getSetPropertyCode(object.getJavaCode(),
-                        property, "(" + JAXXCompiler.getCanonicalName(type) + ") " + dataBinding, compiler), compiler).compile(false);
+                DataBinding dataBinding1 = new DataBinding(dataBinding, object.getId() + "." + property + "." + priority, handler.getSetPropertyCode(object.getJavaCode(), property, "(" + JAXXCompiler.getCanonicalName(type) + ") " + dataBinding, compiler));
+                dataBinding1.compile(compiler, false);
             } else {
                 try {
                     Class<?> typeClass = type != null ? ClassDescriptorLoader.getClass(type.getName(), type.getClassLoader()) : null;
@@ -391,12 +265,12 @@
                 buffer.append("java.lang.Object ");
                 valueDeclared = true;
             }
-            buffer.append("value = jaxx.runtime.css.Pseudoclasses.applyProperty(").append(compiler.getOutputClassName()).append(".this, ").append(object.getJavaCode()).append(", ").append(compiler.getJavaCode(property)).append(", ").append(valueCode).append(", jaxx.runtime.css.Pseudoclasses.wrap(").append(handler.getGetPropertyCode(object.getJavaCode(), property, compiler)).append("), ").append(priority).append(");").append(JAXXCompiler.getLineSeparator());
-            buffer.append("if (!(value instanceof jaxx.runtime.css.DataBinding)) {").append(JAXXCompiler.getLineSeparator());
+            buffer.append("value = jaxx.runtime.css.Pseudoclasses.applyProperty(").append(compiler.getOutputClassName()).append(".this, ").append(object.getJavaCode()).append(", ").append(compiler.getJavaCode(property)).append(", ").append(valueCode).append(", jaxx.runtime.css.Pseudoclasses.wrap(").append(handler.getGetPropertyCode(object.getJavaCode(), property, compiler)).append("), ").append(priority).append(");").append(eol);
+            buffer.append("if (!(value instanceof jaxx.runtime.css.DataBinding)) {").append(eol);
             String unwrappedValue = unwrap(type, "value");
             buffer.append("    ").append(handler.getSetPropertyCode(object.getJavaCode(), property, "(" + JAXXCompiler.getCanonicalName(type) +
-                    ") " + unwrappedValue, compiler)).append(JAXXCompiler.getLineSeparator());
-            buffer.append("}").append(JAXXCompiler.getLineSeparator());
+                    ") " + unwrappedValue, compiler)).append(eol);
+            buffer.append("}").append(eol);
         }
 
         if (pseudoClass.equals("focused")) {
@@ -424,8 +298,8 @@
             String valueCode;
             if (dataBinding != null) {
                 valueCode = "new jaxx.runtime.css.DataBinding(" + compiler.getJavaCode(object.getId() + "." + property + "." + priority) + ")";
-                new DataBinding(dataBinding, object.getId() + "." + property + "." + priority, handler.getSetPropertyCode(object.getJavaCode(),
-                        property, "(" + JAXXCompiler.getCanonicalName(type) + ") " + dataBinding, compiler), compiler).compile(false);
+                DataBinding dataBinding1 = new DataBinding(dataBinding, object.getId() + "." + property + "." + priority, handler.getSetPropertyCode(object.getJavaCode(), property, "(" + JAXXCompiler.getCanonicalName(type) + ") " + dataBinding, compiler));
+                dataBinding1.compile(compiler, false);
             } else {
                 try {
                     Class<?> typeClass = type != null ? ClassDescriptorLoader.getClass(type.getName(), type.getClassLoader()) : null;
@@ -439,12 +313,12 @@
                 buffer.append("java.lang.Object ");
                 valueDeclared = true;
             }
-            buffer.append("value = jaxx.runtime.css.Pseudoclasses.removeProperty(").append(compiler.getOutputClassName()).append(".this, ").append(object.getJavaCode()).append(", ").append(compiler.getJavaCode(property)).append(", ").append(valueCode).append(", jaxx.runtime.css.Pseudoclasses.wrap(").append(handler.getGetPropertyCode(object.getJavaCode(), property, compiler)).append("), ").append(priority).append(");").append(JAXXCompiler.getLineSeparator());
-            buffer.append("if (!(value instanceof jaxx.runtime.css.DataBinding)) {").append(JAXXCompiler.getLineSeparator());
+            buffer.append("value = jaxx.runtime.css.Pseudoclasses.removeProperty(").append(compiler.getOutputClassName()).append(".this, ").append(object.getJavaCode()).append(", ").append(compiler.getJavaCode(property)).append(", ").append(valueCode).append(", jaxx.runtime.css.Pseudoclasses.wrap(").append(handler.getGetPropertyCode(object.getJavaCode(), property, compiler)).append("), ").append(priority).append(");").append(eol);
+            buffer.append("if (!(value instanceof jaxx.runtime.css.DataBinding)) {").append(eol);
             String unwrappedValue = unwrap(type, "value");
             buffer.append("    ").append(handler.getSetPropertyCode(object.getJavaCode(), property, "(" + JAXXCompiler.getCanonicalName(type) +
-                    ") " + unwrappedValue, compiler)).append(JAXXCompiler.getLineSeparator());
-            buffer.append("}").append(JAXXCompiler.getLineSeparator());
+                    ") " + unwrappedValue, compiler)).append(eol);
+            buffer.append("}").append(eol);
         }
         compilePseudoClassRemove(pseudoClass, object, buffer.toString(), compiler);
     }

    

r1597 - branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/css

tchemit＠users.nuiton.org

tags

participants (1)