[jboss-cvs] jboss-profiler/java/webapp/lzx ...
Takuro Okada
t2-okada at nri.co.jp
Tue Dec 12 03:28:43 EST 2006
User: tokada
Date: 06/12/12 03:28:43
Modified: java/webapp/lzx Tag: JBossProfiler_Expansion treegrid.lzx
settingdialog.lzx webapplicationanalyzer.lzx
Log:
Corrected some bugs.
Revision Changes Path
No revision
No revision
1.1.2.2 +57 -56 jboss-profiler/java/webapp/lzx/Attic/treegrid.lzx
(In the diff below, changes in quantity of whitespace are not shown.)
Index: treegrid.lzx
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/webapp/lzx/Attic/treegrid.lzx,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- treegrid.lzx 26 Oct 2006 09:02:25 -0000 1.1.2.1
+++ treegrid.lzx 12 Dec 2006 08:28:43 -0000 1.1.2.2
@@ -97,7 +97,9 @@
<!-- hierarchical cell component for treegrid -->
- <class name="hcell" extends="view">
+ <class name="hcell" extends="view" clip="true">
+
+ <view name="contents">
<simplelayout axis="x" spacing="0"/>
<view width="8"/>
<view name="expander"
@@ -106,44 +108,45 @@
xoffset="6" yoffset="12"
stretches="both"
resource="lztree_arrow_rsc"
- frame="${parent.nodetype=='m' ? 3 : 1}">
+ frame="${classroot.nodetype=='m' ? 3 : 1}">
<animator name="rotator" attribute="rotation"
- to="${parent.parent.isexpanded ? 0 : 90}"
+ to="${classroot.isexpanded ? 0 : 90}"
duration="400" motion="easeout" start="false"/>
<handler name="onclick">
- parent._selectNode();
+ classroot._selectNode();
</handler>
</view>
<view name="iconfolder"
x="${this.x-2}" y="4"
width="12" height="10"
stretches="both"
- visible="${parent.nodetype=='p' ? true : false}"
+ visible="${classroot.nodetype=='p' ? true : false}"
resource="lztree_folder_rsc"
- frame="${parent.nodetype=='p' ? (parent.isexpanded ? 2 : 1) : 3}" />
+ frame="${classroot.nodetype=='p' ? (classroot.isexpanded ? 2 : 1) : 3}" />
<view name="iconleaf"
x="-12"
- visible="${parent.nodetype=='p' ? false : true}"
- resource="${parent.nodetype=='c' ? 'icon_class' : 'icon_method'}"/>
- <text name="label" width="${parent.width-120}"/>
+ visible="${classroot.nodetype=='p' ? false : true}"
+ resource="${classroot.nodetype=='c' ? 'icon_class' : 'icon_method'}"/>
+ <text name="label" resize="true"/>
+ </view>
<attribute name="isexpanded" type="boolean" value="false"/>
<attribute name="nodetype" type="string" value="p"/>
- <attribute name="parentGrid"/>
+ <attribute name="parentGrid" required="true"/>
<attribute name="key" type="string"/>
<attribute name="keyDatapath" type="string"/>
<handler name="ondata" args="d">
<![CDATA[
// set label
- this.label.setText(d);
+ this.contents.label.setText(d);
var viewDp = parentGrid.viewDs.getPointer();
var initialized = viewDp.selectChild();
if(!initialized) return;
- var recordNode = this.parent.parent.contentdatapath;
+ var recordNode = parentGrid.contentdatapath;
var keyAttr = null;
if(typeof(keyDatapath)!="undefined" && keyDatapath!=null) {
@@ -155,14 +158,14 @@
// set depth
var depth = this.datapath.getNodeAttribute("depth");
- this.setAttribute("x", 2 + (16 * (depth)));
+ this.contents.setAttribute("x", 2 + (16 * (depth)));
// set type
var type = this.datapath.getNodeAttribute("type");
if(type=="c" || type=="m") this.setAttribute("nodetype", type);
else this.setAttribute("nodetype", 'p');
- this.expander.setAttribute("rotation", 0);
+ this.contents.expander.setAttribute("rotation", 0);
]]>
</handler>
@@ -170,7 +173,7 @@
<![CDATA[
var sourceDpClone = parentGrid.sourceDp.dupePointer();
- var recordNode = this.parent.parent.contentdatapath;
+ var recordNode = parentGrid.contentdatapath;
var viewDpClone = this.datapath.dupePointer();
@@ -183,9 +186,9 @@
this.setAttribute("isexpanded", expanded);
// set expander.rotator
- if(expanded) this.expander.setAttribute("rotation", 90);
- else this.expander.setAttribute("rotation", 0);
- this.expander.rotator.doStart();
+ if(expanded) this.contents.expander.setAttribute("rotation", 90);
+ else this.contents.expander.setAttribute("rotation", 0);
+ this.contents.expander.rotator.doStart();
// get depth of current node
var depth = Number(this.datapath.getNodeAttribute("depth"));
@@ -194,10 +197,11 @@
var insertFlg = false;
if(viewDpClone.selectNext()) {
insertFlg = true;
+ viewDpClone.selectPrev();
}
- var viewDpClone2 = viewDpClone.dupePointer();
- viewDpClone.selectParent();
+ var viewDpRoot = viewDpClone.dupePointer();
+ viewDpRoot.selectParent();
var keyAttr = null;
var keyText = null;
@@ -209,7 +213,6 @@
keyText = this.key;
}
-
// replace to viewDs from sourceDs
// # Laszlo does not support RegExp...
// # and all of XPath specification...
@@ -222,6 +225,8 @@
sourceCurrentNodes[0] = temp;
}
+ if(insertFlg) viewDpClone.selectNext();
+
for(var i in sourceCurrentNodes) {
sourceDpClone.p = sourceCurrentNodes[i];
var attr = sourceDpClone.getNodeAttributes();
@@ -229,28 +234,24 @@
attr["expanded"] = "false";
var nn = new LzDataElement(recordNode, attr);
if(insertFlg) {
- viewDpClone.p.insertBefore(nn, viewDpClone2.p);
+ viewDpRoot.p.insertBefore(nn, viewDpClone.p);
}else {
- viewDpClone.p.appendChild(nn);
+ viewDpRoot.p.appendChild(nn);
}
}
}
}else {
- var viewCurrentNodes = null;
- var viewDpClone2 = viewDpClone.dupePointer();
- while((viewCurrentNodes = viewDpClone2.xpathQuery(recordNode + "[@depth='"+(++depth)+"']")) != null) {
- if(!(viewCurrentNodes instanceof Array)) {
- var temp = viewCurrentNodes;
- viewCurrentNodes = new Array();
- viewCurrentNodes[0] = temp;
- }
-
- for(var i in viewCurrentNodes) {
- viewDpClone.p = viewCurrentNodes[i];
- var attr = viewDpClone.getNodeAttributes();
- viewDpClone.deleteNode();
- viewDpClone.selectParent();
- }
+ var deleteNodes = new Array();
+ while(viewDpClone.selectNext()) {
+ if(depth >= new Number(viewDpClone.getNodeAttribute("depth"))) {
+ break;
+ }
+ deleteNodes.push(viewDpClone.p);
+ }
+ while(deleteNodes.length>0) {
+ viewDpRoot.p = deleteNodes.pop();
+ viewDpRoot.deleteNode();
+ viewDpRoot.selectParent();
}
}
1.1.2.4 +2 -2 jboss-profiler/java/webapp/lzx/Attic/settingdialog.lzx
(In the diff below, changes in quantity of whitespace are not shown.)
Index: settingdialog.lzx
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/webapp/lzx/Attic/settingdialog.lzx,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- settingdialog.lzx 7 Nov 2006 06:49:05 -0000 1.1.2.3
+++ settingdialog.lzx 12 Dec 2006 08:28:43 -0000 1.1.2.4
@@ -131,10 +131,10 @@
</checkbox>
<view name="values" placement="contents">
<simplelayout axis="x" spacing="2"/>
- <edittext name="fromDate" width="60" height="22"/>
+ <edittext name="fromDate" width="80" height="22"/>
<edittext name="fromTime" width="60" height="22"/>
<text fontsize="24" y="${this.y-4}">-</text>
- <edittext name="toDate" width="60" height="22"/>
+ <edittext name="toDate" width="80" height="22"/>
<edittext name="toTime" width="60" height="22"/>
</view>
</view>
1.1.2.2 +2 -1 jboss-profiler/java/webapp/lzx/Attic/webapplicationanalyzer.lzx
(In the diff below, changes in quantity of whitespace are not shown.)
Index: webapplicationanalyzer.lzx
===================================================================
RCS file: /cvsroot/jboss/jboss-profiler/java/webapp/lzx/Attic/webapplicationanalyzer.lzx,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- webapplicationanalyzer.lzx 26 Oct 2006 09:02:25 -0000 1.1.2.1
+++ webapplicationanalyzer.lzx 12 Dec 2006 08:28:43 -0000 1.1.2.2
@@ -63,6 +63,7 @@
</state>
<view resource="icon_reload">
<handler name="onclick">
+ parent.parent.changeView(0);
</handler>
</view>
<method name="setCategory" args="category">
@@ -133,7 +134,7 @@
if(index>1) {
canvas.executionPassageDetailData.setQueryParam(AppInfo.RPK_CALLER, caller);
}
- canvas.executionPassageDetailData.doRequest();
+ canvas.executionPassageDetailData.doRequest();Debug.write("!");
new LzDelegate(this, "onDataLoaded", canvas.executionPassageDetailData, "ondata");
</method>
More information about the jboss-cvs-commits
mailing list