[Jaxx-commits] r2195 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags

2 Feb 2011

Author: tchemit
Date: 2011-02-02 13:15:10 +0100 (Wed, 02 Feb 2011)
New Revision: 2195

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

Log:
improve code + do not add a ; on event scripts if a it ends by a }

Modified:
   trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java

Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java
===================================================================

--- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java	2011-02-02 12:14:24 UTC (rev 2194)
+++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java	2011-02-02 12:15:10 UTC (rev 2195)
@@ -642,8 +642,9 @@
                 }
                 continue;
             }
+            CompiledObject rootObject = compiler.getRootObject();
             if (name.equals(IMPLEMENTS_ATTRIBUTE)) {
-                if (object != compiler.getRootObject()) {
+                if (object != rootObject) {
                     // can ony be apply to root object
                     compiler.reportError("'" + IMPLEMENTS_ATTRIBUTE + "' attribute can only be found on root tag but was found on tag " + tag);
                     return;
@@ -656,7 +657,7 @@
             }
 
             if (name.equals(ABSTRACT_ATTRIBUTE)) {
-                if (object != compiler.getRootObject()) {
+                if (object != rootObject) {
                     // can ony be apply to root object
                     compiler.reportError("'" + ABSTRACT_ATTRIBUTE + "' attribute can only be found on root tag but was found on tag " + tag);
                     return;
@@ -667,7 +668,7 @@
 
             if (name.equals(GENERICTYPE_ATTRIBUTE)) {
                 //TC-20090313 check after all atributes been processed
-                if (object == compiler.getRootObject()) {
+                if (object == rootObject) {
                     compiler.setGenericType(value);
                 } else {
                     object.setGenericTypes(value.split(","));
@@ -676,7 +677,7 @@
             }
 
             if (name.equals(SUPER_GENERIC_TYPE_ATTRIBUTE)) {
-                if (object != compiler.getRootObject()) {
+                if (object != rootObject) {
                     // can ony be apply to root object
                     compiler.reportError("'" + SUPER_GENERIC_TYPE_ATTRIBUTE + "' attribute can only be found on root tag but was found on tag " + tag);
                     return;
@@ -696,7 +697,7 @@
 
             if (isEventHandlerName(name)) {
                 // event handler
-                if (!value.endsWith(";")) {
+                if (!value.endsWith(";") && !value.endsWith("}")) {
                     value += ";";
                 }
                 addEventHandler(object,

    

[Jaxx-commits] r2195 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags

tchemit＠users.nuiton.org