You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by dd...@apache.org on 2006/11/02 03:03:04 UTC
svn commit: r470185 [1/5] - in /struts/sandbox/trunk/tiles:
tiles-api/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/access/
tiles-core/src/main/java/org/apache/tiles/beans/ tiles-co...
Author: ddewolf
Date: Wed Nov 1 18:03:00 2006
New Revision: 470185
URL: http://svn.apache.org/viewvc?view=rev&rev=470185
Log:
SB-68, SB-42; Codebase cleanup; Package reorganization
Added:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentAttribute.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentAttribute.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinition.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentDefinition.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitions.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentDefinitions.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentListAttribute.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentListAttribute.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryConfig.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsFactoryConfig.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryException.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsFactoryException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/FactoryNotFoundException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/NoSuchDefinitionException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ReloadableDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/digester/
- copied from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
- copied, changed from r470183, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/DigesterDefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/UrlViewPreparer.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/UrlViewPreparer.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ViewPreparer.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ViewPreparerSupport.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/DefinitionsUtil.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtil.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtil.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/TilesUtilImpl.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtilImpl.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/package.html
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockComponentDefinitions.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockComponentDefinitions.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockDefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinition.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinition.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestComponentDefinitions.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinitions.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestReloadableDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (contents, props changed)
- copied, changed from r469623, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestDigesterDefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/servlet/TestTilesServlet.java (contents, props changed)
- copied, changed from r470071, struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
Removed:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentAttribute.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentDefinition.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentDefinitions.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentListAttribute.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsFactoryConfig.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsFactoryException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/DefinitionsUtil.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/FactoryNotFoundException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/NoSuchDefinitionException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ReloadableDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtil.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/TilesUtilImpl.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/UrlViewPreparer.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ViewPreparer.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ViewPreparerSupport.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/digester/
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinition.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestComponentDefinitions.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestDigesterDefinitionsReader.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestReloadableDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestTilesServlet.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/TestUrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/
Modified:
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesException.java
struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentDefinitionsImpl.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/ConfigurationNotSupportedException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesContainerListener.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/package.html
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/NoSuchPreparerException.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AddTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AddTagParent.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/BaseInsertTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ComponentConstants.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/DefinitionTagSupport.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InitDefinitionsTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutListTagParent.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/PutTagParent.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/UseAttributeTei.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/package.html
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/taglib/util/TagUtils.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/util/RequestUtils.java
struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java
Modified: struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java Wed Nov 1 18:03:00 2006
@@ -17,18 +17,17 @@
*/
package org.apache.tiles;
-import java.util.Map;
-import java.net.URL;
import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
/**
* Defines a set of methods which tiles use to communicate to
* the tiles container and runtime environment. There is only
* one application context per container.
- *
- * @since 2.0
- * @version $Rev$
*
+ * @version $Rev$
+ * @since 2.0
*/
public interface TilesApplicationContext {
Modified: struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java (original)
+++ struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java Wed Nov 1 18:03:00 2006
@@ -24,16 +24,16 @@
* used to expose tiles features to frameworks which leverage
* it as a plugin. It can alternately be used by web applications
* which would like a programmatic interface.
- *
- * @since 2.0
+ *
* @version $Rev$
+ * @since 2.0
*/
public interface TilesContainer {
/**
* Initialize the container with the given
* configuration.
- *
+ *
* @param context
* @throws TilesException
*/
@@ -41,12 +41,12 @@
/**
* Retrieve the containers context.
+ *
* @return
*/
TilesApplicationContext getApplicationContext();
/**
- *
* @param request
* @param response
* @param definition
@@ -54,7 +54,6 @@
void prepare(Object request, Object response, String definition) throws TilesException;
/**
- *
* @param pageContext
* @param definition
* @throws TilesException
@@ -70,7 +69,6 @@
void render(Object request, Object response, String definition) throws TilesException;
/**
- *
* @param pageContext
* @param definition
* @throws TilesException
Modified: struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesException.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesException.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesException.java (original)
+++ struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesException.java Wed Nov 1 18:03:00 2006
@@ -23,96 +23,92 @@
/**
* Root class for all Tiles-exceptions.
*/
-public class TilesException extends Exception
-{
+public class TilesException extends Exception {
- /**
- * Any "wrapped" exception will be exposed when this is serialized.
- * @serial
- */
- private Exception exception;
- /**
- * Constructor.
- */
- public TilesException()
- {
- super();
- this.exception = null;
- }
-
- /**
- * Constructor.
- * @param message The error or warning message.
- */
- public TilesException(String message)
- {
- super(message);
- this.exception = null;
- }
-
-
- /**
- * Create a new <code>TilesException</code> wrapping an existing exception.
- *
- * <p>The existing exception will be embedded in the new
- * one, and its message will become the default message for
- * the TilesException.</p>
- *
- * @param e The exception to be wrapped.
- */
- public TilesException(Exception e)
- {
- super();
- this.exception = e;
- }
-
-
- /**
- * Create a new <code>TilesException</code> from an existing exception.
- *
- * <p>The existing exception will be embedded in the new
- * one, but the new exception will have its own message.</p>
- *
- * @param message The detail message.
- * @param e The exception to be wrapped.
- */
- public TilesException(String message, Exception e)
- {
- super(message);
- this.exception = e;
- }
-
-
- /**
- * Return a detail message for this exception.
- *
- * <p>If there is a embedded exception, and if the TilesException
- * has no detail message of its own, this method will return
- * the detail message from the embedded exception.</p>
- *
- * @return The error or warning message.
- */
- public String getMessage ()
- {
- String message = super.getMessage ();
-
- if (message == null && exception != null) {
- return exception.getMessage();
- } else {
- return message;
- }
- }
-
-
- /**
- * Return the embedded exception, if any.
- *
- * @return The embedded exception, or <code>null</code> if there is none.
- */
- public Exception getException ()
- {
- return exception;
- }
+ /**
+ * Any "wrapped" exception will be exposed when this is serialized.
+ *
+ * @serial
+ */
+ private Exception exception;
+
+ /**
+ * Constructor.
+ */
+ public TilesException() {
+ super();
+ this.exception = null;
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param message The error or warning message.
+ */
+ public TilesException(String message) {
+ super(message);
+ this.exception = null;
+ }
+
+
+ /**
+ * Create a new <code>TilesException</code> wrapping an existing exception.
+ * <p/>
+ * <p>The existing exception will be embedded in the new
+ * one, and its message will become the default message for
+ * the TilesException.</p>
+ *
+ * @param e The exception to be wrapped.
+ */
+ public TilesException(Exception e) {
+ super();
+ this.exception = e;
+ }
+
+
+ /**
+ * Create a new <code>TilesException</code> from an existing exception.
+ * <p/>
+ * <p>The existing exception will be embedded in the new
+ * one, but the new exception will have its own message.</p>
+ *
+ * @param message The detail message.
+ * @param e The exception to be wrapped.
+ */
+ public TilesException(String message, Exception e) {
+ super(message);
+ this.exception = e;
+ }
+
+
+ /**
+ * Return a detail message for this exception.
+ * <p/>
+ * <p>If there is a embedded exception, and if the TilesException
+ * has no detail message of its own, this method will return
+ * the detail message from the embedded exception.</p>
+ *
+ * @return The error or warning message.
+ */
+ public String getMessage() {
+ String message = super.getMessage();
+
+ if (message == null && exception != null) {
+ return exception.getMessage();
+ } else {
+ return message;
+ }
+ }
+
+
+ /**
+ * Return the embedded exception, if any.
+ *
+ * @return The embedded exception, or <code>null</code> if there is none.
+ */
+ public Exception getException() {
+ return exception;
+ }
}
Modified: struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-api/src/main/java/org/apache/tiles/TilesRequestContext.java Wed Nov 1 18:03:00 2006
@@ -18,13 +18,14 @@
package org.apache.tiles;
import java.io.IOException;
-import java.util.Map;
import java.util.Locale;
+import java.util.Map;
/**
* Encapsulation of request information.
- * @since 2.0
+ *
* @version $Rev$
+ * @since 2.0
*/
public interface TilesRequestContext {
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentContext.java Wed Nov 1 18:03:00 2006
@@ -18,16 +18,11 @@
package org.apache.tiles;
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import org.apache.tiles.taglib.ComponentConstants;
import javax.servlet.jsp.PageContext;
-
-import org.apache.tiles.taglib.ComponentConstants;
+import java.io.Serializable;
+import java.util.*;
/**
* Component context.
@@ -37,7 +32,7 @@
/**
* Component attributes.
*/
- private Map attributes=null;
+ private Map attributes = null;
/**
* Constructor.
@@ -49,6 +44,7 @@
/**
* Constructor.
* Create a context and set specified attributes.
+ *
* @param attributes Attributes to initialize context.
*/
public ComponentContext(Map attributes) {
@@ -62,6 +58,7 @@
* Copies all of the mappings from the specified attribute map to this context.
* New attribute mappings will replace any mappings that this context had for any of the keys
* currently in the specified attribute map.
+ *
* @param newAttributes Attributes to add.
*/
public void addAll(Map newAttributes) {
@@ -69,7 +66,7 @@
attributes = new HashMap(newAttributes);
return;
}
-
+
attributes.putAll(newAttributes);
}
@@ -78,13 +75,14 @@
* Copies all of the mappings from the specified attributes map to this context.
* New attribute mappings will be added only if they don't already exist in
* this context.
+ *
* @param defaultAttributes Attributes to add.
*/
public void addMissing(Map defaultAttributes) {
if (defaultAttributes == null) {
return;
}
-
+
if (attributes == null) {
attributes = new HashMap(defaultAttributes);
return;
@@ -102,32 +100,35 @@
/**
* Get an attribute from context.
+ *
* @param name Name of the attribute.
* @return <{Object}>
*/
public Object getAttribute(String name) {
- if (attributes == null){
+ if (attributes == null) {
return null;
}
-
+
return attributes.get(name);
}
/**
* Get names of all attributes.
+ *
* @return <{Object}>
*/
public Iterator getAttributeNames() {
if (attributes == null) {
return Collections.EMPTY_LIST.iterator();
}
-
+
return attributes.keySet().iterator();
}
/**
* Put a new attribute to context.
- * @param name Name of the attribute.
+ *
+ * @param name Name of the attribute.
* @param value Value of the attribute.
*/
public void putAttribute(String name, Object value) {
@@ -141,7 +142,8 @@
/**
* Find object in one of the contexts.
* Order : component then pageContext.findAttribute()
- * @param beanName Name of the bean to find.
+ *
+ * @param beanName Name of the bean to find.
* @param pageContext Page context.
* @return Requested bean or <code>null</code> if not found.
*/
@@ -150,15 +152,16 @@
if (attribute == null) {
attribute = pageContext.findAttribute(beanName);
}
-
+
return attribute;
}
/**
* Get object from requested context.
* Context can be 'component'.
- * @param beanName Name of the bean to find.
- * @param scope Search scope (see {@link PageContext}).
+ *
+ * @param beanName Name of the bean to find.
+ * @param scope Search scope (see {@link PageContext}).
* @param pageContext Page context.
* @return requested bean or <code>null</code> if not found.
*/
@@ -166,36 +169,39 @@
String beanName,
int scope,
PageContext pageContext) {
-
- if (scope == ComponentConstants.COMPONENT_SCOPE){
+
+ if (scope == ComponentConstants.COMPONENT_SCOPE) {
return getAttribute(beanName);
}
-
+
return pageContext.getAttribute(beanName, scope);
}
/**
* Get component context from request.
+ *
* @param tilesContext current Tiles application context.
* @return ComponentContext or null if context is not found or an
- * jspException is present in the request.
+ * jspException is present in the request.
*/
static public ComponentContext getContext(TilesRequestContext tilesContext) {
- if (tilesContext.getRequestScope().get("javax.servlet.jsp.jspException") != null) {
- return null;
- } return (ComponentContext) tilesContext.getRequestScope().get(
+ if (tilesContext.getRequestScope().get("javax.servlet.jsp.jspException") != null) {
+ return null;
+ }
+ return (ComponentContext) tilesContext.getRequestScope().get(
ComponentConstants.COMPONENT_CONTEXT);
}
/**
* Store component context into request.
- * @param context ComponentContext to store.
+ *
+ * @param context ComponentContext to store.
* @param tilesContext current Tiles application context.
*/
static public void setContext(
ComponentContext context,
TilesRequestContext tilesContext) {
-
+
tilesContext.getRequestScope().put(ComponentConstants.COMPONENT_CONTEXT, context);
}
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/access/TilesAccess.java Wed Nov 1 18:03:00 2006
@@ -17,11 +17,11 @@
*/
package org.apache.tiles.access;
-import org.apache.tiles.TilesContainer;
-import org.apache.tiles.TilesException;
-import org.apache.tiles.TilesApplicationContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.TilesException;
import java.lang.reflect.Method;
@@ -41,29 +41,29 @@
"org.apache.tiles.APPLICATION_CONTEXT";
public static TilesContainer getContainer(Object context) {
- return (TilesContainer)getAttribute(context, CONTAINER_ATTRIBUTE);
+ return (TilesContainer) getAttribute(context, CONTAINER_ATTRIBUTE);
}
-
+
public static void setContainer(Object context, TilesContainer container)
- throws TilesException {
+ throws TilesException {
setAttribute(context, CONTAINER_ATTRIBUTE, container);
}
public static TilesApplicationContext getApplicationContext(Object context) {
TilesContainer container = getContainer(context);
- if(container != null) {
+ if (container != null) {
return container.getApplicationContext();
}
- return (TilesApplicationContext)getAttribute(context, CONTEXT_ATTRIBUTE);
+ return (TilesApplicationContext) getAttribute(context, CONTEXT_ATTRIBUTE);
}
/**
- * @deprecated temporarily added for backwards compatibility.
* @param context
* @param
+ * @deprecated temporarily added for backwards compatibility.
*/
public static void setApplicationContext(Object context, TilesApplicationContext tilesContext)
- throws TilesException {
+ throws TilesException {
setAttribute(context, CONTEXT_ATTRIBUTE, tilesContext);
}
@@ -73,19 +73,19 @@
Method attrMethod = contextClass.getMethod("getAttribute", String.class);
return attrMethod.invoke(context, attributeName);
} catch (Exception e) {
- LOG.warn("Unable to retrieve container from specified context: '"+context+"'", e);
+ LOG.warn("Unable to retrieve container from specified context: '" + context + "'", e);
return null;
}
}
private static void setAttribute(Object context, String name, Object value)
- throws TilesException {
+ throws TilesException {
try {
Class contextClass = context.getClass();
Method attrMethod = contextClass.getMethod("setAttribute", String.class, Object.class);
attrMethod.invoke(context, name, value);
} catch (Exception e) {
- throw new TilesException("Unable to set attribute for specified context: '"+context+"'");
+ throw new TilesException("Unable to set attribute for specified context: '" + context + "'");
}
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java Wed Nov 1 18:03:00 2006
@@ -22,10 +22,11 @@
/**
* Interface for MenuItems.
+ *
* @see SimpleMenuItem
*/
public interface MenuItem extends Serializable {
-
+
/**
* Set value property.
*/
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/BasicTilesContextFactory.java Wed Nov 1 18:03:00 2006
@@ -18,22 +18,21 @@
package org.apache.tiles.context;
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.context.jsp.JspTilesRequestContext;
import org.apache.tiles.context.portlet.PortletTilesApplicationContext;
import org.apache.tiles.context.portlet.PortletTilesRequestContext;
import org.apache.tiles.context.servlet.ServletTilesApplicationContext;
import org.apache.tiles.context.servlet.ServletTilesRequestContext;
-import org.apache.tiles.context.jsp.JspTilesRequestContext;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
import java.util.Map;
/**
@@ -43,22 +42,23 @@
*/
public class BasicTilesContextFactory implements TilesContextFactory {
- public void init(Map configParameters) {}
+ public void init(Map configParameters) {
+ }
/**
* Creates a TilesApplicationContext from the given context.
*/
public TilesApplicationContext createApplicationContext(Object context) {
if (context instanceof ServletContext) {
- ServletContext servletContext = (ServletContext)context;
+ ServletContext servletContext = (ServletContext) context;
return new ServletTilesApplicationContext(servletContext);
} else if (context instanceof PortletContext) {
- PortletContext portletContext = (PortletContext)context;
+ PortletContext portletContext = (PortletContext) context;
return new PortletTilesApplicationContext(portletContext);
} else {
throw new IllegalArgumentException("Invalid context specified. "
- + context.getClass().getName());
+ + context.getClass().getName());
}
}
@@ -66,26 +66,26 @@
Object request,
Object response) {
if (context instanceof ServletTilesApplicationContext) {
- ServletTilesApplicationContext app = (ServletTilesApplicationContext)context;
-
+ ServletTilesApplicationContext app = (ServletTilesApplicationContext) context;
+
return new ServletTilesRequestContext(app.getServletContext(),
- (HttpServletRequest)request,
- (HttpServletResponse)response);
+ (HttpServletRequest) request,
+ (HttpServletResponse) response);
} else if (context instanceof PortletContext) {
- PortletTilesApplicationContext app = (PortletTilesApplicationContext)context;
+ PortletTilesApplicationContext app = (PortletTilesApplicationContext) context;
return new PortletTilesRequestContext(app.getPortletContext(),
- (PortletRequest)request,
- (PortletResponse)response);
- } else {
+ (PortletRequest) request,
+ (PortletResponse) response);
+ } else {
throw new IllegalArgumentException("Invalid context specified. "
- + context.getClass().getName());
+ + context.getClass().getName());
}
}
public TilesRequestContext createRequestContext(TilesApplicationContext context,
PageContext pageContext) {
if (context instanceof ServletTilesApplicationContext) {
- ServletTilesApplicationContext app = (ServletTilesApplicationContext)context;
+ ServletTilesApplicationContext app = (ServletTilesApplicationContext) context;
return new JspTilesRequestContext(app.getServletContext(), pageContext);
}
throw new IllegalArgumentException("The context/pageContext combination is not supported.");
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java Wed Nov 1 18:03:00 2006
@@ -50,8 +50,8 @@
/**
* <p>Creates a map entry that can either allow modifications or not.</p>
*
- * @param key The entry key
- * @param value The entry value
+ * @param key The entry key
+ * @param value The entry value
* @param modifiable Whether the entry should allow modification or not
*/
public MapEntry(Object key, Object value, boolean modifiable) {
@@ -107,10 +107,10 @@
*/
public boolean equals(Object o) {
if (o != null && o instanceof Map.Entry) {
- Map.Entry entry = (Map.Entry)o;
+ Map.Entry entry = (Map.Entry) o;
return (this.getKey() == null ?
- entry.getKey() == null : this.getKey().equals(entry.getKey())) &&
- (this.getValue() == null ?
+ entry.getKey() == null : this.getKey().equals(entry.getKey())) &&
+ (this.getValue() == null ?
entry.getValue() == null : this.getValue().equals(entry.getValue()));
}
return false;
@@ -123,7 +123,7 @@
* @return The and'ed hashcode of the key and value
*/
public int hashCode() {
- return (this.getKey() == null ? 0 : this.getKey().hashCode()) ^
- (this.getValue() == null ? 0 : this.getValue().hashCode());
+ return (this.getKey() == null ? 0 : this.getKey().hashCode()) ^
+ (this.getValue() == null ? 0 : this.getValue().hashCode());
}
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java Wed Nov 1 18:03:00 2006
@@ -47,16 +47,18 @@
/**
* Create a TilesRequestContext for the given context,
* request, and response.
- * @param context the associated {@link TilesApplicationContext}
- * @param request the associated request. Typically a ServletRequest or PortletRequest.
+ *
+ * @param context the associated {@link TilesApplicationContext}
+ * @param request the associated request. Typically a ServletRequest or PortletRequest.
* @param response the associated response. Typically a ServletResponse or PortletResponse.
- * @return TilesRequestContext
+ * @return TilesRequestContext
*/
TilesRequestContext createRequestContext(TilesApplicationContext context,
Object request, Object response);
/**
* Create a TilesRequestContext for the given tiles and page contexts.
+ *
* @param context
* @param pageContext
* @return
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java Wed Nov 1 18:03:00 2006
@@ -17,45 +17,40 @@
*/
package org.apache.tiles.context.jsp;
-import org.apache.tiles.TilesRequestContext;
-import org.apache.tiles.TilesException;
-import org.apache.tiles.context.servlet.ServletTilesRequestContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.TilesException;
+import org.apache.tiles.TilesRequestContext;
+import org.apache.tiles.context.servlet.ServletTilesRequestContext;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.PageContext;
import java.io.IOException;
/**
* Context implementation used for executing tiles within a
* jsp tag library.
- *
*/
public class JspTilesRequestContext extends ServletTilesRequestContext
- implements TilesRequestContext {
+ implements TilesRequestContext {
private static final Log LOG =
LogFactory.getLog(JspTilesRequestContext.class);
-
private PageContext pageContext;
public JspTilesRequestContext(ServletContext context, PageContext pageContext) {
super(context,
- (HttpServletRequest)pageContext.getRequest(),
- (HttpServletResponse)pageContext.getResponse());
+ (HttpServletRequest) pageContext.getRequest(),
+ (HttpServletResponse) pageContext.getResponse());
this.pageContext = pageContext;
}
-
public void include(String path) throws TilesException {
try {
include(path, false);
@@ -66,19 +61,19 @@
}
}
- /**
+ /**
* Do an include of specified page using PageContext.include().
* <p/>
* This method is used by the Tiles package when an include is required.
* The Tiles package can use indifferently any form of this method.
*
- * @param path Uri or Definition name to forward.
+ * @param path Uri or Definition name to forward.
* @param flush If the writer should be flushed before the include
* @throws javax.servlet.ServletException - Thrown by call to pageContext.include()
- * @throws java.io.IOException - Thrown by call to pageContext.include()
+ * @throws java.io.IOException - Thrown by call to pageContext.include()
*/
public void include(String path, boolean flush) throws IOException, ServletException {
- JspUtil.doInclude(pageContext, path, flush);
+ JspUtil.doInclude(pageContext, path, flush);
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java Wed Nov 1 18:03:00 2006
@@ -20,11 +20,11 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.servlet.jsp.PageContext;
import javax.servlet.ServletException;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
+import javax.servlet.jsp.PageContext;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
/**
* Utility class for working within a Jsp environment.
@@ -32,7 +32,7 @@
public class JspUtil {
private static final Log LOG =
- LogFactory.getLog(JspUtil.class);
+ LogFactory.getLog(JspUtil.class);
/**
* JSP 2.0 include method to use which supports configurable flushing.
@@ -50,12 +50,12 @@
include = PageContext.class.getMethod("include", args);
} catch (NoSuchMethodException e) {
LOG.debug("Could not find JSP 2.0 include method. Using old one that doesn't support " +
- "configurable flushing.", e);
+ "configurable flushing.", e);
}
}
public static void doInclude(PageContext pageContext, String uri, boolean flush)
- throws IOException, ServletException {
+ throws IOException, ServletException {
try {
// perform include with new JSP 2.0 method that supports flushing
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java Wed Nov 1 18:03:00 2006
@@ -18,15 +18,8 @@
package org.apache.tiles.context.portlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.portlet.PortletContext;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java Wed Nov 1 18:03:00 2006
@@ -18,15 +18,8 @@
package org.apache.tiles.context.portlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.portlet.PortletContext;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java Wed Nov 1 18:03:00 2006
@@ -18,15 +18,8 @@
package org.apache.tiles.context.portlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.portlet.PortletRequest;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java Wed Nov 1 18:03:00 2006
@@ -18,15 +18,8 @@
package org.apache.tiles.context.portlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.portlet.PortletRequest;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java Wed Nov 1 18:03:00 2006
@@ -18,15 +18,8 @@
package org.apache.tiles.context.portlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.portlet.PortletRequest;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java Wed Nov 1 18:03:00 2006
@@ -18,15 +18,8 @@
package org.apache.tiles.context.portlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import javax.portlet.PortletSession;
+import java.util.*;
/**
@@ -65,7 +58,7 @@
return (false);
}
Enumeration keys =
- session.getAttributeNames(PortletSession.PORTLET_SCOPE);
+ session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
Object next = session.getAttribute((String) keys.nextElement());
if (next == value) {
@@ -79,7 +72,7 @@
public Set entrySet() {
Set set = new HashSet();
Enumeration keys =
- session.getAttributeNames(PortletSession.PORTLET_SCOPE);
+ session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
set.add(session.getAttribute((String) keys.nextElement()));
}
@@ -110,7 +103,7 @@
public Set keySet() {
Set set = new HashSet();
Enumeration keys =
- session.getAttributeNames(PortletSession.PORTLET_SCOPE);
+ session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
set.add(keys.nextElement());
}
@@ -149,7 +142,7 @@
public int size() {
int n = 0;
Enumeration keys =
- session.getAttributeNames(PortletSession.PORTLET_SCOPE);
+ session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
keys.nextElement();
n++;
@@ -161,7 +154,7 @@
public Collection values() {
List list = new ArrayList();
Enumeration keys =
- session.getAttributeNames(PortletSession.PORTLET_SCOPE);
+ session.getAttributeNames(PortletSession.PORTLET_SCOPE);
while (keys.hasMoreElements()) {
list.add(session.getAttribute((String) keys.nextElement()));
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java Wed Nov 1 18:03:00 2006
@@ -18,15 +18,15 @@
package org.apache.tiles.context.portlet;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesRequestContext;
+
import javax.portlet.PortletContext;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
-
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.TilesRequestContext;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
/**
* Portlet-based TilesApplicationContext implementation.
@@ -35,7 +35,7 @@
*/
public class PortletTilesApplicationContext implements TilesApplicationContext {
- /**
+ /**
* <p>The lazily instantiated <code>Map</code> of application scope
* attributes.</p>
*/
@@ -48,7 +48,6 @@
protected PortletContext context = null;
-
/**
* <p>The lazily instantiated <code>Map</code> of context initialization
* parameters.</p>
@@ -56,7 +55,9 @@
private Map initParam = null;
- /** Creates a new instance of PortletTilesApplicationContext */
+ /**
+ * Creates a new instance of PortletTilesApplicationContext
+ */
public PortletTilesApplicationContext(PortletContext context) {
initialize(context);
}
@@ -122,21 +123,20 @@
}
public URL[] getResources(String path) throws MalformedURLException {
- return new URL[] { context.getResource(path) };
+ return new URL[]{context.getResource(path)};
}
public TilesRequestContext createRequestContext(Object request, Object response) {
if (request instanceof PortletRequest && response instanceof PortletResponse) {
return new PortletTilesRequestContext(
- context,
- (PortletRequest) request,
- (PortletResponse) response);
+ context,
+ (PortletRequest) request,
+ (PortletResponse) response);
} else {
throw new IllegalArgumentException("Invalid context specified. "
- + context.getClass().getName());
+ + context.getClass().getName());
}
}
-
-
+
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java Wed Nov 1 18:03:00 2006
@@ -18,17 +18,13 @@
package org.apache.tiles.context.portlet;
+import org.apache.tiles.TilesRequestContext;
+
+import javax.portlet.*;
import java.io.IOException;
import java.util.Collections;
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.tiles.TilesRequestContext;
/**
* Portlet-based TilesApplicationContext implementation.
@@ -93,7 +89,9 @@
protected Map paramValues = null;
- /** Creates a new instance of PortletTilesRequestContext */
+ /**
+ * Creates a new instance of PortletTilesRequestContext
+ */
public PortletTilesRequestContext(PortletContext context, PortletRequest request,
PortletResponse response) {
super(context);
@@ -104,7 +102,7 @@
* <p>Initialize (or reinitialize) this {@link PortletTilesRequestContext} instance
* for the specified Portlet API objects.</p>
*
- * @param request The <code>PortletRequest</code> for this request
+ * @param request The <code>PortletRequest</code> for this request
* @param response The <code>PortletResponse</code> for this request
*/
public void initialize(PortletRequest request,
@@ -199,7 +197,7 @@
public Map getSessionScope() {
if ((sessionScope == null) && (request != null)) {
sessionScope =
- new PortletSessionScopeMap(request.getPortletSession());
+ new PortletSessionScopeMap(request.getPortletSession());
}
return (sessionScope);
}
@@ -211,7 +209,7 @@
public void include(String path) throws IOException, Exception {
if (isRenderRequest) {
context.getRequestDispatcher(path).include((RenderRequest) request,
- (RenderResponse) response);
+ (RenderResponse) response);
}
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java Wed Nov 1 18:03:00 2006
@@ -18,17 +18,11 @@
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.ServletContext;
import org.apache.tiles.context.MapEntry;
+import javax.servlet.ServletContext;
+import java.util.*;
+
/**
* <p>Private implementation of <code>Map</code> for servlet context
@@ -81,7 +75,7 @@
Enumeration keys = context.getAttributeNames();
String key;
while (keys.hasMoreElements()) {
- key = (String)keys.nextElement();
+ key = (String) keys.nextElement();
set.add(new MapEntry(key, context.getAttribute(key), true));
}
return (set);
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java Wed Nov 1 18:03:00 2006
@@ -17,16 +17,10 @@
*/
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.context.MapEntry;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java Wed Nov 1 18:03:00 2006
@@ -18,16 +18,10 @@
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.context.MapEntry;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java Wed Nov 1 18:03:00 2006
@@ -18,16 +18,10 @@
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.ServletContext;
import org.apache.tiles.context.MapEntry;
+
+import javax.servlet.ServletContext;
+import java.util.*;
/**
* <p>Private implementation of <code>Map</code> for servlet context
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java Wed Nov 1 18:03:00 2006
@@ -18,17 +18,11 @@
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
import org.apache.tiles.context.MapEntry;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
/**
* <p>Private implementation of <code>Map</code> for servlet parameter
@@ -75,7 +69,7 @@
Enumeration keys = request.getParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = (String)keys.nextElement();
+ key = (String) keys.nextElement();
set.add(new MapEntry(key, request.getParameter(key), false));
}
return (set);
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java Wed Nov 1 18:03:00 2006
@@ -17,16 +17,10 @@
*/
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.ServletRequest;
import org.apache.tiles.context.MapEntry;
+
+import javax.servlet.ServletRequest;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java Wed Nov 1 18:03:00 2006
@@ -18,16 +18,10 @@
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.ServletRequest;
import org.apache.tiles.context.MapEntry;
+
+import javax.servlet.ServletRequest;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java Wed Nov 1 18:03:00 2006
@@ -16,16 +16,10 @@
package org.apache.tiles.context.servlet;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.servlet.http.HttpSession;
import org.apache.tiles.context.MapEntry;
+
+import javax.servlet.http.HttpSession;
+import java.util.*;
/**
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java Wed Nov 1 18:03:00 2006
@@ -18,14 +18,15 @@
package org.apache.tiles.context.servlet;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Map;
+import org.apache.tiles.TilesApplicationContext;
+import org.apache.tiles.TilesRequestContext;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.TilesRequestContext;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Map;
/**
* Servlet-bsed implementation of the TilesApplicationContext interface.
@@ -51,7 +52,9 @@
private Map initParam = null;
- /** Creates a new instance of ServletTilesApplicationContext */
+ /**
+ * Creates a new instance of ServletTilesApplicationContext
+ */
public ServletTilesApplicationContext(ServletContext servletContext) {
initialize(servletContext);
}
@@ -67,7 +70,6 @@
}
-
public Map getInitParams() {
if ((initParam == null) && (servletContext != null)) {
@@ -82,7 +84,7 @@
}
public URL[] getResources(String path) throws MalformedURLException {
- return new URL[] { servletContext.getResource(path) };
+ return new URL[]{servletContext.getResource(path)};
}
public ServletContext getServletContext() {
@@ -90,7 +92,6 @@
}
-
/**
* <p>Initialize (or reinitialize) this {@link TilesApplicationContext} instance
* for the specified Servlet API objects.</p>
@@ -129,9 +130,9 @@
(HttpServletRequest) request,
(HttpServletResponse) response
);
- } else {
+ } else {
throw new IllegalArgumentException("Invalid context specified. "
- + servletContext.getClass().getName());
+ + servletContext.getClass().getName());
}
}
}
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java?view=diff&rev=470185&r1=470184&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java Wed Nov 1 18:03:00 2006
@@ -18,17 +18,14 @@
package org.apache.tiles.context.servlet;
+import org.apache.tiles.TilesRequestContext;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.TilesRequestContext;
/**
* Servlet-bsed implementation of the TilesApplicationContext interface.
@@ -68,7 +65,7 @@
*/
private Map paramValues = null;
- /**
+ /**
* <p>The lazily instantiated <code>Map</code> of request scope
* attributes.</p>
*/
@@ -81,7 +78,9 @@
private Map sessionScope = null;
- /** Creates a new instance of ServletTilesRequestContext */
+ /**
+ * Creates a new instance of ServletTilesRequestContext
+ */
public ServletTilesRequestContext(ServletContext servletContext,
HttpServletRequest request,
HttpServletResponse response) {
@@ -183,8 +182,7 @@
* <p>Initialize (or reinitialize) this {@link ServletTilesRequestContext} instance
* for the specified Servlet API objects.</p>
*
-
- * @param request The <code>HttpServletRequest</code> for this request
+ * @param request The <code>HttpServletRequest</code> for this request
* @param response The <code>HttpServletResponse</code> for this request
*/
public void initialize(HttpServletRequest request,
Copied: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentAttribute.java (from r469623, struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentAttribute.java)
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentAttribute.java?view=diff&rev=470185&p1=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentAttribute.java&r1=469623&p2=struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentAttribute.java&r2=470185
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/ComponentAttribute.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentAttribute.java Wed Nov 1 18:03:00 2006
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.tiles;
+package org.apache.tiles.definition;
import java.io.Serializable;
/**
- * Common implementation of attribute definition.
+ * Common implementation of attribute definition.
*
* @version $Rev$ $Date$
*/
@@ -31,22 +31,23 @@
* Role associated to this attribute.
*/
protected String role = null;
-
- protected Object value=null;
-
+
+ protected Object value = null;
+
private String type = null;
-
+
private String name = null;
/**
* Constructor.
- * @param value Object to store.
+ *
*/
public ComponentAttribute() {
}
/**
* Constructor.
+ *
* @param value Object to store.
*/
public ComponentAttribute(Object value) {
@@ -55,17 +56,19 @@
/**
* Constructor.
+ *
* @param value Object to store.
*/
public ComponentAttribute(String name, Object value) {
this.name = name;
this.value = value;
}
-
+
/**
* Constructor.
+ *
* @param value Object to store.
- * @param role Asociated role.
+ * @param role Asociated role.
*/
public ComponentAttribute(Object value, String role) {
this.value = value;
@@ -74,9 +77,10 @@
/**
* Constructor.
+ *
* @param value Object to store.
- * @param role Asociated role.
- * @param type Attribute type.
+ * @param role Asociated role.
+ * @param type Attribute type.
*/
public ComponentAttribute(Object value, String role, String type) {
this.value = value;
@@ -93,6 +97,7 @@
/**
* Set role.
+ *
* @param role Associated role.
*/
public void setRole(String role) {
@@ -108,6 +113,7 @@
/**
* Set value.
+ *
* @param value New value.
*/
public void setValue(Object value) {
Propchange: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentAttribute.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/ComponentAttribute.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL