Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 29413 invoked from network); 11 Mar 2005 08:36:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 11 Mar 2005 08:36:17 -0000 Received: (qmail 70135 invoked by uid 500); 11 Mar 2005 08:36:16 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 69990 invoked by uid 500); 11 Mar 2005 08:36:16 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 69976 invoked by uid 99); 11 Mar 2005 08:36:15 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Fri, 11 Mar 2005 00:36:15 -0800 Received: (qmail 29312 invoked by uid 65534); 11 Mar 2005 08:36:14 -0000 Message-ID: <20050311083614.29310.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Fri, 11 Mar 2005 08:36:14 -0000 Subject: svn commit: r157059 - in cocoon/blocks/unsupported/tour/trunk: java/org/apache/cocoon/samples/tour/shapes/ samples/flow/java-shapes/ To: cvs@cocoon.apache.org From: bdelacretaz@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: bdelacretaz Date: Fri Mar 11 00:36:12 2005 New Revision: 157059 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157059 Log: shapes sample uses bean-like properties, and use if/else in flowscript inst= ead of switch Modified: cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Circle.java cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Rectangular.java cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Shape.java cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Square.java cocoon/blocks/unsupported/tour/trunk/samples/flow/java-shapes/java-shap= es.js Modified: cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/sampl= es/tour/shapes/Circle.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/tour/trunk/jav= a/org/apache/cocoon/samples/tour/shapes/Circle.java?view=3Ddiff&r1=3D157058= &r2=3D157059 =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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Circle.java (original) +++ cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Circle.java Fri Mar 11 00:36:12 2005 @@ -31,11 +31,11 @@ _r =3D r; } =20 - public double area() { + public double getArea() { return 3.14 * _r * _r; } =20 - public double perimeter() { + public double getPerimeter() { return 2 * 3.14 * _r; } =20 Modified: cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/sampl= es/tour/shapes/Rectangular.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/tour/trunk/jav= a/org/apache/cocoon/samples/tour/shapes/Rectangular.java?view=3Ddiff&r1=3D1= 57058&r2=3D157059 =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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Rectangular.java (original) +++ cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Rectangular.java Fri Mar 11 00:36:12 2005 @@ -32,11 +32,11 @@ return "Rectangular"; } =20 - public double area(){ + public double getArea(){ return _h * _b; } =20 - public double perimeter(){ + public double getPerimeter(){ return (_h + _b) * 2; } =20 Modified: cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/sampl= es/tour/shapes/Shape.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/tour/trunk/jav= a/org/apache/cocoon/samples/tour/shapes/Shape.java?view=3Ddiff&r1=3D157058&= r2=3D157059 =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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Shape.java (original) +++ cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Shape.java Fri Mar 11 00:36:12 2005 @@ -21,6 +21,6 @@ */ public interface Shape { String getName(); - abstract double area(); - abstract double perimeter(); + abstract double getArea(); + abstract double getPerimeter(); } Modified: cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/sampl= es/tour/shapes/Square.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/tour/trunk/jav= a/org/apache/cocoon/samples/tour/shapes/Square.java?view=3Ddiff&r1=3D157058= &r2=3D157059 =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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Square.java (original) +++ cocoon/blocks/unsupported/tour/trunk/java/org/apache/cocoon/samples/tou= r/shapes/Square.java Fri Mar 11 00:36:12 2005 @@ -30,11 +30,11 @@ return "Square"; } =20 - public double area() { + public double getArea() { return _b*_b; } =20 - public double perimeter() { + public double getPerimeter() { return 4*_b; } =20 Modified: cocoon/blocks/unsupported/tour/trunk/samples/flow/java-shapes/jav= a-shapes.js URL: http://svn.apache.org/viewcvs/cocoon/blocks/unsupported/tour/trunk/sam= ples/flow/java-shapes/java-shapes.js?view=3Ddiff&r1=3D157058&r2=3D157059 =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=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- cocoon/blocks/unsupported/tour/trunk/samples/flow/java-shapes/java-shap= es.js (original) +++ cocoon/blocks/unsupported/tour/trunk/samples/flow/java-shapes/java-shap= es.js Fri Mar 11 00:36:12 2005 @@ -16,7 +16,7 @@ =20 // Shape's area and perimeter calculation example. =20 -var calculator =3D Packages.org.apache.cocoon.samples.supersonic.shapes.Sh= ape; +var calculator =3D null; =20 function public_startShape() { var hint =3D "Calculate shape's area and perimeter using logic in java= . "; @@ -28,26 +28,26 @@ // send shape-specific view cocoon.sendPageAndWait("java-shapes/views/" + shapeId, {"shapeId" : sh= apeId}); =20 + // get request parameters (of which some are null depending on shape, = that's not a problem) + var h =3D parseInt( cocoon.request.get("h") ); + var b =3D parseInt( cocoon.request.get("b") ); + var r =3D parseInt( cocoon.request.get("r") ); + // instantiate appropriate calculator - switch (shapeId){ - case "square": - var b =3D parseInt( cocoon.request.get("b") ); - calculator =3D new Packages.org.apache.cocoon.samples.tour.sha= pes.Square(b); - break; - case "rectangular": - var h =3D parseInt( cocoon.request.get("h") ); - var b =3D parseInt( cocoon.request.get("b") ); - calculator =3D new Packages.org.apache.cocoon.samples.tour.sha= pes.Rectangular(b,h); - break; - case "circle": - var r =3D parseInt( cocoon.request.get("r") ); - calculator =3D new Packages.org.apache.cocoon.samples.tour.sha= pes.Circle(r); - break; + if(shapeId =3D=3D "square") { + calculator =3D new Packages.org.apache.cocoon.samples.tour.shapes.= Square(b); + } else if(shapeId=3D=3D"rectangular") { + calculator =3D new Packages.org.apache.cocoon.samples.tour.shapes.= Rectangular(b,h); + } else if(shapeId=3D=3D"circle") { + calculator =3D new Packages.org.apache.cocoon.samples.tour.shapes.= Circle(r); + } else { + throw new java.lang.Exception("No calculator found for shape '" + = shapeId + "'"); } =20 // compute results - var a =3D calculator.area(); - var p =3D calculator.perimeter(); + // (accessing bean-like properties like "getArea()" using property nam= es like "area") + var a =3D calculator.area; + var p =3D calculator.perimeter; =20 cocoon.sendPage("java-shapes/views/results", {"area" : a, "perimeter" = : p, "shape" : shapeId} ); -} \ No newline at end of file +}