[Laszlo-checkins] r11547 - in openlaszlo/trunk: WEB-INF/lps/server/src/org/openlaszlo/compiler demos/lzpix lps/components/base

[dda@openlaszlo.org]

Author: dda
Date: 2008-10-24 13:58:03 -0700 (Fri, 24 Oct 2008)
New Revision: 11547

Modified:
   openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java
   openlaszlo/trunk/demos/lzpix/app.lzx
   openlaszlo/trunk/lps/components/base/datalistselector.lzx
   openlaszlo/trunk/lps/components/base/listselector.lzx
Log:
Change 20081024-dda-5 by dda at lester.local on 2008-10-24 16:52:02 EDT
    in /Users/dda/laszlo/src/svn/openlaszlo/trunk-a
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Addendum to return types in SWF9: changed <method type="..." to <method returns="..."

New Features:

Bugs Fixed: LPP-7031

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

Documentation:

Release Notes:

Details:
    Somehow this didn't get into my (large) previous checkin:
    Addressing one of the points of the review - returns="Boolean" reads better than type="Boolean".

Tests:
    Reran all the tests from last time.



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	2008-10-24 20:40:59 UTC (rev 11546)
+++ openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/NodeModel.java	2008-10-24 20:58:03 UTC (rev 11547)
@@ -1450,7 +1450,7 @@
         String args = CompilerUtils.attributeLocationDirective(element, "args") +
             XMLUtils.getAttributeValue(element, "args", "");
         String body = element.getText();
-        String returnType = element.getAttributeValue("type");
+        String returnType = element.getAttributeValue("returns");
 
         if ((name == null || !ScriptCompiler.isIdentifier(name)) &&
             (event == null || !ScriptCompiler.isIdentifier(event))) {

Modified: openlaszlo/trunk/demos/lzpix/app.lzx
===================================================================
--- openlaszlo/trunk/demos/lzpix/app.lzx	2008-10-24 20:40:59 UTC (rev 11546)
+++ openlaszlo/trunk/demos/lzpix/app.lzx	2008-10-24 20:58:03 UTC (rev 11547)
@@ -295,7 +295,7 @@
 
 
             <selectionmanager name="selman" toggle="false">
-                <method name="isMultiSelect" args="s" type="Boolean" >
+                <method name="isMultiSelect" args="s" returns="Boolean" >
                     return lz.Keys.isKeyDown( "control" ) || lz.Keys.isKeyDown( "shift" ) ||
                            parent.isRectangleSelecting;
                 </method>

Modified: openlaszlo/trunk/lps/components/base/datalistselector.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/datalistselector.lzx	2008-10-24 20:40:59 UTC (rev 11546)
+++ openlaszlo/trunk/lps/components/base/datalistselector.lzx	2008-10-24 20:58:03 UTC (rev 11547)
@@ -17,11 +17,11 @@
        <!-- already defined in LzNode -->
        <!--<attribute name="cloneManager" value="null"/>-->
 
-       <method name="isRangeSelect" args="item" override="true" type="Boolean"><![CDATA[
+       <method name="isRangeSelect" args="item" override="true" returns="Boolean"><![CDATA[
            return this.multiselect && super.isRangeSelect(item);
        ]]></method>
 
-       <method name="isMultiSelect" args="item" override="true" type="Boolean"><![CDATA[
+       <method name="isMultiSelect" args="item" override="true" returns="Boolean"><![CDATA[
            return this._forcemulti || (this.multiselect && super.isMultiSelect(item));
        ]]></method>
 

Modified: openlaszlo/trunk/lps/components/base/listselector.lzx
===================================================================
--- openlaszlo/trunk/lps/components/base/listselector.lzx	2008-10-24 20:40:59 UTC (rev 11546)
+++ openlaszlo/trunk/lps/components/base/listselector.lzx	2008-10-24 20:58:03 UTC (rev 11547)
@@ -14,11 +14,11 @@
         <!--- @keywords private -->
         <attribute name="_forcemulti" value="false" type="boolean"/>
 
-        <method name="isRangeSelect" args="item" override="true" type="Boolean"><![CDATA[
+        <method name="isRangeSelect" args="item" override="true" returns="Boolean"><![CDATA[
             return this.multiselect && super.isRangeSelect(item);
         ]]></method>
 
-        <method name="isMultiSelect" args="item" override="true" type="Boolean"><![CDATA[
+        <method name="isMultiSelect" args="item" override="true" returns="Boolean"><![CDATA[
             return this._forcemulti || (this.multiselect && super.isMultiSelect(item));
         ]]></method>