Author: apetrelli
Date: Tue Feb 13 06:38:53 2007
New Revision: 507026
URL: http://svn.apache.org/viewvc?view=rev&rev=507026
Log:
TILESSHOW-8
Fixed compile errors.
Modified:
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSwitchAction.java
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
Modified:
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java?view=diff&rev=507026&r1=507025&r2=507026
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/LayoutSettingsAction.java
Tue Feb 13 06:38:53 2007
@@ -77,7 +77,7 @@
if(selected==null)
selected = "default";
System.out.println("user setting retrieved");
- DefinitionCatalog catalog = LayoutSwitchAction.getCatalog( context,
request, getServlet().getServletContext() );
+ DefinitionCatalog catalog = LayoutSwitchAction.getCatalog( context,
request, response, getServlet().getServletContext() );
System.out.println("catalog retrieved");
// Check if form is submitted
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=507026&r1=507025&r2=507026
==============================================================================
---
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 13 06:38:53 2007
@@ -111,7 +111,7 @@
+ "' not found in Tile's attributes. Need it
to select appropriate layout" );
// Get user current skin
- ComponentDefinition definition = getCurrentDefinition( context, request,
getServlet().getServletContext() );
+ ComponentDefinition definition = getCurrentDefinition( context, request,
getServlet().getServletContext(), response );
// get requested layout from definition
String layout = (String)definition.getAttribute(layoutKey);
if(layout==null)
@@ -177,14 +177,15 @@
/**
* Get currently selected skin definition.
+ * @param response TODO
*/
- public static ComponentDefinition getCurrentDefinition( ComponentContext
context, HttpServletRequest request, ServletContext servletContext )
+ public static ComponentDefinition getCurrentDefinition( ComponentContext
context, HttpServletRequest request, ServletContext servletContext,
HttpServletResponse response )
throws ServletException
{
// Get selected key
String selected = getUserSetting(context, request);
- DefinitionCatalog catalog = getCatalog( context, request, servletContext);
+ DefinitionCatalog catalog = getCatalog( context, request, response,
servletContext);
ComponentDefinition definition = (ComponentDefinition)catalog.get( selected
);
if( definition == null )
definition = (ComponentDefinition)catalog.getDefault();
@@ -194,8 +195,9 @@
/**
* Get catalog of available skins.
+ * @param response TODO
*/
- public static DefinitionCatalog getCatalog( ComponentContext context,
HttpServletRequest request, ServletContext servletContext )
+ public static DefinitionCatalog getCatalog( ComponentContext context,
HttpServletRequest request, HttpServletResponse response, ServletContext
servletContext )
throws ServletException
{
// Retrieve name used to store catalog in application context.
Modified:
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
URL:
http://svn.apache.org/viewvc/tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java?view=diff&rev=507026&r1=507025&r2=507026
==============================================================================
---
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
(original)
+++
tiles/examples/trunk/tiles-showcase/src/main/java/org/apache/tiles/showcase/skin/SimpleSwitchLayoutAction.java
Tue Feb 13 06:38:53 2007
@@ -156,8 +156,9 @@
/**
* Get catalog of available skins.
+ * @param response TODO
*/
- public static DefinitionCatalog getCatalog( ComponentContext context,
HttpServletRequest request, ServletContext servletContext )
+ public static DefinitionCatalog getCatalog( ComponentContext context,
HttpServletRequest request, ServletContext servletContext, HttpServletResponse
response )
throws ServletException
{
// Retrieve name used to store catalog in application context.
