svn commit: r509470 - in /tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase: portal/PortalSettings.java rssChannel/RssChannelsAction.java skin/DefinitionCatalog.java skin/LayoutSwitchAction.java

[ap...@apache.org]

Author: apetrelli
Date: Tue Feb 20 00:57:03 2007
New Revision: 509470

URL: http://svn.apache.org/viewvc?view=rev&rev=509470
Log:
TILESSHOW-8
Some bug fixing for classes.

Modified:
    tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalSettings.java
    tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
    tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
    tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java

Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalSettings.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalSettings.java?view=diff&rev=509470&r1=509469&r2=509470
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalSettings.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/PortalSettings.java Tue Feb 20 00:57:03 2007
@@ -85,8 +85,8 @@
      public void setListAt( int index, List list )
        {
          // First, ensure capacity
-       while( index>lists.size() ) lists.add(new ArrayList());
-       lists.add( index, list);
+       while( index>=lists.size() ) lists.add(new ArrayList());
+       lists.set( index, list);
        }
 
        /**

Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java?view=diff&rev=509470&r1=509469&r2=509470
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/RssChannelsAction.java Tue Feb 20 00:57:03 2007
@@ -105,7 +105,7 @@
         // -- Retrieve parameters --
         // Urls can come from a list, or from a single attribute.
 
-        List channels = (List) context.getAttribute(CHANNEL_URLS_KEY);
+        List channels = (List) context.getAttribute(CHANNEL_URLS_KEY).getValue();
         if (channels == null) {
             Object url = context.getAttribute(CHANNEL_URL_KEY);
             channels = new ArrayList(1);

Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java?view=diff&rev=509470&r1=509469&r2=509470
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java Tue Feb 20 00:57:03 2007
@@ -32,8 +32,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.tiles.ComponentAttribute;
 import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.TilesContainer;
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.context.TilesRequestContext;
 import org.apache.tiles.context.servlet.ServletTilesRequestContext;
@@ -107,9 +107,17 @@
    Iterator i = list.iterator();
    while(i.hasNext() )
      {
-     String name = (String)i.next();
-     System.out.println( "add " + name );
-     ComponentDefinition def = container.getDefinition(name, tilesContext);
+     ComponentAttribute attribute = (ComponentAttribute) i.next();
+     Object value = attribute.getValue();
+     ComponentDefinition def = null;
+     String name = null;
+     if (value instanceof String) {
+         name = value.toString();
+         def = container.getDefinition(name, tilesContext);
+     } else if (value instanceof ComponentDefinition) {
+         def = (ComponentDefinition) value;
+         name = def.getName();
+     }
      if(def==null)
        throw new NoSuchDefinitionException("Can't find definition '" + name + "'" );
      add( name, def );

Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java?view=diff&rev=509470&r1=509469&r2=509470
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java Tue Feb 20 00:57:03 2007
@@ -233,7 +233,7 @@
     {
     if(debug)
         System.out.println( "Exception : " + ex.getMessage() );
-    throw new ServletException( ex.getMessage() );
+    throw new ServletException(ex.getMessage(), ex);
     }
   }
 }