[Laszlo-checkins] r13698 - openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler

[hqm@openlaszlo.org]

Author: hqm
Date: 2009-04-16 10:22:39 -0700 (Thu, 16 Apr 2009)
New Revision: 13698

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
Log:
Change 20090416-hqm-O by hqm at badtzmaru.home on 2009-04-16 11:16:08 EDT
    in /Users/hqm/openlaszlo/trunk5
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: don't add 'override' to static method declarations

New Features:

Bugs Fixed: LPP-8062

Technical Reviewer: ptw
QA Reviewer: (pending)
Doc Reviewer: (pending)

Documentation:

Release Notes:

Details:

+ The swf9 compiler gives an error if you put 'override' in a static method declaration.


Tests:

compile and run test/lztest/lztest-static-attrs.lzx swf9, without error



Modified: openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java	2009-04-16 15:17:42 UTC (rev 13697)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java	2009-04-16 17:22:39 UTC (rev 13698)
@@ -1651,7 +1651,8 @@
         body = body + "\n#endContent";
         if (canHaveMethods) {
             String adjectives = "";
-            if (override) { adjectives += " override"; }
+            // LPP-8062 script compiler will give an error if you declare 'override' on a static method
+            if (override && ALLOCATION_INSTANCE.equals(allocation)) { adjectives += " override"; }
             if (isfinal) { adjectives += " final"; }
             if (ALLOCATION_INSTANCE.equals(allocation) &&
                 // TODO: [2008-07-21 ptw] (LPP-5813) This should really be