From richfaces-svn-commits at lists.jboss.org Tue Nov 16 12:05:52 2010
Content-Type: multipart/mixed; boundary="===============0332470095870472980=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r20061 - in
 modules/tests/metamer/trunk: application/src/main/webapp/resources/metamer
 and 2 other directories.
Date: Tue, 16 Nov 2010 12:05:52 -0500
Message-ID: <201011161705.oAGH5qil029637@svn01.web.mwc.hst.phx2.redhat.com>

--===============0332470095870472980==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: lfryc(a)redhat.com
Date: 2010-11-16 12:05:51 -0500 (Tue, 16 Nov 2010)
New Revision: 20061

Modified:
   modules/tests/metamer/trunk/application/src/main/webapp/components/a4jPo=
ll/simple.xhtml
   modules/tests/metamer/trunk/application/src/main/webapp/resources/metame=
r/clientTimeWatcher.xhtml
   modules/tests/metamer/trunk/application/src/main/webapp/resources/script=
/clientTime-updateDifference.js
   modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tes=
ts/metamer/ftest/a4jPoll/TestInterval.java
Log:
a4j:poll - improved sample to use metamer:clientTimeWatcher and added defau=
lt values (RFPL-293)

Modified: modules/tests/metamer/trunk/application/src/main/webapp/component=
s/a4jPoll/simple.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jP=
oll/simple.xhtml	2010-11-16 17:04:02 UTC (rev 20060)
+++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jP=
oll/simple.xhtml	2010-11-16 17:05:51 UTC (rev 20061)
@@ -1,7 +1,7 @@
 <?xml version=3D"1.0" encoding=3D"UTF-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www=
.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns=3D"http://www.w3.org/1999/xhtml" xmlns:h=3D"http://java.sun.co=
m/jsf/html" xmlns:f=3D"http://java.sun.com/jsf/core"
-      xmlns:ui=3D"http://java.sun.com/jsf/facelets" xmlns:a4j=3D"http://ri=
chfaces.org/a4j"
+      xmlns:ui=3D"http://java.sun.com/jsf/facelets" xmlns:a4j=3D"http://ri=
chfaces.org/a4j" xmlns:rich=3D"http://richfaces.org/rich"
       xmlns:metamer=3D"http://java.sun.com/jsf/composite/metamer">
 =

     <!--
@@ -33,6 +33,7 @@
                 <f:viewParam name=3D"templates" value=3D"#{templateBean.te=
mplates}">
                     <f:converter converterId=3D"templatesListConverter" />
                 </f:viewParam>
+                <f:viewParam name=3D"enabled" value=3D"#{a4jPollBean.attri=
butes['enabled'].value}" />
             </f:metadata>
             <h:outputStylesheet library=3D"css" name=3D"a4jPoll.css"/>
             <h:outputScript library=3D"script" name=3D"date-format.js" />
@@ -51,37 +52,47 @@
                           immediate=3D"#{a4jPollBean.attributes['immediate=
'].value}"
                           interval=3D"#{a4jPollBean.attributes['interval']=
.value}"
                           onbeforedomupdate=3D"#{a4jPollBean.attributes['o=
nbeforedomupdate'].value}"
-                          onbegin=3D"#{a4jPollBean.attributes['onbegin'].v=
alue}"
-                          oncomplete=3D"#{a4jPollBean.attributes['oncomple=
te'].value}"
-                          ontimer=3D"#{a4jPollBean.attributes['ontimer'].v=
alue}"
+                          onbegin=3D"#{rich:element('timeWatcher:grid')}.b=
egin(); #{a4jPollBean.attributes['onbegin'].value}"
+                          oncomplete=3D"#{rich:element('timeWatcher:grid')=
}.complete(); #{a4jPollBean.attributes['oncomplete'].value}"
+                          ontimer=3D"#{rich:element('timeWatcher:grid')}.e=
vent(); #{rich:element('timeWatcher:grid')}.difference(); #{a4jPollBean.att=
ributes['ontimer'].value}"
                           rendered=3D"#{a4jPollBean.attributes['rendered']=
.value}"
                           value=3D"#{a4jPollBean.attributes['value'].value=
}"
                           >
-                    <a4j:ajax event=3D"timer" render=3D"time" />
+                    <a4j:ajax event=3D"timer" render=3D"output" />
                 </a4j:poll>
             </h:panelGroup>
 =

-            <h:panelGroup id=3D"time">
+			<script type=3D"text/javascript">
+          	//<![CDATA[
+                   var lastCounter =3D null;
+          	//]]>
+          	</script>
+                        =

+            <h:panelGroup id=3D"output">
                 <h:outputText value=3D"Server: " />
                 <h:outputText id=3D"serverDate" value=3D"#{a4jPollBean.dat=
e}" title=3D"#{a4jPollBean.date.time}">
                     <f:convertDateTime pattern=3D"dd.MM.yyyy HH:mm:ss.SSS"=
 />
                 </h:outputText>
                 ***
-                <h:outputText value=3D"Client: " />
-                <h:outputText id=3D"clientDate" value=3D"" title=3D"" />
-               	<script type=3D"text/javascript">
+                <h:outputText value=3D"Counter: " />
+                <h:outputText id=3D"outputCounter" value=3D"#{a4jPollBean.=
counter}"/>
+                <span id=3D"counterDelta"></span>
+                <script type=3D"text/javascript">
                	//<![CDATA[
