[Laszlo-checkins] r8589 - in openlaszlo/trunk: WEB-INF/lps/lfc/data test/swf9
pbr@openlaszlo.org
pbr at openlaszlo.org
Tue Apr 8 08:48:52 PDT 2008
Author: pbr
Date: 2008-04-08 08:48:43 -0700 (Tue, 08 Apr 2008)
New Revision: 8589
Added:
openlaszlo/trunk/test/swf9/data-5a.lzx
Modified:
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataAttrBind.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataNode.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataProvider.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataRequest.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapath.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapointer.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataset.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatasource.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDataProvider.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDatasource.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzLazyReplicationManager.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzMiniNode.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzParam.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzReplicationManager.lzs
openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
openlaszlo/trunk/test/swf9/data-5.lzx
Log:
Change 20080407-Philip-4 by Philip at Philip-DC on 2008-04-07 12:32:22 EDT
in /cygdrive/f/laszlo/svn/src/svn/openlaszlo/trunk2
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: Fix data examples for swf9
New Features:
Bugs Fixed: LPP-5704
Technical Reviewer: hqm
QA Reviewer: (pending)
Doc Reviewer: (pending)
Documentation:
Release Notes:
Details:
The unit tests in /test/swf9/data-*.lzx were broken since the last update of the data classes. This fixes that as well as marks all newly added variables as private.
All - Newly added variables are marked private. Set ConstructorMap
LzDataPath.lzs - Fix casting, Add setters needed for swf LzDataProvider.lzs - Add missing ctor LzHTTPDataProvider.lzs - Add missing ctor. Define missing variable LzHTTPDataSource.lzs - Add missing ctor.
data-5.lzx - set proxied=false so test passes in swf9 data-5a.lzx - proxied version. Currently fails in swf9 because some classes haven't been ported to swf9 yet.
Tests:
/test/swf9/test-4.lzx, test/swf9/test-5.lzx in swf9
smokecheck in dhtml, swf
/test/lfc/data/alldata.lzx in dhtml, swf
Other apps continue to run in dhtml, swf
Files:
M test/swf9/data-5.lzx
A test/swf9/data-5a.lzx
M WEB-INF/lps/lfc/data/LzMiniNode.lzs
M WEB-INF/lps/lfc/data/LzReplicationManager.lzs
M WEB-INF/lps/lfc/data/LzDatapointer.lzs
M WEB-INF/lps/lfc/data/LzDataNode.lzs
M WEB-INF/lps/lfc/data/LzDataRequest.lzs
M WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
M WEB-INF/lps/lfc/data/LzLazyReplicationManager.lzs
M WEB-INF/lps/lfc/data/LzDataProvider.lzs
M WEB-INF/lps/lfc/data/LzHTTPDataProvider.lzs
M WEB-INF/lps/lfc/data/LzDataset.lzs
M WEB-INF/lps/lfc/data/LzDatapath.lzs
M WEB-INF/lps/lfc/data/LzHTTPDatasource.lzs
M WEB-INF/lps/lfc/data/LzDatasource.lzs
M WEB-INF/lps/lfc/data/LzParam.lzs
M WEB-INF/lps/lfc/data/LzDataAttrBind.lzs
Changeset: http://svn.openlaszlo.org/openlaszlo/patches/20080407-Philip-4.tar
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataAttrBind.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataAttrBind.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataAttrBind.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -28,9 +28,13 @@
// prototype.rerunxpath = true; // Override value defined in LzDatapointer
+/** @access private */
var $pathbinding = true;
+/** @access private */
var setAttr;
+/** @access private */
var pathparent;
+/** @access private */
var node;
override function __LZsendUpdate ( a = null , b = null ){
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataNode.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataNode.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataNode.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -67,8 +67,6 @@
mixin LzDataNodeMixin
{
-// #include "data/LzDataNode.lzs"
-// Manual copy of LzDataNode.lzx
/** @lzxtype event */
var onownerDocument = LzDeclaredEvent;
@@ -79,8 +77,11 @@
*/
var nodeType:*; // This is undefined. Set elsewhere
+/** @access private */
var parentNode:* = null;
+/** @access private */
var ownerDocument:*;
+/** @access private */
var __LZo:* = -1;
/** An array of children of this node
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataProvider.lzs
===================================================================
(Binary files differ)
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataRequest.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataRequest.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataRequest.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -89,3 +89,5 @@
}
+
+ConstructorMap[LzDataRequest.tagname] = LzDataRequest;
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapath.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapath.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapath.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -91,9 +91,13 @@
/** @access private */
var __LZtakeDPSlot = true;
+/** @access private */
var storednodes;
+/** @access private */
var __LZneedsUpdateAfterInit;
+/** @access private */
var __LZdepChildren;
+/** @access private */
var sel;
@@ -450,7 +454,7 @@
var ppdo = this.parsedPath ? this.parsedPath.operator : null;
if ( this.immediateparent is LzDatapath && ppdo != null){
- var dat = LzDatapath(this.immediateparent).updateData();
+ var dat = (this.immediateparent cast LzDatapath).updateData();
if ( ppdo =="nodeName" ){
this.setNodeName( dat );
} else if ( ppdo =="__LZgetText" ){
@@ -579,9 +583,18 @@
/**
* @access private
+ * @devnote Setter for datacontrolsvisiblity
+ */
+function $lzc$set_datacontrolsvisibility (v)
+{ this.datacontrolsvisibility = v;}
+
+/**
+ * @access private
* @devnote Setter for __LZmanager
*/
-function $lzc$set___LZmanager ( m ) {
+function $lzc$set___LZmanager (m) { this.__LZmanager(m); }
+
+function __LZmanager ( m ) {
this.__LZisclone = true;
this.immediateparent.cloneManager = m;
this.parsedPath = m.parsedPath;
@@ -602,7 +615,7 @@
if ( p && this.sel != p.sel ){
this.sel = p.sel || false;
if ( this.immediateparent is LzDatapath){
- LzDatapath(this.immediateparent).setSelected( this.sel );
+ (this.immediateparent cast LzDatapath).setSelected( this.sel );
}
}
@@ -690,3 +703,4 @@
} // End of LzDatapth
+ConstructorMap[LzDatapath.tagname] = LzDatapath;
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapointer.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapointer.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatapointer.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -116,15 +116,25 @@
/** @access private */
var __LZtrackDel = null;
+/** @access private */
var xpath = null;
+/** @access private */
var parsedPath = null;
+/** @access private */
var __LZlastdotdot = null;
+/** @access private */
var __LZspecialDotDot = false;
+/** @access private */
var __LZspecialOndata = false;
+/** @access private */
var __LZdotdotCheckDel;
+/** @access private */
var __LZoldDataDel;
+/** @access private */
var __LZoldOndataWarn;
+/** @access private */
var errorDel;
+/** @access private */
var timeoutDel;
@@ -406,9 +416,9 @@
}
var newc = null;
-// [2008-03-12 pbr] Can't use 'in' in swf9
+// [2008-04-03 pbr] Find a simpler way to represent this
// if ( this.context && 'getContext' in this.context ){
- if ( this.context && (this.context is LzDatapointer || this.context is LzDataset)) {
+ if ( this.context && (this.context is LzDatapointer || this.context is LzDataset || this.context is AnonDatasetGenerator)) {
newc = this.context.getContext();
}
@@ -1566,3 +1576,5 @@
}
} // End of LzDatapointer
+
+ConstructorMap[LzDatapointer.tagname] = LzDatapointer;
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataset.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataset.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDataset.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -102,15 +102,24 @@
/** @access private */
LzDataset.attributes.name = 'localdata';
+/** @access private */
static var slashPat = "/";
+/** @access private */
var dataprovider = defaultdataprovider;
+/** @access private */
var multirequest = false;
+/** @access private */
var dataRequest = null;
+/** @access private */
var dataRequestClass = LzHTTPDataRequest;
+/** @access private */
var dsloadDel = null;
+/** @access private */
var errorstring;
+/** @access private */
var reqOnInitDel;
+/** @access private */
var secureport;
/** @lzxtype event */
@@ -124,8 +133,10 @@
*/
var ontimeout = LzDeclaredEvent;
+/** @access private */
var timeout = 60000;
+/** @access private */
var postbody = null;
// var src = null;
@@ -856,6 +867,7 @@
} // End of LzDataset
+ConstructorMap[LzDataset.tagname] = LzDataset;
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatasource.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatasource.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzDatasource.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -53,6 +53,7 @@
* @lzxdefault inherit
*/
var proxied = null;
+/** @access private */
var src;
function LzDatasource ( parent:* = null , attrs:* = null, children:* = null, instcall:* = null) {
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDataProvider.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDataProvider.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDataProvider.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -31,6 +31,10 @@
class LzHTTPDataProvider extends LzDataProvider {
+ function LzHTTPDataProvider ( parent:* = null, attrs:* = null, children:* = null, instcall:* = null) {
+ super(parent,attrs,children,instcall);
+ }
+
/** @access private
* @param LzHTTPDataRequest dreq: The data request
*/
@@ -179,8 +183,7 @@
}
// convert url back to string
- url = lzurl.toString();
- var url;
+ var url = lzurl.toString();
if (proxied) {
// TODO [hqm 2007-08-03] make the API for makeProxiedURL take an explicit host arg,
// so we can set the proxy from user code
@@ -306,6 +309,11 @@
class LzHTTPDataRequest extends LzDataRequest {
+
+ function LzHTTPDataRequest (requestor = null) {
+ super(requestor);
+ }
+
var method = "GET"; // : String; // GET, POST, PUT, DELETE
var postbody; // : String
var proxied; // : boolean
@@ -332,6 +340,7 @@
*/
var responseheaders = null;
+ var getresponseheaders = null;
/** Flag to say whether data is cacheable at the server
@type Boolean
@@ -370,3 +379,4 @@
var httpdataprovider = new LzHTTPDataProvider();
var defaultdataprovider = httpdataprovider;
+
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDatasource.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDatasource.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzHTTPDatasource.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -34,6 +34,10 @@
var reqtype = "GET";
+ function LzHTTPDatasource ( parent:* = null , attrs:* = null, children:* = null, instcall:* = null) {
+ super(parent,attrs,children,instcall);
+ }
+
/**
* Compute the boolean value for 'proxied', using inheritance if needed
* @access private
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzLazyReplicationManager.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzLazyReplicationManager.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzLazyReplicationManager.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -52,15 +52,23 @@
// prototype.pooling = true; // Defined in LzReplicationManager
/** The axis for layout of replicated views */
+/** @access private */
var axis = "y"
+/** @access private */
var sizeAxis;
+/** @access private */
var cloneimmediateparent;
+/** @access private */
var updateDel;
+/** @access private */
var __LZoldnodelen;
+/** @access private */
var cloneimmediateparnt;
/** The spacing between replicated views */
+/** @access private */
var spacing = 0;
+/** @access private */
var mask = null;
/**
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzMiniNode.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzMiniNode.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzMiniNode.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -25,10 +25,14 @@
function LzMiniNode ( parent:* = null, attrs:* = null, children:* = null, instcall:* = null){
}
+/** @access private */
var children:Array = [];
+/** @access private */
var __LZdeleted:Boolean = false;
+/** @access private */
var sel; // Also defined in LzDatapath
+/** @access private */
var setAttribute = LzNode.prototype.setAttribute;
function _dbg_name () {}
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzParam.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzParam.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzParam.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -49,6 +49,7 @@
//undefine all setters but name and id
//setters.$hasdefaultattrs = -1;
+/** @access private */
var d:* = null;
@@ -92,7 +93,9 @@
}
// default separator and delimiter
+/** @access private */
var dlm = "&";
+/** @access private */
var sep = "=";
/**
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzReplicationManager.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzReplicationManager.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzReplicationManager.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -89,18 +89,30 @@
function $lzc$set_sortorder(v) { this.setComparator(v); }
override function $lzc$set_datapath(v) { this.setXPath(v); }
+/** @access private */
var asyncnew = true;
+/** @access private */
var initialnodes;
+/** @access private */
var clonePool;
+/** @access private */
var cloneClass;
+/** @access private */
var cloneParent;
+/** @access private */
var cloneAttrs;
+/** @access private */
var cloneChildren;
+/** @access private */
var hasdata;
+/** @access private */
var _t;
+/** @access private */
var orderpath;
+/** @access private */
var comp_orderf; // Was this.orderf.comp
+/** @access private */
var op_orderf; // Was this.orderf.op
// var datacontrolsvisibility = false; // Defined in LzDatapath
@@ -448,6 +460,7 @@
var cl = this.clones[ i ] ;
var iplusoffset = i + this.__LZdataoffset;
cl.clonenumber = iplusoffset ;
+
if (this.nodes) {
cl.datapath.setClonePointer( this.nodes[ iplusoffset ] );
}
Modified: openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs
===================================================================
--- openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/WEB-INF/lps/lfc/data/LzResizeReplicationManager.lzs 2008-04-08 15:48:43 UTC (rev 8589)
@@ -80,7 +80,9 @@
//need to destroy the original clone for resize in order to insert the
//appropriate setHeight call
+/** @access private */
var datasizevar;
+/** @access private */
var __LZresizeupdating;
// prototype.pooling = false; // Defined in LzReplicationManager
Modified: openlaszlo/trunk/test/swf9/data-5.lzx
===================================================================
--- openlaszlo/trunk/test/swf9/data-5.lzx 2008-04-08 14:00:17 UTC (rev 8588)
+++ openlaszlo/trunk/test/swf9/data-5.lzx 2008-04-08 15:48:43 UTC (rev 8589)
@@ -1,4 +1,4 @@
-<canvas height="80" width="500" >
+<canvas height="80" width="500" proxied="false">
<dataset name="myData" request="true" type="http" src="data.xml"/>
<attribute name="yvalue" value="0"/>
Added: openlaszlo/trunk/test/swf9/data-5a.lzx
Property changes on: openlaszlo/trunk/test/swf9/data-5a.lzx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
More information about the Laszlo-checkins
mailing list