[Equanda-svn-commit] SF.net SVN: equanda: [158] trunk/equanda-tapestry5/src/main/java/org/ equanda/tapestry5/components/Accordion.java

[<tri...@us...>]

Revision: 158
          http://equanda.svn.sourceforge.net/equanda/?rev=158&view=rev
Author:   triathlon98
Date:     2007-11-21 13:56:44 -0800 (Wed, 21 Nov 2007)

Log Message:
-----------
EQ-79 make code simpler by getting parameter blocks from (injected) ComponentResources

Modified Paths:
--------------
    trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Accordion.java

Modified: trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Accordion.java
===================================================================
--- trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Accordion.java	2007-11-20 07:22:02 UTC (rev 157)
+++ trunk/equanda-tapestry5/src/main/java/org/equanda/tapestry5/components/Accordion.java	2007-11-21 21:56:44 UTC (rev 158)
@@ -36,9 +36,10 @@
  *
  * @author <a href="mailto:jo...@pr...">Joachim Van der Auwera</a>
  */
+@SupportsInformalParameters
 public class Accordion
 {
-    private static final int MAX_PANELS = 21; // max number of supported panels
+    private static final int MAX_PANELS = 50; // max number of supported panels
 
     @Inject
     @Path( "${tapestry.scriptaculous}/prototype.js" )
@@ -58,47 +59,7 @@
     private Block titleIcon;
 
     @Parameter
-    private Block title1, content1;
-    @Parameter
-    private Block title2, content2;
-    @Parameter
-    private Block title3, content3;
-    @Parameter
-    private Block title4, content4;
-    @Parameter
-    private Block title5, content5;
-    @Parameter
-    private Block title6, content6;
-    @Parameter
-    private Block title7, content7;
-    @Parameter
-    private Block title8, content8;
-    @Parameter
-    private Block title9, content9;
-    @Parameter
-    private Block title10, content10;
-    @Parameter
-    private Block title11, content11;
-    @Parameter
-    private Block title12, content12;
-    @Parameter
-    private Block title13, content13;
-    @Parameter
-    private Block title14, content14;
-    @Parameter
-    private Block title15, content15;
-    @Parameter
-    private Block title16, content16;
-    @Parameter
-    private Block title17, content17;
-    @Parameter
-    private Block title18, content18;
-    @Parameter
-    private Block title19, content19;
-    @Parameter
-    private Block title20, content20;
-    @Parameter
-    private Block title21, content21;
+    Block emptyBlock;
 
     private TwoBlocks panel;
 
@@ -160,92 +121,11 @@
 
         public TwoBlocks( int index )
         {
-            switch ( index )
-            {
-                case 1:
-                    title = title1;
-                    content = content1;
-                    active = true;
-                    break;
-                case 2:
-                    title = title2;
-                    content = content2;
-                    break;
-                case 3:
-                    title = title3;
-                    content = content3;
-                    break;
-                case 4:
-                    title = title4;
-                    content = content4;
-                    break;
-                case 5:
-                    title = title5;
-                    content = content5;
-                    break;
-                case 6:
-                    title = title6;
-                    content = content6;
-                    break;
-                case 7:
-                    title = title7;
-                    content = content7;
-                    break;
-                case 8:
-                    title = title8;
-                    content = content8;
-                    break;
-                case 9:
-                    title = title9;
-                    content = content9;
-                    break;
-                case 11:
-                    title = title11;
-                    content = content11;
-                    break;
-                case 12:
-                    title = title12;
-                    content = content12;
-                    break;
-                case 13:
-                    title = title13;
-                    content = content13;
-                    break;
-                case 14:
-                    title = title14;
-                    content = content14;
-                    break;
-                case 15:
-                    title = title15;
-                    content = content15;
-                    break;
-                case 16:
-                    title = title16;
-                    content = content16;
-                    break;
-                case 17:
-                    title = title17;
-                    content = content17;
-                    break;
-                case 18:
-                    title = title18;
-                    content = content18;
-                    break;
-                case 19:
-                    title = title19;
-                    content = content19;
-                    break;
-                case 20:
-                    title = title20;
-                    content = content20;
-                    break;
-                case 21:
-                    title = title21;
-                    content = content21;
-                    break;
-                default:
-                    throw new RuntimeException( "invalid index " + index );
-            }
+            active = ( 1 == index );
+            title = resources.getBlockParameter( "title" + index );
+            if ( null == title ) title = emptyBlock; // should not happen as parameter is bound
+            content = resources.getBlockParameter( "content" + index );
+            if ( null == content ) content = emptyBlock; // should not happen as parameter is bound
         }
 
         public Block getTitle()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.