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/04/11 17:44:59 UTC
svn commit: r527536 [1/4] - in /tiles/framework/trunk: ./ tiles-api/
tiles-api/src/main/java/org/apache/tiles/
tiles-api/src/main/java/org/apache/tiles/access/
tiles-api/src/main/java/org/apache/tiles/mgmt/
tiles-api/src/main/java/org/apache/tiles/web/...
Author: apetrelli
Date: Wed Apr 11 08:44:51 2007
New Revision: 527536
URL: http://svn.apache.org/viewvc?view=rev&rev=527536
Log:
TILES-151
First run of Checkstyle fixes.
Modified:
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-api/pom.xml
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesException.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/AttributeContextMutator.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java
tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/Constants.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletParamValuesMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletRequestScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletSessionScopeMap.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesApplicationContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesContextFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletTilesRequestContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definition.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactoryException.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/listener/TilesListener.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/LocaleResolver.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/BasicPreparerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/NoSuchPreparerException.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerException.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/PreparerFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/preparer/ViewPreparerSupport.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/ServletContextAdapter.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/servlet/TilesServlet.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/ClassUtil.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/portlet/PortletTilesRequestContextTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/context/servlet/ServletTilesRequestContextTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockPublicUrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestReloadableDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestUrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactoryTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainerTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/preparer/BasicPreparerFactoryTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/servlet/ServletContextAdapterTest.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/util/RollingVectorEnumeration.java
tiles/framework/trunk/tiles-jsp/pom.xml
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspUtil.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddAttributeTagParent.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AddListAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/AttributeTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ContainerTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/GetAsStringTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/ImportAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertDefinitionTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/InsertTemplateTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutAttributeTagParent.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/PutListAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RenderTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/RoleSecurityTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DestroyContainerTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/definition/TestRuntimeConfiguredContext.java
tiles/framework/trunk/tiles-test/pom.xml
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/preparer/TestViewPreparer.java
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_GB.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs_en_US.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs_fr.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/tiles-defs_it.xml
tiles/framework/trunk/tiles-test/src/main/webapp/WEB-INF/web.xml
tiles/framework/trunk/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionNoTypeTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/CompositeDefinitionWithInnerConfiguredDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionNoTypeTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/CompositeDefinitionWithInnerDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredCompositeDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionExceptionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionFromClasspathTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionInlineTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideAndNotTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionOverrideTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionWithConfiguredPreparerTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ConfiguredDefinitionWithPreparerTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagExtendTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/DefinitionTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ImportAttributeTagAllTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/ImportAttributeTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/InitContainerTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/LocalizationTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/PutListTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/PutTagTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/PutTagWithELTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/PutTagWithServletTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/TestSuite.html
tiles/framework/trunk/tiles-test/src/test/selenium/TilesDefinitionFilterTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/TilesDispatchServletTest.html
tiles/framework/trunk/tiles-test/src/test/selenium/WelcomePageTest.html
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Wed Apr 11 08:44:51 2007
@@ -19,7 +19,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: tiles/framework/trunk/tiles-api/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/pom.xml?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/pom.xml (original)
+++ tiles/framework/trunk/tiles-api/pom.xml Wed Apr 11 08:44:51 2007
@@ -19,7 +19,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Attribute.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles;
@@ -206,7 +205,7 @@
/**
* Returns the type of this attribute.
- *
+ *
* @return The attribute type. It can be <code>string</code>,
* <code>template</code>, <code>definition</code>.
*/
@@ -216,7 +215,7 @@
/**
* Sets the type of this attribute.
- *
+ *
* @param type The attribute type. It can be <code>string</code>,
* <code>template</code>, <code>definition</code>.
*/
@@ -267,7 +266,7 @@
/**
* Sets the body of this attribute.
- *
+ *
* @param body The attribute body.
*/
// FIXME Is it necessary?
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles;
@@ -40,7 +39,7 @@
void addAll(Map<String, Attribute> newAttributes);
/**
- * Add all attributes to the context
+ * Add all attributes to the context.
*
* @param defaultAttributes attributes which should be present.
*/
@@ -70,7 +69,7 @@
void putAttribute(String name, Attribute value);
/**
- * Clear the attributes
+ * Clear the attributes.
*/
void clear();
}
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesApplicationContext.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles;
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesContainer.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles;
@@ -69,7 +68,7 @@
* @return The newly created context.
*/
AttributeContext startContext(Object... requestItems);
-
+
/**
* Ends a context, where attribute values are stored independently
* from others.<br>
@@ -88,8 +87,9 @@
void prepare(String definition, Object... requestItems) throws TilesException;
/**
- * Render the given tiles request
- * @param definition the current definition
+ * Render the given tiles request.
+ *
+ * @param definition the current definition.
* @param requestItems the current request objects.
*
* @throws TilesException is processing fails.
@@ -105,7 +105,7 @@
* @param requestItems the current request objects.
* @throws TilesException If something goes wrong during accessing Tiles
* elements.
- * @throws IOException If something goes wrong during writing to the output.
+ * @throws IOException If something goes wrong during writing to the output.
*/
void render(Attribute attribute, Writer writer, Object... requestItems)
throws TilesException, IOException;
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesException.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesException.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesException.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/TilesException.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles;
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/access/TilesAccess.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.access;
@@ -35,7 +34,13 @@
*
* @version $Rev$ $Date$
*/
-public class TilesAccess {
+public final class TilesAccess {
+
+ /**
+ * Constructor, private to avoid instantiation.
+ */
+ private TilesAccess() {
+ }
/**
* The logging object.
@@ -81,7 +86,7 @@
throws TilesException {
if (container == null) {
- if(LOG.isInfoEnabled()) {
+ if (LOG.isInfoEnabled()) {
LOG.info("Removing TilesContext for context: " + context.getClass().getName());
}
removeAttribute(context, CONTAINER_ATTRIBUTE);
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.mgmt;
@@ -35,7 +34,7 @@
/**
* Register a new definition with the container.
*
- * @param definition
+ * @param definition The definition to register.
* @param requestItems the current request objects.
* @throws TilesException If something goes wrong during registration.
*/
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.mgmt;
@@ -39,7 +38,7 @@
*/
protected String inherit;
/**
- * TileDefinition name
+ * TileDefinition name.
*/
protected String name = null;
/**
@@ -55,7 +54,7 @@
*/
protected String role = null;
/**
- * Associated ViewPreparer URL or classname, if defined
+ * Associated ViewPreparer URL or classname, if defined.
*/
protected String preparer = null;
@@ -169,7 +168,7 @@
}
/**
- * Get associated preparerInstance
+ * Get associated preparerInstance.
*
* @return The preparer name.
*/
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/AttributeContextMutator.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/AttributeContextMutator.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/AttributeContextMutator.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/AttributeContextMutator.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.web;
@@ -37,7 +36,7 @@
/**
* Mutate a <code>AttributeContext</code>.
- *
+ *
* @param context The attribute context to mutate.
* @param request The current servlet request.
*/
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDecorationFilter.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.web;
@@ -68,7 +67,7 @@
* </filter-mapping>
* </xmp>
* The filter will intercept all requests to the indicated url pattern
- * store the initial request path as the "body" attribute and then render the
+ * store the initial request path as the "body" attribute and then render the
* "test.definition" definition.
*/
public class TilesDecorationFilter implements Filter {
@@ -103,13 +102,13 @@
/**
* The object that will mutate the attribute context so that it uses
- * different attributes.
+ * different attributes.
*/
private AttributeContextMutator mutator = null;
/**
* Returns the filter configuration object.
- *
+ *
* @return The filter configuration.
*/
public FilterConfig getFilterConfig() {
@@ -118,7 +117,7 @@
/**
* Returns the servlet context.
- *
+ *
* @return The servlet context.
*/
public ServletContext getServletContext() {
@@ -141,9 +140,10 @@
alternateDefinitions = parseAlternateDefinitions();
temp = config.getInitParameter("mutator");
- if(temp != null) {
+ if (temp != null) {
try {
- mutator = (AttributeContextMutator)Class.forName(temp).newInstance();
+ mutator = (AttributeContextMutator) Class.forName(temp)
+ .newInstance();
} catch (Exception e) {
throw new ServletException("Unable to instantiate specified context mutator.", e);
}
@@ -162,14 +162,15 @@
protected Map<String, String> parseAlternateDefinitions() {
Map<String, String> map = new HashMap<String, String>();
Enumeration<String> e = filterConfig.getInitParameterNames();
- while(e.hasMoreElements()) {
+ while (e.hasMoreElements()) {
String parm = e.nextElement();
- if(parm.startsWith("definition(") && parm.endsWith("*)")) {
+ if (parm.startsWith("definition(") && parm.endsWith("*)")) {
String value = filterConfig.getInitParameter(parm);
String mask = parm.substring("definition(".length());
mask = mask.substring(0, mask.lastIndexOf("*)"));
map.put(mask, value);
- LOG.info("Mapping all requests matching '"+mask+"*' to definition '"+value+"'");
+ LOG.info("Mapping all requests matching '" + mask
+ + "*' to definition '" + value + "'");
}
}
return map;
@@ -190,7 +191,9 @@
String definitionName = getDefinitionForRequest(req);
container.render(definitionName, req, res);
} catch (TilesException e) {
- throw new ServletException("Error wrapping jsp with tile definition. "+e.getMessage(), e);
+ throw new ServletException(
+ "Error wrapping jsp with tile definition. "
+ + e.getMessage(), e);
}
}
@@ -201,12 +204,12 @@
* @return The final definition name.
*/
private String getDefinitionForRequest(ServletRequest request) {
- if(alternateDefinitions.size() < 1) {
+ if (alternateDefinitions.size() < 1) {
return definitionName;
}
String base = getRequestBase(request);
- for(Map.Entry<String, String> pair : alternateDefinitions.entrySet()) {
- if(base.startsWith(pair.getKey())) {
+ for (Map.Entry<String, String> pair : alternateDefinitions.entrySet()) {
+ if (base.startsWith(pair.getKey())) {
return pair.getValue();
}
}
@@ -216,7 +219,7 @@
/**
* Returns the request base, i.e. the the URL to calculate all the relative
* paths.
- *
+ *
* @param request The request object to use.
* @return The request base.
*/
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/web/TilesDispatchServlet.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.web;
@@ -49,7 +48,7 @@
/**
* The object that will mutate the attribute context so that it uses
- * different attributes.
+ * different attributes.
*/
private AttributeContextMutator mutator;
@@ -58,9 +57,10 @@
public void init() throws ServletException {
super.init();
String temp = getInitParameter("mutator");
- if(temp != null) {
+ if (temp != null) {
try {
- mutator = (AttributeContextMutator)Class.forName(temp).newInstance();
+ mutator = (AttributeContextMutator) Class.forName(temp)
+ .newInstance();
} catch (Exception e) {
throw new ServletException("Unable to instantiate specified context mutator.", e);
}
@@ -112,7 +112,7 @@
}
/**
- * Default no-op mutator
+ * Default no-op mutator.
*/
class DefaultMutator implements AttributeContextMutator {
Modified: tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java (original)
+++ tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.access;
@@ -51,7 +50,7 @@
*/
public void testSetContext() throws TilesException {
TilesContainer container = EasyMock.createMock(TilesContainer.class);
- context.setAttribute(TilesAccess.CONTAINER_ATTRIBUTE,container);
+ context.setAttribute(TilesAccess.CONTAINER_ATTRIBUTE, container);
EasyMock.replay(context);
TilesAccess.setContainer(context, container);
EasyMock.verify(context);
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Wed Apr 11 08:44:51 2007
@@ -19,7 +19,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/Constants.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/Constants.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/Constants.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/Constants.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/MenuItem.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.beans;
@@ -34,14 +33,14 @@
/**
* Sets the value (i.e. the visible part) of this menu item.
*
- * @param value The value of this item.
+ * @param value The value of this item.
*/
public void setValue(String value);
/**
* Returns the value (i.e. the visible part) of this menu item.
*
- * @return The value of this item.
+ * @return The value of this item.
*/
public String getValue();
@@ -75,14 +74,14 @@
/**
* Sets the tooltip text.
- *
+ *
* @param link The tooltip text.
*/
public void setTooltip(String link);
/**
* Returns the tooltip text.
- *
+ *
* @return The tooltip text.
*/
public String getTooltip();
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.beans;
@@ -61,7 +60,7 @@
/**
* Sets the value of the item, i.e. what is really visible to the user.
*
- * @param value The value of the item.
+ * @param value The value of the item.
*/
public void setValue(String value) {
this.value = value;
@@ -70,7 +69,7 @@
/**
* Returns the value of the item, i.e. what is really visible to the user.
*
- * @return The value of the item.
+ * @return The value of the item.
*/
public String getValue() {
return value;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicAttributeContext.java Wed Apr 11 08:44:51 2007
@@ -17,18 +17,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.Constants;
-import org.apache.tiles.AttributeContext;
-import org.apache.tiles.Attribute;
-
import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.Stack;
+
+import org.apache.tiles.Attribute;
+import org.apache.tiles.AttributeContext;
+import org.apache.tiles.Constants;
/**
* Basic implementation for <code>AttributeContext</code>.
@@ -70,7 +73,7 @@
public BasicAttributeContext(AttributeContext context) {
this.attributes = new HashMap<String, Attribute>();
Iterator<String> names = context.getAttributeNames();
- while(names.hasNext()) {
+ while (names.hasNext()) {
String name = names.next();
attributes.put(name, context.getAttribute(name));
}
@@ -167,7 +170,7 @@
* @return BasicAttributeContext or null if context is not found or an
* jspException is present in the request.
*/
- static public AttributeContext getContext(TilesRequestContext tilesContext) {
+ public static AttributeContext getContext(TilesRequestContext tilesContext) {
Stack<AttributeContext> contextStack = getContextStack(tilesContext);
if (!contextStack.isEmpty()) {
return contextStack.peek();
@@ -175,7 +178,7 @@
return null;
}
}
-
+
/**
* Returns the context stack.
*
@@ -183,7 +186,7 @@
* @return The needed stack of contexts.
*/
@SuppressWarnings("unchecked")
- static public Stack<AttributeContext> getContextStack(TilesRequestContext tilesContext) {
+ public static Stack<AttributeContext> getContextStack(TilesRequestContext tilesContext) {
Stack<AttributeContext> contextStack =
(Stack<AttributeContext>) tilesContext.getRequestScope().get(
Constants.ATTRIBUTE_CONTEXT_STACK);
@@ -192,29 +195,29 @@
tilesContext.getRequestScope().put(Constants.ATTRIBUTE_CONTEXT_STACK,
contextStack);
}
-
+
return contextStack;
}
-
+
/**
* Pushes a context object in the stack.
*
* @param context The context to push.
* @param tilesContext The Tiles context object to use.
*/
- static public void pushContext(AttributeContext context,
+ public static void pushContext(AttributeContext context,
TilesRequestContext tilesContext) {
Stack<AttributeContext> contextStack = getContextStack(tilesContext);
contextStack.push(context);
}
-
+
/**
- * Pops a context object out of the stack
+ * Pops a context object out of the stack.
*
* @param tilesContext The Tiles context object to use.
* @return The popped context object.
*/
- static public AttributeContext popContext(TilesRequestContext tilesContext) {
+ public static AttributeContext popContext(TilesRequestContext tilesContext) {
Stack<AttributeContext> contextStack = getContextStack(tilesContext);
return contextStack.pop();
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context;
@@ -25,14 +24,13 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import java.util.Map;
/**
* Default implementation for TilesContextFactory, that creates a chain of
* sub-factories, trying each one until it returns a not-null value.
- *
+ *
* @version $Rev$ $Date$
*/
public class ChainedTilesContextFactory implements TilesContextFactory {
@@ -40,7 +38,8 @@
/**
* Factory class names initialization parameter to use.
*/
- public static final String FACTORY_CLASS_NAMES = "org.apache.tiles.context.ChainTilesContextFactory.FACTORY_CLASS_NAMES";
+ public static final String FACTORY_CLASS_NAMES =
+ "org.apache.tiles.context.ChainTilesContextFactory.FACTORY_CLASS_NAMES";
/**
* The default class names to instantiate that compose the chain..
@@ -49,11 +48,12 @@
"org.apache.tiles.context.servlet.ServletTilesContextFactory",
"org.apache.tiles.context.portlet.PortletTilesContextFactory",
"org.apache.tiles.jsp.context.JspTilesContextFactory" };
-
+
/**
* The logging object.
*/
- private static Log LOG = LogFactory.getLog(ChainedTilesContextFactory.class);
+ private static final Log LOG = LogFactory
+ .getLog(ChainedTilesContextFactory.class);
/**
* The Tiles context factories composing the chain.
@@ -62,7 +62,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public void init(Map<String, String> configParameters) {
+ public void init(Map<String, String> configParameters) {
String[] classNames = null;
String classNamesString = configParameters.get(FACTORY_CLASS_NAMES);
if (classNamesString != null) {
@@ -76,7 +76,7 @@
for (int i = 0; i < classNames.length; i++) {
try {
Class<TilesContextFactory> clazz = (Class<TilesContextFactory>) Class
- .forName(classNames[i]);
+ .forName(classNames[i]);
if (TilesContextFactory.class.isAssignableFrom(clazz)) {
factories[i] = clazz.newInstance();
} else {
@@ -87,7 +87,8 @@
} catch (ClassNotFoundException e) {
// We log it, because it could be a default configuration class that
// is simply not present.
- LOG.warn("Cannot find TilesContextFactory class "+ classNames[i], e);
+ LOG.warn("Cannot find TilesContextFactory class "
+ + classNames[i], e);
} catch (InstantiationException e) {
throw new IllegalArgumentException(
"Cannot instantiate TilesFactoryClass " + classNames[i],
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context;
@@ -93,8 +92,8 @@
*
* @param value Object to add.
*/
- public void addObject( Object value ) {
- list.add( value );
+ public void addObject(Object value) {
+ list.add(value);
}
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context;
@@ -112,13 +111,13 @@
* @return True if equal, else false
*/
@SuppressWarnings("unchecked")
- public boolean equals(Object o) {
+ public boolean equals(Object o) {
if (o != null && o instanceof Map.Entry) {
Map.Entry<K, V> entry = (Map.Entry<K, V>) o;
- return (this.getKey() == null ?
- entry.getKey() == null : this.getKey().equals(entry.getKey())) &&
- (this.getValue() == null ?
- entry.getValue() == null : this.getValue().equals(entry.getValue()));
+ return (this.getKey() == null ? entry.getKey() == null : this
+ .getKey().equals(entry.getKey()))
+ && (this.getValue() == null ? entry.getValue() == null
+ : this.getValue().equals(entry.getValue()));
}
return false;
}
@@ -130,7 +129,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: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java Wed Apr 11 08:44:51 2007
@@ -17,12 +17,10 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context;
import org.apache.tiles.TilesApplicationContext;
-import org.apache.tiles.context.TilesRequestContext;
import java.util.Map;
@@ -37,15 +35,15 @@
/**
* Initialize the factory.
*
- * @param configurationParameters A map of parameters.
+ * @param configurationParameters A map of parameters.
*/
void init(Map<String, String> configurationParameters);
/**
* Create a TilesApplicationContext for the given context.
*
- * @param context
- * @return TilesApplicationContext
+ * @param context The (application) context to use.
+ * @return TilesApplicationContext The Tiles application context.
*/
TilesApplicationContext createApplicationContext(Object context);
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContext.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context;
@@ -25,8 +24,6 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.tiles.locale.LocaleResolver;
-
/**
* Encapsulation of request information.
*
@@ -39,7 +36,7 @@
* Return an immutable Map that maps header names to the first (or only)
* header value (as a String).
*
- * @return The header map.
+ * @return The header map.
*/
Map<String, String> getHeader();
@@ -48,7 +45,7 @@
* specified in the request (as a String array). Header names must be
* matched in a case-insensitive manner.
*
- * @return The header values map.
+ * @return The header values map.
*/
Map<String, String[]> getHeaderValues();
@@ -56,7 +53,7 @@
* Return a mutable Map that maps request scope attribute names to their
* values.
*
- * @return The request scope map.
+ * @return The request scope map.
*/
Map<String, Object> getRequestScope();
@@ -64,7 +61,7 @@
* Return a mutable Map that maps session scope attribute names to their
* values.
*
- * @return The request scope map.
+ * @return The request scope map.
*/
Map<String, Object> getSessionScope();
@@ -88,7 +85,7 @@
* Return an immutable Map that maps request parameter names to the first
* (or only) value (as a String).
*
- * @return The parameter map.
+ * @return The parameter map.
*/
Map<String, String> getParam();
@@ -96,7 +93,7 @@
* Return an immutable Map that maps request parameter names to the set of
* all values (as a String array).
*
- * @return The parameter values map.
+ * @return The parameter values map.
*/
Map<String, String[]> getParamValues();
@@ -105,12 +102,13 @@
*
* @return The current request locale. It is the locale of the request
* object itself and it is NOT the locale that the user wants to use. See
- * {@link LocaleResolver} to implement strategies to resolve locales.
+ * {@link org.apache.tiles.locale.LocaleResolver} to implement strategies to
+ * resolve locales.
*/
Locale getRequestLocale();
/**
- * Determine whether or not the specified user is in the given role
+ * Determine whether or not the specified user is in the given role.
* @param role the role to check against.
* @return <code>true</code> if the user is in the given role.
*/
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/TilesRequestContextWrapper.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.enhanced;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContext.java Wed Apr 11 08:44:51 2007
@@ -17,17 +17,19 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.enhanced;
-import org.apache.tiles.TilesApplicationContext;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.logging.Log;
-
-import java.util.*;
-import java.net.URL;
import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.TilesApplicationContext;
/**
* ApplicationContext decorator used to provide
@@ -101,10 +103,10 @@
/** {@inheritDoc} */
public URL getResource(String path) throws IOException {
URL rootUrl = rootContext.getResource(path);
- if(rootUrl == null) {
+ if (rootUrl == null) {
Set<URL> resources = getResources(path);
resources.remove(null);
- if(resources.size() > 0) {
+ if (resources.size() > 0) {
rootUrl = resources.toArray(new URL[resources.size()])[0];
}
}
@@ -131,11 +133,11 @@
resources.addAll(searchResources(getClass().getClassLoader(), path));
ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
- if(contextLoader != null) {
+ if (contextLoader != null) {
resources.addAll(searchResources(contextLoader, path));
}
- if(resources.size() == 0 && path.startsWith("/")) {
+ if (resources.size() == 0 && path.startsWith("/")) {
return getClasspathResources(path.substring(1));
}
@@ -154,11 +156,12 @@
Set<URL> resources = new HashSet<URL>();
try {
Enumeration<URL> e = loader.getResources(path);
- while(e.hasMoreElements()) {
+ while (e.hasMoreElements()) {
resources.add(e.nextElement());
}
} catch (IOException e) {
- LOG.warn("Unable to retrieved resources from classloader: "+loader, e);
+ LOG.warn("Unable to retrieved resources from classloader: "
+ + loader, e);
}
return resources;
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletApplicationScopeMap.java Wed Apr 11 08:44:51 2007
@@ -17,17 +17,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
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 org.apache.tiles.context.MapEntry;
-import java.util.*;
-
/**
* <p>Private implementation of <code>Map</code> for portlet context
@@ -41,7 +47,7 @@
/**
* Constructor.
- *
+ *
* @param context The portlet context to use.
*/
public PortletApplicationScopeMap(PortletContext context) {
@@ -72,7 +78,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public boolean containsValue(Object value) {
+ public boolean containsValue(Object value) {
if (value == null) {
return (false);
}
@@ -89,7 +95,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<Map.Entry<String, Object>> entrySet() {
+ public Set<Map.Entry<String, Object>> entrySet() {
Set<Map.Entry<String, Object>> set = new HashSet<Map.Entry<String, Object>>();
Enumeration<String> keys = context.getAttributeNames();
String key;
@@ -127,7 +133,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<String> keySet() {
+ public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = context.getAttributeNames();
while (keys.hasMoreElements()) {
@@ -170,7 +176,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public int size() {
+ public int size() {
int n = 0;
Enumeration<String> keys = context.getAttributeNames();
while (keys.hasMoreElements()) {
@@ -183,7 +189,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Collection<Object> values() {
+ public Collection<Object> values() {
List<Object> list = new ArrayList<Object>();
Enumeration<String> keys = context.getAttributeNames();
while (keys.hasMoreElements()) {
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletInitParamMap.java Wed Apr 11 08:44:51 2007
@@ -17,18 +17,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
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 org.apache.tiles.context.MapEntry;
-import java.util.*;
-
-
/**
* <p>Private implementation of <code>Map</code> for portlet context
* init parameters.</p>
@@ -81,13 +86,13 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<Map.Entry<String, String>> entrySet() {
+ public Set<Map.Entry<String, String>> entrySet() {
Set<Map.Entry<String, String>> set = new HashSet<Map.Entry<String, String>>();
Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
- String key = keys.nextElement();
+ String key = keys.nextElement();
set.add(new MapEntry<String, String>(key, context
- .getInitParameter(key), false));
+ .getInitParameter(key), false));
}
return (set);
}
@@ -119,7 +124,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<String> keySet() {
+ public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
@@ -149,7 +154,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public int size() {
+ public int size() {
int n = 0;
Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
@@ -162,7 +167,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Collection<String> values() {
+ public Collection<String> values() {
List<String> list = new ArrayList<String>();
Enumeration<String> keys = context.getInitParameterNames();
while (keys.hasMoreElements()) {
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamMap.java Wed Apr 11 08:44:51 2007
@@ -17,18 +17,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
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 org.apache.tiles.context.MapEntry;
-import java.util.*;
-
-
/**
* <p>Private implementation of <code>Map</code> for portlet parameter
* name-value.</p>
@@ -81,14 +86,14 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<Map.Entry<String, String>> entrySet() {
+ public Set<Map.Entry<String, String>> entrySet() {
Set<Map.Entry<String, String>> set = new HashSet<Map.Entry<String, String>>();
Enumeration<String> keys = request.getParameterNames();
String key;
while (keys.hasMoreElements()) {
- key = keys.nextElement();
+ key = keys.nextElement();
set.add(new MapEntry<String, String>(key,
- request.getParameter(key), false));
+ request.getParameter(key), false));
}
return (set);
}
@@ -120,7 +125,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<String> keySet() {
+ public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
@@ -150,7 +155,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public int size() {
+ public int size() {
int n = 0;
Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
@@ -163,7 +168,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Collection<String> values() {
+ public Collection<String> values() {
List<String> list = new ArrayList<String>();
Enumeration<String> keys = request.getParameterNames();
while (keys.hasMoreElements()) {
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletParamValuesMap.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.portlet;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletRequestScopeMap.java Wed Apr 11 08:44:51 2007
@@ -17,18 +17,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
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 org.apache.tiles.context.MapEntry;
-import java.util.*;
-
-
/**
* <p>Private implementation of <code>Map</code> for portlet request
* attributes.</p>
@@ -72,7 +77,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public boolean containsValue(Object value) {
+ public boolean containsValue(Object value) {
if (value == null) {
return (false);
}
@@ -89,14 +94,14 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<Map.Entry<String, Object>> entrySet() {
+ public Set<Map.Entry<String, Object>> entrySet() {
Set<Map.Entry<String, Object>> set = new HashSet<Map.Entry<String, Object>>();
Enumeration<String> keys = request.getAttributeNames();
String key;
while (keys.hasMoreElements()) {
- key = keys.nextElement();
+ key = keys.nextElement();
set.add(new MapEntry<String, Object>(key,
- request.getAttribute(key), true));
+ request.getAttribute(key), true));
}
return (set);
}
@@ -128,7 +133,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<String> keySet() {
+ public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
@@ -171,7 +176,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public int size() {
+ public int size() {
int n = 0;
Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
@@ -184,7 +189,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Collection<Object> values() {
+ public Collection<Object> values() {
List<Object> list = new ArrayList<Object>();
Enumeration<String> keys = request.getAttributeNames();
while (keys.hasMoreElements()) {
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletSessionScopeMap.java Wed Apr 11 08:44:51 2007
@@ -17,18 +17,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
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 org.apache.tiles.context.MapEntry;
-import java.util.*;
-
-
/**
* <p>Private implementation of <code>Map</code> for portlet session
* attributes.</p>
@@ -72,7 +77,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public boolean containsValue(Object value) {
+ public boolean containsValue(Object value) {
if (value == null) {
return (false);
}
@@ -90,13 +95,13 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<Map.Entry<String, Object>> entrySet() {
+ public Set<Map.Entry<String, Object>> entrySet() {
Set<Map.Entry<String, Object>> set = new HashSet<Map.Entry<String, Object>>();
Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
String key;
while (keys.hasMoreElements()) {
- key = keys.nextElement();
+ key = keys.nextElement();
set.add(new MapEntry<String, Object>(key, session.getAttribute(key), true));
}
return (set);
@@ -129,7 +134,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<String> keySet() {
+ public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
@@ -173,7 +178,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public int size() {
+ public int size() {
int n = 0;
Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
@@ -187,7 +192,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Collection<Object> values() {
+ public Collection<Object> values() {
List<Object> list = new ArrayList<Object>();
Enumeration<String> keys =
session.getAttributeNames(PortletSession.PORTLET_SCOPE);
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesApplicationContext.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.portlet;
@@ -61,9 +60,9 @@
/**
- * Creates a new instance of PortletTilesApplicationContext
+ * Creates a new instance of PortletTilesApplicationContext.
*
- * @param context The portlet context to use.
+ * @param context The portlet context to use.
*/
public PortletTilesApplicationContext(PortletContext context) {
initialize(context);
@@ -103,7 +102,7 @@
/**
* <p>Return the {@link PortletContext} for this context.</p>
*
- * @return The original portlet context.
+ * @return The original portlet context.
*/
public PortletContext getPortletContext() {
return (this.context);
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesContextFactory.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesContextFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesContextFactory.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.portlet;
@@ -25,8 +24,6 @@
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.context.portlet.PortletTilesApplicationContext;
-import org.apache.tiles.context.portlet.PortletTilesRequestContext;
import javax.portlet.PortletContext;
import javax.portlet.PortletRequest;
@@ -50,7 +47,7 @@
PortletContext portletContext = (PortletContext) context;
return new PortletTilesApplicationContext(portletContext);
}
-
+
return null;
}
@@ -66,7 +63,7 @@
(PortletResponse) requestItems[1]);
}
}
-
+
return null;
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/portlet/PortletTilesRequestContext.java Wed Apr 11 08:44:51 2007
@@ -17,18 +17,23 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.portlet;
-import org.apache.tiles.context.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.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.tiles.context.TilesRequestContext;
+
/**
* Portlet-based TilesApplicationContext implementation.
*
@@ -93,9 +98,9 @@
/**
- * Creates a new instance of PortletTilesRequestContext
+ * Creates a new instance of PortletTilesRequestContext.
*
- * @param context The portlet context to use.
+ * @param context The portlet context to use.
* @param request The request object to use.
* @param response The response object to use.
*/
@@ -155,7 +160,7 @@
/**
* <p>Return the {@link PortletRequest} for this context.</p>
*
- * @return The used portlet request.
+ * @return The used portlet request.
*/
public PortletRequest getRequest() {
return (this.request);
@@ -172,7 +177,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Map<String, String> getHeader() {
+ public Map<String, String> getHeader() {
if ((header == null) && (request != null)) {
header = Collections.EMPTY_MAP;
}
@@ -181,7 +186,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Map<String, String[]> getHeaderValues() {
+ public Map<String, String[]> getHeaderValues() {
if ((headerValues == null) && (request != null)) {
headerValues = Collections.EMPTY_MAP;
}
@@ -233,7 +238,8 @@
context.getRequestDispatcher(path).include((RenderRequest) request,
(RenderResponse) response);
} catch (PortletException e) {
- throw new IOException("PortletException while including path '"+path+"'."+e.getMessage());
+ throw new IOException("PortletException while including path '"
+ + path + "'." + e.getMessage());
}
}
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletApplicationScopeMap.java Wed Apr 11 08:44:51 2007
@@ -17,16 +17,22 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.servlet;
-import org.apache.tiles.context.MapEntry;
+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 java.util.*;
+import org.apache.tiles.context.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet context
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderMap.java Wed Apr 11 08:44:51 2007
@@ -17,15 +17,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.servlet;
-import org.apache.tiles.context.MapEntry;
+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 java.util.*;
+import org.apache.tiles.context.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet request
@@ -79,14 +85,14 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<Map.Entry<String, String>> entrySet() {
+ public Set<Map.Entry<String, String>> entrySet() {
Set<Map.Entry<String, String>> set = new HashSet<Map.Entry<String, String>>();
Enumeration<String> keys = request.getHeaderNames();
String key;
while (keys.hasMoreElements()) {
key = keys.nextElement();
set.add(new MapEntry<String, String>(key, request.getHeader(key),
- false));
+ false));
}
return (set);
}
@@ -118,7 +124,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Set<String> keySet() {
+ public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
@@ -148,7 +154,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public int size() {
+ public int size() {
int n = 0;
Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
@@ -161,7 +167,7 @@
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- public Collection<String> values() {
+ public Collection<String> values() {
List<String> list = new ArrayList<String>();
Enumeration<String> keys = request.getHeaderNames();
while (keys.hasMoreElements()) {
@@ -189,4 +195,4 @@
}
-}
\ No newline at end of file
+}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletHeaderValuesMap.java Wed Apr 11 08:44:51 2007
@@ -17,7 +17,6 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.servlet;
@@ -227,4 +226,4 @@
return list1.toArray(new String[list1.size()]);
}
-}
\ No newline at end of file
+}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java?view=diff&rev=527536&r1=527535&r2=527536
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/servlet/ServletInitParamMap.java Wed Apr 11 08:44:51 2007
@@ -17,15 +17,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
package org.apache.tiles.context.servlet;
-
-import org.apache.tiles.context.MapEntry;
+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 java.util.*;
+
+import org.apache.tiles.context.MapEntry;
/**
* <p>Private implementation of <code>Map</code> for servlet context
@@ -189,4 +195,4 @@
}
-}
\ No newline at end of file
+}