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 2009/10/24 15:54:20 UTC
svn commit: r829370 [1/2] - in /tiles/sandbox/trunk/tiles3: ./
tiles-api/src/main/java/org/apache/tiles/
tiles-api/src/test/java/org/apache/tiles/access/
tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/
tiles-compat/src/main/java...
Author: apetrelli
Date: Sat Oct 24 13:54:15 2009
New Revision: 829370
URL: http://svn.apache.org/viewvc?rev=829370&view=rev
Log:
TILESSB-10
Added missing @Override and @Deprecated annotations.
Modified:
tiles/sandbox/trunk/tiles3/pom.xml
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Definition.java
tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Initializable.java
tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/AbstractTilesApplicationContextFactoryAware.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/UntypedAttributeRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java
tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-servlet-wildcard/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletApplicationScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletHeaderValuesMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletInitParamMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletParamValuesMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletRequestScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletSessionScopeMap.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContext.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesListener.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesServlet.java
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDispatchServlet.java
tiles/sandbox/trunk/tiles3/tiles-test-pom/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
tiles/sandbox/trunk/tiles3/tiles-velocity/src/main/java/org/apache/tiles/velocity/context/VelocityTilesRequestContext.java
Modified: tiles/sandbox/trunk/tiles3/pom.xml
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/pom.xml?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/pom.xml (original)
+++ tiles/sandbox/trunk/tiles3/pom.xml Sat Oct 24 13:54:15 2009
@@ -85,8 +85,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Attribute.java Sat Oct 24 13:54:15 2009
@@ -137,7 +137,8 @@
* @since 2.1.2
* @deprecated Use {@link #expressionObject}.
*/
- protected String expression = null;
+ @Deprecated
+ protected String expression = null;
/**
* The expression to evaluate. Ignored if {@link #value} is not
@@ -243,7 +244,8 @@
* @since 2.1.2
* @deprecated Use {@link #Attribute(Object, Expression, String, String)}.
*/
- public Attribute(Object value, String expression, String role, String rendererName) {
+ @Deprecated
+ public Attribute(Object value, String expression, String role, String rendererName) {
this(value, new Expression(expression), role, rendererName);
}
@@ -275,7 +277,8 @@
* @deprecated Use
* {@link Attribute#Attribute(Object, String, String, String)}.
*/
- public Attribute(String name, Object value, String role,
+ @Deprecated
+ public Attribute(String name, Object value, String role,
AttributeType type) {
this.name = name;
this.value = value;
@@ -398,7 +401,8 @@
* @since 2.1.2
* @deprecated Use {@link #getExpressionObject()}.
*/
- public String getExpression() {
+ @Deprecated
+ public String getExpression() {
if (expressionObject != null) {
return expressionObject.getExpression();
}
@@ -413,7 +417,8 @@
* @since 2.1.2
* @deprecated Use {@link #setExpressionObject(Expression)}.
*/
- public void setExpression(String expression) {
+ @Deprecated
+ public void setExpression(String expression) {
if (expression != null) {
expressionObject = new Expression(expression);
} else {
@@ -444,7 +449,8 @@
}
/** {@inheritDoc} */
- public String toString() {
+ @Override
+ public String toString() {
if (value != null) {
return value.toString();
}
@@ -458,7 +464,8 @@
* <code>template</code>, <code>definition</code>, <code>object</code>.
* @deprecated Use {@link Attribute#getRenderer()}.
*/
- public AttributeType getType() {
+ @Deprecated
+ public AttributeType getType() {
return AttributeType.getType(renderer);
}
@@ -468,7 +475,8 @@
* @param type The attribute type.
* @deprecated Use {@link Attribute#setRenderer(String)}.
*/
- public void setType(AttributeType type) {
+ @Deprecated
+ public void setType(AttributeType type) {
this.renderer = type.toString();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Definition.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Definition.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Definition.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Definition.java Sat Oct 24 13:54:15 2009
@@ -71,7 +71,8 @@
* @param attributes The attribute map of the definition.
* @deprecated Use {@link #Definition(String, Attribute, Map)}.
*/
- public Definition(String name, String template,
+ @Deprecated
+ public Definition(String name, String template,
Map<String, Attribute> attributes) {
this(name, Attribute.createTemplateAttribute(template), attributes);
}
@@ -308,7 +309,8 @@
*
* @return A string representation of the content of this definition.
*/
- public String toString() {
+ @Override
+ public String toString() {
return "{name="
+ name
+ ", template="
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Initializable.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Initializable.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Initializable.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/main/java/org/apache/tiles/Initializable.java Sat Oct 24 13:54:15 2009
@@ -30,6 +30,7 @@
* @deprecated Parameter-based initialization feature is deprecated and no
* longer supported.
*/
+@Deprecated
public interface Initializable {
/**
@@ -38,5 +39,6 @@
* @param params The map of parameters.
* @deprecated Do not use.
*/
- void init(Map<String, String> params);
+ @Deprecated
+ void init(Map<String, String> params);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-api/src/test/java/org/apache/tiles/access/TilesAccessTest.java Sat Oct 24 13:54:15 2009
@@ -40,7 +40,8 @@
private TilesApplicationContext context;
/** {@inheritDoc} */
- public void setUp() {
+ @Override
+ public void setUp() {
context = EasyMock.createMock(TilesApplicationContext.class);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java Sat Oct 24 13:54:15 2009
@@ -185,7 +185,8 @@
}
/** {@inheritDoc} */
- protected String[] getRegistrations() {
+ @Override
+ protected String[] getRegistrations() {
if (registrations == null) {
registrations = new String[] {
"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN",
Modified: tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/CompatibilityPreparerFactory.java Sat Oct 24 13:54:15 2009
@@ -33,7 +33,8 @@
public class CompatibilityPreparerFactory extends BasicPreparerFactory {
/** {@inheritDoc} */
- protected ViewPreparer createPreparer(String name) {
+ @Override
+ protected ViewPreparer createPreparer(String name) {
ViewPreparer retValue;
if (name.startsWith("/")) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/AbstractTilesApplicationContextFactoryAware.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/AbstractTilesApplicationContextFactoryAware.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/AbstractTilesApplicationContextFactoryAware.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/AbstractTilesApplicationContextFactoryAware.java Sat Oct 24 13:54:15 2009
@@ -31,6 +31,7 @@
* @deprecated Since {@link AbstractTilesApplicationContextFactory} is
* deprecated, this dependency injection interface is deprecated.
*/
+@Deprecated
public interface AbstractTilesApplicationContextFactoryAware {
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/beans/SimpleMenuItem.java Sat Oct 24 13:54:15 2009
@@ -130,7 +130,8 @@
}
/** {@inheritDoc} */
- public String toString() {
+ @Override
+ public String toString() {
StringBuffer buff = new StringBuffer("SimpleMenuItem[");
if (getValue() != null) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/AbstractTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009
@@ -38,6 +38,7 @@
* extending {@link org.apache.tiles.startup.AbstractTilesInitializer} and
* overriding <code>createTilesApplicationContext</code> method.
*/
+@Deprecated
public abstract class AbstractTilesApplicationContextFactory {
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009
@@ -46,6 +46,7 @@
* Moreover, it does not make sense to "try" if your application is
* servlet-based, portlet-based, etc. You know it, right?
*/
+@Deprecated
public class ChainedTilesApplicationContextFactory extends
AbstractTilesApplicationContextFactory implements Initializable {
@@ -133,7 +134,8 @@
}
/** {@inheritDoc} */
- public TilesApplicationContext createApplicationContext(Object context) {
+ @Override
+ public TilesApplicationContext createApplicationContext(Object context) {
TilesApplicationContext retValue = null;
for (Iterator<AbstractTilesApplicationContextFactory> factoryIt = factories
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ChainedTilesContextFactory.java Sat Oct 24 13:54:15 2009
@@ -40,6 +40,7 @@
* @deprecated Use {@link ChainedTilesApplicationContextFactory}
* and {@link ChainedTilesRequestContextFactory}.
*/
+@Deprecated
public class ChainedTilesContextFactory implements TilesContextFactory {
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/ListAttribute.java Sat Oct 24 13:54:15 2009
@@ -33,6 +33,7 @@
* @version $Rev$ $Date$
* @deprecated Use {@link org.apache.tiles.ListAttribute}.
*/
+@Deprecated
public class ListAttribute extends org.apache.tiles.ListAttribute {
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/MapEntry.java Sat Oct 24 13:54:15 2009
@@ -110,7 +110,8 @@
* @param o The object to test
* @return True if equal, else false
*/
- @SuppressWarnings("unchecked")
+ @Override
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
if (o != null && o instanceof Map.Entry) {
Map.Entry<K, V> entry = (Map.Entry<K, V>) o;
@@ -128,7 +129,8 @@
*
* @return The and'ed hashcode of the key and value
*/
- public int hashCode() {
+ @Override
+ public int hashCode() {
return (this.getKey() == null ? 0 : this.getKey().hashCode())
^ (this.getValue() == null ? 0 : this.getValue().hashCode());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/TilesContextFactory.java Sat Oct 24 13:54:15 2009
@@ -29,6 +29,7 @@
* @version $Rev$ $Date$
* @deprecated Use {@link TilesRequestContextFactory}.
*/
+@Deprecated
public interface TilesContextFactory extends TilesRequestContextFactory {
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedContextFactory.java Sat Oct 24 13:54:15 2009
@@ -31,6 +31,7 @@
* @version $Rev$ $Date$
* @deprecated Use {@link EnhancedTilesApplicationContextFactory}.
*/
+@Deprecated
public class EnhancedContextFactory extends ChainedTilesContextFactory {
/** {@inheritDoc} */
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/enhanced/EnhancedTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009
@@ -33,6 +33,7 @@
* or extending {@link org.apache.tiles.startup.AbstractTilesInitializer} and
* overriding <code>createTilesApplicationContext</code> method.<br>
*/
+@Deprecated
public class EnhancedTilesApplicationContextFactory extends
ChainedTilesApplicationContextFactory {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java Sat Oct 24 13:54:15 2009
@@ -80,7 +80,8 @@
* @deprecated Parameter based initialization is deprecated, please compose your
* definitions factory using methods.
*/
- void init(Map<String, String> params);
+ @Deprecated
+ void init(Map<String, String> params);
/**
* Returns a Definition object that matches the given name and
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/LocaleDefinitionsFactory.java Sat Oct 24 13:54:15 2009
@@ -60,7 +60,8 @@
* @param params The Map of configuration properties.
* @throws DefinitionsFactoryException if an initialization error occurs.
*/
- @SuppressWarnings("unchecked")
+ @Override
+ @SuppressWarnings("unchecked")
public void init(Map<String, String> params) {
String definitionDaoClassName = params
.get(DefinitionsFactory.DEFINITION_DAO_INIT_PARAM);
@@ -89,7 +90,8 @@
}
/** {@inheritDoc} */
- public Definition getDefinition(String name,
+ @Override
+ public Definition getDefinition(String name,
TilesRequestContext tilesContext) {
Definition retValue;
Locale locale = null;
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/ReloadableDefinitionsFactory.java Sat Oct 24 13:54:15 2009
@@ -27,5 +27,6 @@
* @version $Rev$ $Date$
* @deprecated Use {@link Refreshable}.
*/
+@Deprecated
public interface ReloadableDefinitionsFactory extends Refreshable {
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java Sat Oct 24 13:54:15 2009
@@ -52,6 +52,7 @@
* @deprecated Use {@link UnresolvingLocaleDefinitionsFactory} and using
* {@link ResolvingLocaleUrlDefinitionDAO} as Tiles DAO.
*/
+@Deprecated
public class UrlDefinitionsFactory extends UnresolvingLocaleDefinitionsFactory
implements Refreshable {
@@ -61,7 +62,8 @@
* @deprecated use {@link DefinitionsFactory#DEFINITIONS_CONFIG} to avoid
* namespace collisions.
*/
- private static final String LEGACY_DEFINITIONS_CONFIG = "definitions-config";
+ @Deprecated
+ private static final String LEGACY_DEFINITIONS_CONFIG = "definitions-config";
/**
* LOG instance for all UrlDefinitionsFactory instances.
@@ -74,21 +76,24 @@
*
* @deprecated Use {@link URLReader#addSourceURL(URL)}.
*/
- protected List<Object> sources;
+ @Deprecated
+ protected List<Object> sources;
/**
* Reader used to get definitions from the sources.
*
* @deprecated No more used.
*/
- protected DefinitionsReader reader;
+ @Deprecated
+ protected DefinitionsReader reader;
/**
* Contains the dates that the URL sources were last modified.
*
* @deprecated No more used.
*/
- protected Map<String, Long> lastModifiedDates;
+ @Deprecated
+ protected Map<String, Long> lastModifiedDates;
/** {@inheritDoc} */
public synchronized void refresh() {
@@ -142,7 +147,9 @@
* an error occurs resolving the source to an actual data store.
* @deprecated Use {@link URLReader#addSourceURL(URL)}.
*/
- public void addSource(Object source) {
+ @Deprecated
+ @Override
+ public void addSource(Object source) {
if (source == null) {
throw new DefinitionsFactoryException(
"Source object must not be null");
@@ -177,7 +184,8 @@
* sources.
* @deprecated Let the Definitions Factory use it.
*/
- @Deprecated
+ @Override
+ @Deprecated
public Definitions readDefinitions() {
return new CompatibilityDefinitionsImpl(definitionDao);
}
@@ -237,7 +245,8 @@
* @return Concatenated filename.
* @deprecated Use {@link LocaleUtil#concatPostfix(String,String)} instead
*/
- protected static String concatPostfix(String name, String postfix) {
+ @Deprecated
+ protected static String concatPostfix(String name, String postfix) {
return LocaleUtil.concatPostfix(name, postfix);
}
@@ -250,7 +259,8 @@
* @return a list of
* @deprecated Use {@link LocaleUtil#calculatePostfixes(Locale)} instead.
*/
- protected static List<String> calculatePostfixes(Locale locale) {
+ @Deprecated
+ protected static List<String> calculatePostfixes(Locale locale) {
return LocaleUtil.calculatePostfixes(locale);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java Sat Oct 24 13:54:15 2009
@@ -70,7 +70,8 @@
* @deprecated use {@link DefinitionsFactory#DEFINITIONS_CONFIG} to avoid
* namespace collisions.
*/
- private static final String LEGACY_DEFINITIONS_CONFIG = "definitions-config";
+ @Deprecated
+ private static final String LEGACY_DEFINITIONS_CONFIG = "definitions-config";
/**
* Contains the URL objects identifying where configuration data is found.
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAO.java Sat Oct 24 13:54:15 2009
@@ -272,7 +272,8 @@
* @since 2.1.3
* @deprecated Use {@link #loadDefinitionsFromURLs(Locale)}.
*/
- protected Map<String, Definition> loadRawDefinitionsFromURLs(
+ @Deprecated
+ protected Map<String, Definition> loadRawDefinitionsFromURLs(
Locale customizationKey) {
return loadDefinitionsFromURLs(customizationKey);
}
@@ -296,7 +297,8 @@
* @since 2.1.0
* @deprecated Never used.
*/
- protected void postDefinitionLoadOperations(
+ @Deprecated
+ protected void postDefinitionLoadOperations(
Map<String, Definition> localeDefsMap, Locale customizationKey) {
definitionResolver.storeDefinitionPatterns(localeDefsMap, customizationKey);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/BasicPatternDefinitionResolver.java Sat Oct 24 13:54:15 2009
@@ -65,7 +65,8 @@
}
/** {@inheritDoc} */
- protected Map<String, Definition> addDefinitionsAsPatternMatchers(List<DefinitionPatternMatcher> matchers,
+ @Override
+ protected Map<String, Definition> addDefinitionsAsPatternMatchers(List<DefinitionPatternMatcher> matchers,
Map<String, Definition> defsMap) {
Set<String> excludedKeys = new LinkedHashSet<String>();
for (Map.Entry<String, Definition> de : defsMap.entrySet()) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/AbstractTilesContainerFactory.java Sat Oct 24 13:54:15 2009
@@ -51,7 +51,8 @@
* @since 2.1.1
* @deprecated Create directly a new instance of this class.
*/
- public static AbstractTilesContainerFactory getTilesContainerFactory(
+ @Deprecated
+ public static AbstractTilesContainerFactory getTilesContainerFactory(
TilesApplicationContext context) {
AbstractTilesContainerFactory retValue;
String factoryName = context.getInitParams().get(
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java Sat Oct 24 13:54:15 2009
@@ -47,6 +47,7 @@
* {@link org.apache.tiles.startup.AbstractTilesInitializer}
* <code>getContainerKey</code> method.
*/
+@Deprecated
public class KeyedDefinitionsFactoryTilesContainerFactory extends
TilesContainerFactory {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java Sat Oct 24 13:54:15 2009
@@ -64,6 +64,7 @@
* already extended class. Parameter-based initialization is no longer
* supported.
*/
+@Deprecated
public class TilesContainerFactory extends AbstractTilesContainerFactory {
/**
@@ -72,7 +73,8 @@
*
* @deprecated Use {@link AbstractTilesContainerFactory#CONTAINER_FACTORY_INIT_PARAM}.
*/
- public static final String CONTAINER_FACTORY_INIT_PARAM =
+ @Deprecated
+ public static final String CONTAINER_FACTORY_INIT_PARAM =
"org.apache.tiles.factory.TilesContainerFactory";
/**
@@ -88,7 +90,8 @@
* @deprecated Use {@link AbstractTilesApplicationContextFactory#APPLICATION_CONTEXT_FACTORY_INIT_PARAM} or
* {@link #REQUEST_CONTEXT_FACTORY_INIT_PARAM}.
*/
- public static final String CONTEXT_FACTORY_INIT_PARAM =
+ @Deprecated
+ public static final String CONTEXT_FACTORY_INIT_PARAM =
"org.apache.tiles.context.TilesContextFactory";
/**
@@ -196,7 +199,8 @@
* {@link AbstractTilesContainerFactory#getTilesContainerFactory(TilesApplicationContext)}
* and then {@link #setDefaultConfiguration(Map)}.
*/
- public static TilesContainerFactory getFactory(Object context,
+ @Deprecated
+ public static TilesContainerFactory getFactory(Object context,
Map<String, String> defaults) {
Map<String, String> configuration = new HashMap<String, String>(defaults);
configuration.putAll(TilesContainerFactory.getInitParameterMap(context));
@@ -228,7 +232,8 @@
}
/** {@inheritDoc} */
- public TilesContainer createContainer(TilesApplicationContext context) {
+ @Override
+ public TilesContainer createContainer(TilesApplicationContext context) {
String value = context.getInitParams().get(
CONTAINER_FACTORY_MUTABLE_INIT_PARAM);
if (Boolean.parseBoolean(value)) {
@@ -398,7 +403,8 @@
* {@link #storeContainerDependencies(TilesApplicationContext, Map, Map, BasicTilesContainer)}
* .
*/
- protected void storeContainerDependencies(Object context,
+ @Deprecated
+ protected void storeContainerDependencies(Object context,
Map<String, String> initParameters,
Map<String, String> configuration, BasicTilesContainer container) {
if (context instanceof TilesApplicationContext) {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Sat Oct 24 13:54:15 2009
@@ -69,14 +69,16 @@
* @deprecated Use
* {@link org.apache.tiles.definition.DefinitionsFactory#DEFINITIONS_CONFIG}.
*/
- public static final String DEFINITIONS_CONFIG = "org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG";
+ @Deprecated
+ public static final String DEFINITIONS_CONFIG = "org.apache.tiles.impl.BasicTilesContainer.DEFINITIONS_CONFIG";
/**
* Compatibility constant.
*
* @deprecated use {@link #DEFINITIONS_CONFIG} to avoid namespace collisions.
*/
- private static final String LEGACY_DEFINITIONS_CONFIG = "definitions-config";
+ @Deprecated
+ private static final String LEGACY_DEFINITIONS_CONFIG = "definitions-config";
/**
* Name used to store attribute context stack.
@@ -233,7 +235,8 @@
* @deprecated Use
* {@link #setRequestContextFactory(TilesRequestContextFactory)}.
*/
- public void setContextFactory(org.apache.tiles.context.TilesContextFactory contextFactory) {
+ @Deprecated
+ public void setContextFactory(org.apache.tiles.context.TilesContextFactory contextFactory) {
// Does nothing
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java Sat Oct 24 13:54:15 2009
@@ -37,6 +37,7 @@
* {@link org.apache.tiles.access.TilesAccess#setContainer(
* org.apache.tiles.TilesApplicationContext, org.apache.tiles.TilesContainer, String)}
*/
+@Deprecated
public class KeyedDefinitionsFactoryTilesContainer extends BasicTilesContainer {
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java Sat Oct 24 13:54:15 2009
@@ -42,6 +42,7 @@
* org.apache.tiles.TilesApplicationContext, org.apache.tiles.TilesContainer, String)}
* and using {@link CachingTilesContainer} as container implementation.
*/
+@Deprecated
public class CachingKeyedDefinitionsFactoryTilesContainer extends
KeyedDefinitionsFactoryTilesContainer implements MutableTilesContainer {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java Sat Oct 24 13:54:15 2009
@@ -228,7 +228,8 @@
* @param child The child that will be overloaded.
* @deprecated Use {@link Definition#inherit(org.apache.tiles.BasicAttributeContext)}.
*/
- protected void overload(Definition parent, Definition child) {
+ @Deprecated
+ protected void overload(Definition parent, Definition child) {
child.inherit(parent);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/BasicRendererFactory.java Sat Oct 24 13:54:15 2009
@@ -69,7 +69,8 @@
* @deprecated Do not use, the default renderer class should be determined
* when building the container.
*/
- public static final String DEFAULT_RENDERER_CLASS_NAME =
+ @Deprecated
+ public static final String DEFAULT_RENDERER_CLASS_NAME =
UntypedAttributeRenderer.class.getName();
/**
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/StringAttributeRenderer.java Sat Oct 24 13:54:15 2009
@@ -34,7 +34,8 @@
public class StringAttributeRenderer extends AbstractTypeDetectingAttributeRenderer {
/** {@inheritDoc} */
- public void write(Object value, Attribute attribute,
+ @Override
+ public void write(Object value, Attribute attribute,
TilesRequestContext request)
throws IOException {
request.getWriter().write(value.toString());
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/UntypedAttributeRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/UntypedAttributeRenderer.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/UntypedAttributeRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/impl/UntypedAttributeRenderer.java Sat Oct 24 13:54:15 2009
@@ -35,6 +35,7 @@
* @since 2.1.0
* @deprecated Use {@link ChainedDelegateAttributeRenderer}.
*/
+@Deprecated
public class UntypedAttributeRenderer extends AbstractBaseAttributeRenderer
implements TilesContainerAware {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/BasicTilesInitializer.java Sat Oct 24 13:54:15 2009
@@ -34,6 +34,7 @@
* @since 2.1.2
* @deprecated Don't use it, please extend {@link AbstractTilesInitializer}.
*/
+@Deprecated
public class BasicTilesInitializer extends AbstractTilesInitializer {
/**
@@ -55,7 +56,8 @@
* @return The Tiles application context.
* @since 2.1.2
*/
- protected TilesApplicationContext createTilesApplicationContext(
+ @Override
+ protected TilesApplicationContext createTilesApplicationContext(
TilesApplicationContext preliminaryContext) {
AbstractTilesApplicationContextFactory acFactory =
createAndInitializeTilesApplicationContextFactory(preliminaryContext);
@@ -89,7 +91,8 @@
* @return The container key.
* @since 2.1.2
*/
- protected String getContainerKey(TilesApplicationContext applicationContext) {
+ @Override
+ protected String getContainerKey(TilesApplicationContext applicationContext) {
String key = applicationContext.getInitParams().get(
CONTAINER_KEY_INIT_PARAMETER);
return key;
@@ -103,7 +106,8 @@
* @return The created container factory.
* @since 2.1.2
*/
- protected AbstractTilesContainerFactory createContainerFactory(
+ @Override
+ protected AbstractTilesContainerFactory createContainerFactory(
TilesApplicationContext context) {
AbstractTilesContainerFactory factory = AbstractTilesContainerFactory
.getTilesContainerFactory(context);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java Sat Oct 24 13:54:15 2009
@@ -181,7 +181,8 @@
* @since 2.1.0
* @deprecated Use {@link #match(List, String, int[])}.
*/
- public boolean match(Map<Integer, String> map, String data, int[] expr) {
+ @Deprecated
+ public boolean match(Map<Integer, String> map, String data, int[] expr) {
if (map == null) {
throw new NullPointerException("No map provided");
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java Sat Oct 24 13:54:15 2009
@@ -38,7 +38,8 @@
private DirectAttributeEvaluator evaluator;
/** {@inheritDoc} */
- public void setUp() throws Exception {
+ @Override
+ public void setUp() throws Exception {
evaluator = new DirectAttributeEvaluator();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesApplicationContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesApplicationContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/mock/RepeaterTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009
@@ -61,7 +61,8 @@
}
/** {@inheritDoc} */
- public TilesApplicationContext createApplicationContext(Object context) {
+ @Override
+ public TilesApplicationContext createApplicationContext(Object context) {
if (context instanceof TilesApplicationContext) {
return (TilesApplicationContext) context;
} else {
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/el/ELContextImpl.java Sat Oct 24 13:54:15 2009
@@ -43,7 +43,8 @@
* A null function mapper.
*/
private static final FunctionMapper NULL_FUNCTION_MAPPER = new FunctionMapper() {
- public Method resolveFunction(String prefix, String localName) {
+ @Override
+ public Method resolveFunction(String prefix, String localName) {
return null;
}
};
@@ -59,7 +60,8 @@
private Map<String, ValueExpression> vars;
/** {@inheritDoc} */
- public ValueExpression resolveVariable(String variable) {
+ @Override
+ public ValueExpression resolveVariable(String variable) {
if (vars == null) {
return null;
}
@@ -67,7 +69,8 @@
}
/** {@inheritDoc} */
- public ValueExpression setVariable(String variable,
+ @Override
+ public ValueExpression setVariable(String variable,
ValueExpression expression) {
if (vars == null) {
vars = new HashMap<String, ValueExpression>();
@@ -102,17 +105,20 @@
}
/** {@inheritDoc} */
- public ELResolver getELResolver() {
+ @Override
+ public ELResolver getELResolver() {
return this.resolver;
}
/** {@inheritDoc} */
- public FunctionMapper getFunctionMapper() {
+ @Override
+ public FunctionMapper getFunctionMapper() {
return this.functionMapper;
}
/** {@inheritDoc} */
- public VariableMapper getVariableMapper() {
+ @Override
+ public VariableMapper getVariableMapper() {
if (this.variableMapper == null) {
this.variableMapper = new VariableMapperImpl();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELAttributeEvaluator.java Sat Oct 24 13:54:15 2009
@@ -32,5 +32,6 @@
* @since 2.1.0
* @deprecated Use {@link org.apache.tiles.el.ELAttributeEvaluator}.
*/
+@Deprecated
public class ELAttributeEvaluator extends org.apache.tiles.el.ELAttributeEvaluator {
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ELContextImpl.java Sat Oct 24 13:54:15 2009
@@ -30,6 +30,7 @@
* @since 2.1.0
* @deprecated Use {@link org.apache.tiles.el.ELContextImpl}.
*/
+@Deprecated
public final class ELContextImpl extends org.apache.tiles.el.ELContextImpl {
/**
@@ -39,7 +40,8 @@
* @deprecated Use
* {@link org.apache.tiles.el.ELContextImpl#ELContextImpl(ELResolver)}.
*/
- public ELContextImpl(ELResolver resolver) {
+ @Deprecated
+ public ELContextImpl(ELResolver resolver) {
super(resolver);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/ExpressionFactoryFactory.java Sat Oct 24 13:54:15 2009
@@ -30,5 +30,6 @@
* @since 2.1.0
* @deprecated Use {@link org.apache.tiles.el.ExpressionFactoryFactory}.
*/
+@Deprecated
public interface ExpressionFactoryFactory extends org.apache.tiles.el.ExpressionFactoryFactory {
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextBeanELResolver.java Sat Oct 24 13:54:15 2009
@@ -28,6 +28,7 @@
* @since 2.1.0
* @deprecated Use {@link TilesContextBeanELResolver}.
*/
+@Deprecated
public class TilesContextBeanELResolver extends
org.apache.tiles.el.TilesContextBeanELResolver {
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TilesContextELResolver.java Sat Oct 24 13:54:15 2009
@@ -31,6 +31,7 @@
* @since 2.1.0
* @deprecated Use {@link TilesContextELResolver}.
*/
+@Deprecated
public class TilesContextELResolver extends
org.apache.tiles.el.TilesContextELResolver {
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/evaluator/el/TomcatExpressionFactoryFactory.java Sat Oct 24 13:54:15 2009
@@ -34,6 +34,7 @@
* @deprecated Upgrade to Servlet 2.5 and JSP 2.1 and use
* <code>JspExpressionFactoryFactory</code>.
*/
+@Deprecated
public class TomcatExpressionFactoryFactory implements ExpressionFactoryFactory {
/** {@inheritDoc} */
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/main/java/org/apache/tiles/jsp/evaluator/el/JspExpressionFactoryFactory.java Sat Oct 24 13:54:15 2009
@@ -30,6 +30,7 @@
* @since 2.1.0
* @deprecated Use {@link org.apache.tiles.el.JspExpressionFactoryFactory}.
*/
+@Deprecated
public class JspExpressionFactoryFactory extends
org.apache.tiles.el.JspExpressionFactoryFactory {
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/ELAttributeEvaluatorTest.java Sat Oct 24 13:54:15 2009
@@ -51,7 +51,8 @@
private TilesRequestContext request;
/** {@inheritDoc} */
- @SuppressWarnings("deprecation")
+ @Override
+ @SuppressWarnings("deprecation")
protected void setUp() throws Exception {
super.setUp();
evaluator = new ELAttributeEvaluator();
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextBeanELResolverTest.java Sat Oct 24 13:54:15 2009
@@ -50,7 +50,8 @@
private TilesContextBeanELResolver resolver;
/** {@inheritDoc} */
- protected void setUp() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
super.setUp();
resolver = new TilesContextBeanELResolver();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-el/src/test/java/org/apache/tiles/el/TilesContextELResolverTest.java Sat Oct 24 13:54:15 2009
@@ -51,7 +51,8 @@
private TilesContextELResolver resolver;
/** {@inheritDoc} */
- protected void setUp() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
super.setUp();
resolver = new TilesContextELResolver();
}
Modified: tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-freemarker/src/main/java/org/apache/tiles/freemarker/context/FreeMarkerTilesRequestContext.java Sat Oct 24 13:54:15 2009
@@ -62,22 +62,26 @@
}
/** {@inheritDoc} */
- public void dispatch(String path) throws IOException {
+ @Override
+ public void dispatch(String path) throws IOException {
include(path);
}
/** {@inheritDoc} */
- public Object getRequest() {
+ @Override
+ public Object getRequest() {
return env;
}
/** {@inheritDoc} */
- public Locale getRequestLocale() {
+ @Override
+ public Locale getRequestLocale() {
return env.getLocale();
}
/** {@inheritDoc} */
- public Object getResponse() {
+ @Override
+ public Object getResponse() {
return env;
}
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesContextFactory.java Sat Oct 24 13:54:15 2009
@@ -34,6 +34,7 @@
* @version $Rev$ $Date$
* @deprecated Use {@link JspTilesRequestContextFactory}.
*/
+@Deprecated
public class JspTilesContextFactory extends ServletTilesContextFactory {
/**
@@ -52,7 +53,8 @@
}
/** {@inheritDoc} */
- public TilesRequestContext createRequestContext(TilesApplicationContext context,
+ @Override
+ public TilesRequestContext createRequestContext(TilesApplicationContext context,
Object... requestItems) {
return factory.createRequestContext(context, requestItems);
}
@@ -64,7 +66,9 @@
* @return The original servlet context, if found.
* @deprecated Use {@link TilesApplicationContext#getContext()}.
*/
- protected ServletContext getServletContext(TilesApplicationContext context) {
+ @Deprecated
+ @Override
+ protected ServletContext getServletContext(TilesApplicationContext context) {
return (ServletContext) context.getContext();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspTilesRequestContext.java Sat Oct 24 13:54:15 2009
@@ -92,12 +92,14 @@
* @throws IOException If something goes wrong during dispatching.
* @see org.apache.tiles.servlet.context.ServletTilesRequestContext#dispatch(java.lang.String)
*/
- public void dispatch(String path) throws IOException {
+ @Override
+ public void dispatch(String path) throws IOException {
include(path);
}
/** {@inheritDoc} */
- public void include(String path) throws IOException {
+ @Override
+ public void include(String path) throws IOException {
JspUtil.setForceInclude(pageContext, true);
try {
pageContext.include(path, false);
@@ -145,7 +147,8 @@
* @return The response object.
* @deprecated Use {@link #getPageContext()} or {@link #getPrintWriter()}.
*/
- @Deprecated
+ @Override
+ @Deprecated
public HttpServletResponse getResponse() {
if (response == null) {
response = new JspWriterResponse(pageContext);
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/context/JspWriterResponse.java Sat Oct 24 13:54:15 2009
@@ -57,7 +57,8 @@
/** {@inheritDoc} */
- public PrintWriter getWriter() throws IOException {
+ @Override
+ public PrintWriter getWriter() throws IOException {
if (writer == null) {
writer = new JspPrintWriterAdapter(context.getOut());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/UseAttributeTag.java Sat Oct 24 13:54:15 2009
@@ -199,7 +199,8 @@
public static class Tei extends TagExtraInfo {
/** {@inheritDoc} */
- public VariableInfo[] getVariableInfo(TagData data) {
+ @Override
+ public VariableInfo[] getVariableInfo(TagData data) {
String classname = data.getAttributeString("classname");
if (classname == null) {
classname = "java.lang.Object";
Modified: tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/InitContainerTag.java Sat Oct 24 13:54:15 2009
@@ -122,7 +122,8 @@
}
/** {@inheritDoc} */
- public int doStartTag() {
+ @Override
+ public int doStartTag() {
ArrayStack<Object> composeStack = JspUtil.getComposeStack(pageContext);
composeStack.push(new BasicAttributeContext());
return EVAL_BODY_INCLUDE;
@@ -130,7 +131,8 @@
/** {@inheritDoc} */
// TODO Add a MutableContainer so that this can be done?
- public int doEndTag() {
+ @Override
+ public int doEndTag() {
ArrayStack<Object> composeStack = JspUtil.getComposeStack(pageContext);
AttributeContext attributeContext = (AttributeContext) composeStack.pop();
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/main/java/org/apache/tiles/mvel/TilesContextBeanVariableResolverFactory.java Sat Oct 24 13:54:15 2009
@@ -78,7 +78,8 @@
}
/** {@inheritDoc} */
- public VariableResolver getVariableResolver(String name) {
+ @Override
+ public VariableResolver getVariableResolver(String name) {
if (isResolveable(name)) {
if (variableResolvers != null && variableResolvers.containsKey(name)) {
return variableResolvers.get(name);
Modified: tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-mvel/src/test/java/org/apache/tiles/mvel/MVELAttributeEvaluatorTest.java Sat Oct 24 13:54:15 2009
@@ -54,7 +54,8 @@
private TilesRequestContext request;
/** {@inheritDoc} */
- protected void setUp() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
super.setUp();
TilesRequestContextHolder requestHolder = new TilesRequestContextHolder();
VariableResolverFactory variableResolverFactory = new TilesContextVariableResolverFactory(
Modified: tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-ognl/src/test/java/org/apache/tiles/ognl/OGNLAttributeEvaluatorTest.java Sat Oct 24 13:54:15 2009
@@ -61,7 +61,8 @@
private TilesRequestContext request;
/** {@inheritDoc} */
- protected void setUp() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
super.setUp();
PropertyAccessor objectPropertyAccessor = OgnlRuntime.getPropertyAccessor(Object.class);
PropertyAccessor mapPropertyAccessor = OgnlRuntime.getPropertyAccessor(Map.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContext.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContext.java Sat Oct 24 13:54:15 2009
@@ -31,6 +31,7 @@
* @since 2.1.0
* @deprecated Use {@link org.apache.tiles.portlet.wildcard.WildcardPortletTilesApplicationContext}.
*/
+@Deprecated
public class WildcardPortletTilesApplicationContext extends
org.apache.tiles.portlet.wildcard.WildcardPortletTilesApplicationContext {
@@ -44,7 +45,8 @@
* #WildcardPortletTilesApplicationContext(PortletContext)}
* .
*/
- public WildcardPortletTilesApplicationContext(PortletContext portletContext) {
+ @Deprecated
+ public WildcardPortletTilesApplicationContext(PortletContext portletContext) {
super(portletContext);
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet-wildcard/src/main/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactory.java Sat Oct 24 13:54:15 2009
@@ -38,6 +38,7 @@
* or extending {@link org.apache.tiles.startup.AbstractTilesInitializer} and
* overriding <code>createTilesApplicationContext</code> method.<br>
*/
+@Deprecated
public class WildcardPortletTilesApplicationContextFactory extends
PortletTilesApplicationContextFactory {
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java Sat Oct 24 13:54:15 2009
@@ -106,7 +106,8 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
PortletContext otherContext = ((PortletApplicationScopeMap) o).context;
boolean retValue = true;
synchronized (context) {
@@ -130,7 +131,8 @@
/** {@inheritDoc} */
- public int hashCode() {
+ @Override
+ public int hashCode() {
return (context.hashCode());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java Sat Oct 24 13:54:15 2009
@@ -98,7 +98,8 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
PortletContext otherContext = ((PortletInitParamMap) o).context;
boolean retValue = true;
synchronized (context) {
@@ -122,7 +123,8 @@
/** {@inheritDoc} */
- public int hashCode() {
+ @Override
+ public int hashCode() {
return (context.hashCode());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java Sat Oct 24 13:54:15 2009
@@ -99,7 +99,8 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletParamMap) o).request;
boolean retValue = true;
synchronized (request) {
@@ -123,7 +124,8 @@
/** {@inheritDoc} */
- public int hashCode() {
+ @Override
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java Sat Oct 24 13:54:15 2009
@@ -114,7 +114,8 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletParamValuesMap) o).request;
boolean retValue = true;
synchronized (request) {
@@ -138,7 +139,8 @@
/** {@inheritDoc} */
- public int hashCode() {
+ @Override
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java Sat Oct 24 13:54:15 2009
@@ -106,7 +106,8 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletRequestScopeMap) o).request;
boolean retValue = true;
synchronized (request) {
@@ -130,7 +131,8 @@
/** {@inheritDoc} */
- public int hashCode() {
+ @Override
+ public int hashCode() {
return (request.hashCode());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java Sat Oct 24 13:54:15 2009
@@ -107,7 +107,8 @@
/** {@inheritDoc} */
- public boolean equals(Object o) {
+ @Override
+ public boolean equals(Object o) {
PortletSession otherSession = ((PortletSessionScopeMap) o).session;
boolean retValue = true;
synchronized (session) {
@@ -131,7 +132,8 @@
/** {@inheritDoc} */
- public int hashCode() {
+ @Override
+ public int hashCode() {
return (session.hashCode());
}
Modified: tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java?rev=829370&r1=829369&r2=829370&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContext.java Sat Oct 24 13:54:15 2009
@@ -155,7 +155,8 @@
* {@link org.apache.tiles.context.TilesContextFactory#createRequestContext(TilesApplicationContext, Object...)}
* .
*/
- public TilesRequestContext createRequestContext(Object request, Object response) {
+ @Deprecated
+ public TilesRequestContext createRequestContext(Object request, Object response) {
if (request instanceof PortletRequest && response instanceof PortletResponse) {
return new PortletTilesRequestContext(
context,