You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/02/23 15:38:09 UTC
svn commit: r510960 - in
/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase:
dynPortal/ portal/ rssChannel/ skin/
Author: apetrelli
Date: Fri Feb 23 06:38:09 2007
New Revision: 510960
URL: http://svn.apache.org/viewvc?view=rev&rev=510960
Log:
TILESSHOW-8
Some bug fixing and update.
Modified:
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/DefinitionCatalog.java
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java?view=diff&rev=510960&r1=510959&r2=510960
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/PortalSettings.java Fri Feb 23 06:38:09 2007
@@ -26,6 +26,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.tiles.ComponentAttribute;
+
/**
* Objects of this class hold portal settings for one user.
*
@@ -47,8 +49,14 @@
*/
public String getLabel( Object key )
{
+ String retValue = null;
int index = choices.indexOf( key );
- return (String)choiceLabels.get(index);
+ ComponentAttribute attribute =
+ (ComponentAttribute) choiceLabels.get(index);
+ if (attribute != null) {
+ retValue = (String) attribute.getValue();
+ }
+ return retValue;
}
/**
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java?view=diff&rev=510960&r1=510959&r2=510960
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/RetrievePortalAction.java Fri Feb 23 06:38:09 2007
@@ -83,8 +83,9 @@
HttpSession session = request.getSession();
// Try to retrieve tile context
- ComponentContext context = TilesAccess.getContainer( request )
- .getComponentContext(request, response);
+ ComponentContext context = TilesAccess.getContainer(
+ request.getSession().getServletContext()).getComponentContext(
+ request, response);
if( context == null )
{
throw new ServletException( "This action must be called by a Tile, not directly" );
@@ -120,8 +121,13 @@
context.getAttribute( PARAM_NUMCOLS )));
for( int i=0; i<settings.getNumCols(); i++ )
{
- List col = (List)context.getAttribute( ((String)PARAM_LIST+i) );
- List labels = (List)context.getAttribute( ((String)PARAM_LIST_LABELS+i) );
+ List col = (List)context.getAttribute( ((String)PARAM_LIST+i) ).getValue();
+ ComponentAttribute labelsAttribute = context
+ .getAttribute(((String) PARAM_LIST_LABELS + i));
+ List labels = null;
+ if (labelsAttribute != null) {
+ labels = (List) labelsAttribute.getValue();
+ }
settings.addChoices( col, labels );
settings.addList( col );
} // end loop
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java?view=diff&rev=510960&r1=510959&r2=510960
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/dynPortal/SetPortalPrefsAction.java Fri Feb 23 06:38:09 2007
@@ -74,8 +74,9 @@
PortalPrefsForm prefsForm = (PortalPrefsForm)form;
// Try to retrieve tile context
- ComponentContext context = TilesAccess.getContainer( request )
- .getComponentContext(request, response);
+ ComponentContext context = TilesAccess.getContainer(
+ request.getSession().getServletContext()).getComponentContext(
+ request, response);
if( context == null )
{
throw new ServletException( "This action must be called by a Tile, not directly" );
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java?view=diff&rev=510960&r1=510959&r2=510960
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/portal/UserMenuAction.java Fri Feb 23 06:38:09 2007
@@ -42,11 +42,9 @@
import org.apache.tiles.ComponentContext;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
-import org.apache.tiles.access.TilesAccess;
import org.apache.tiles.beans.MenuItem;
import org.apache.tiles.context.ComponentListAttribute;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.servlet.ServletTilesApplicationContext;
import org.apache.tiles.context.servlet.ServletTilesRequestContext;
import org.apache.tiles.definition.ComponentDefinition;
import org.apache.tiles.preparer.ViewPreparer;
Modified: tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java
URL: http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java?view=diff&rev=510960&r1=510959&r2=510960
==============================================================================
--- tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java (original)
+++ tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/rssChannel/Channels.java Fri Feb 23 06:38:09 2007
@@ -97,7 +97,12 @@
// -- Retrieve parameters --
// Urls can come from a list, or from a single attribute.
- List channels = (List) context.getAttribute(CHANNEL_URLS_KEY);
+ List channels = null;
+ ComponentAttribute channelsAttribute =
+ context.getAttribute(CHANNEL_URLS_KEY);
+ if (channelsAttribute != null) {
+ channels = (List) channelsAttribute.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=510960&r1=510959&r2=510960
==============================================================================
--- 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 Fri Feb 23 06:38:09 2007
@@ -76,7 +76,7 @@
* List of keys
*/
private List keys = new ArrayList();
-
+
/**
* Constructor.
* Initialize catalog from definitions factory.