-                        var now =3D new Date();
-                        jQuery("div.content span[id$=3DclientDate]")
-                                .text(now.format("UTC:dd.mm.yyyy HH:MM:ss.=
l", false))
-                                .attr("title", now.getTime());
+           			var counterDelta =3D document.getElementById('counterDelta');
+           			document.title =3D lastCounter;
+                    if (lastCounter) {
+                    	counterDelta.innerHTML =3D '(delta: ' + (#{a4jPollBea=
n.counter} - lastCounter) + ')';
+                    }
+                    lastCounter =3D #{a4jPollBean.counter};
                	//]]>
                	</script>
-                ***
-                <h:outputText value=3D"Counter: " />
-                <h:outputText id=3D"outputCounter" value=3D"#{a4jPollBean.=
counter}"/>
             </h:panelGroup>
+            =

+            <metamer:clientTimeWatcher id=3D"timeWatcher" reverseOrder=3D"=
true" />
         </ui:define>
+        =

+        =

 =

         <ui:define name=3D"outOfTemplateAfter">
             <metamer:attributes value=3D"#{a4jPollBean.attributes}" id=3D"=
attributes" />

Modified: modules/tests/metamer/trunk/application/src/main/webapp/resources=
/metamer/clientTimeWatcher.xhtml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/metam=
er/clientTimeWatcher.xhtml	2010-11-16 17:04:02 UTC (rev 20060)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/metam=
er/clientTimeWatcher.xhtml	2010-11-16 17:05:51 UTC (rev 20061)
@@ -11,6 +11,7 @@
 <h:body>
 	<composite:interface>
 		<composite:attribute name=3D"events" type=3D"java.lang.Integer" default=
=3D"1" />
+		<composite:attribute name=3D"reverseOrder" type=3D"java.lang.Boolean" de=
fault=3D"false" shortDescription=3D"use when you are getting negative value=
s since event time is always lower than begin times" />
 	</composite:interface>
 =

 	<composite:implementation>
@@ -52,7 +53,7 @@
 					var differenceElement =3D #{rich:element('difference')};
 					var beginTimeElement =3D this.getBeginElement();
 					var eventTimeId =3D "#{rich:clientId('event1')}".replace(/1$/, "");
-					Metamer.ClientTime.updateDifference(differenceElement, beginTimeEleme=
nt, eventTimeId);
+					Metamer.ClientTime.updateDifference(differenceElement, beginTimeEleme=
nt, eventTimeId, #{cc.attrs.reverseOrder});
 				}
 	=

 				grid.getBeginElement =3D function() {

Modified: modules/tests/metamer/trunk/application/src/main/webapp/resources=
/script/clientTime-updateDifference.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/application/src/main/webapp/resources/scrip=
t/clientTime-updateDifference.js	2010-11-16 17:04:02 UTC (rev 20060)
+++ modules/tests/metamer/trunk/application/src/main/webapp/resources/scrip=
t/clientTime-updateDifference.js	2010-11-16 17:05:51 UTC (rev 20061)
@@ -6,7 +6,7 @@
 	Metamer.ClientTime =3D {};
 }
 =

-Metamer.ClientTime.updateDifference =3D function (differenceTimeElement, b=
eginTimeElement, eventTimeId) {
+Metamer.ClientTime.updateDifference =3D function (differenceTimeElement, b=
eginTimeElement, eventTimeId, reverseOrder) {
 	var maxEventTime =3D 0;
 	=

 	for (var i =3D 1; i < 100; i++) {
@@ -24,5 +24,11 @@
 	=

 	var beginTime =3D parseInt(beginTimeElement.title);
 	=

-	jQuery(differenceTimeElement).text(beginTime - maxEventTime);
+	var difference =3D beginTime - maxEventTime;
+	=

+	if (reverseOrder) {
+		difference =3D 0 - difference;
+	}
+	=

+	jQuery(differenceTimeElement).text(difference);
 }
\ No newline at end of file

Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfa=
ces/tests/metamer/ftest/a4jPoll/TestInterval.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/a4jPoll/TestInterval.java	2010-11-16 17:04:02 UTC (rev 20=
060)
+++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/te=
sts/metamer/ftest/a4jPoll/TestInterval.java	2010-11-16 17:05:51 UTC (rev 20=
061)
@@ -56,7 +56,7 @@
     IntervalAttributes attributes =3D new IntervalAttributes();
 =

     JQueryLocator time =3D pjq("span[id$=3Dtime]");
-    AttributeLocator<?> clientTime =3D pjq("span[id$=3DclientDate]").getAt=
tribute(Attribute.TITLE);
+    AttributeLocator<?> clientTime =3D pjq("span[id$=3Devent1:outputTime]"=
).getAttribute(Attribute.TITLE);
 =

     long startTime;
 =

@@ -65,7 +65,7 @@
 =

     @Override
     public URL getTestUrl() {
-        return buildUrl(contextPath, "faces/components/a4jPoll/simple.xhtm=
l");
+        return buildUrl(contextPath, "faces/components/a4jPoll/simple.xhtm=
l?enabled=3Dfalse");
     }
 =

     @BeforeMethod


--===============0332470095870472980==--

