svn commit: r506513 - in /tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal: PortalCatalog.java UserPortalAction.java

[apetrelli]

Author: apetrelli
Date: Mon Feb 12 08:03:30 2007
New Revision: 506513

URL: http://svn.apache.org/viewvc?view=rev&rev=506513
Log:
TILES-12
Some fixes

Modified:
    
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
    
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java

Modified: 
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
URL: 
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java?view=diff&rev=506513&r1=506512&r2=506513
==============================================================================
--- 
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
 (original)
+++ 
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalCatalog.java
 Mon Feb 12 08:03:30 2007
@@ -26,6 +26,9 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.showcase.channel.AttributeUtils;
+
 
 /**
  * A catalog of available tiles for a portal.
@@ -140,7 +143,8 @@
        int index = tiles.indexOf( key );
        if(index==-1)
          return null;
-       return (String)tileLabels.get(index);
+       return AttributeUtils.getAttributeValueAsString(
+               (ComponentAttribute) tileLabels.get(index));
        }
 
        /**

Modified: 
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
URL: 
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java?view=diff&rev=506513&r1=506512&r2=506513
==============================================================================
--- 
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
 (original)
+++ 
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserPortalAction.java
 Mon Feb 12 08:03:30 2007
@@ -35,7 +35,6 @@
 import org.apache.struts.tiles2.actions.TilesAction;
 import org.apache.tiles.ComponentAttribute;
 import org.apache.tiles.ComponentContext;
-import org.apache.tiles.context.ComponentListAttribute;
 import org.apache.tiles.showcase.channel.AttributeUtils;
 
 /**
@@ -151,8 +150,7 @@
 
             for (int i = 0; i < settings.getNumCols(); i++) {
                 List tiles =
-                    (List) ((ComponentListAttribute)
-                            context.getAttribute(((String) LIST_ATTRIBUTE + 
i))).getValue();
+                    (List) context.getAttribute(((String) LIST_ATTRIBUTE + 
i)).getValue();
 
                 settings.setListAt(i, tiles);
             }
@@ -183,11 +181,11 @@
 
             for (int i = 0; i < numCols; i++) {
                 List tiles =
-                    (List) context.getAttribute(((String) LIST_ATTRIBUTE + i));
+                    (List) context.getAttribute(((String) LIST_ATTRIBUTE + 
i)).getValue();
 
                 List labels =
                     (List) context.getAttribute(
-                        ((String) LIST_LABELS_ATTRIBUTE + i));
+                        ((String) LIST_LABELS_ATTRIBUTE + i)).getValue();
 
                 catalog.addTiles(tiles, labels);
             }