Author: apetrelli
Date: Fri Jun 12 17:36:13 2009
New Revision: 784215
URL: http://svn.apache.org/viewvc?rev=784215&view=rev
Log:
TILES-421
Some warning fixed but there are still missing links to protected code
(strange).
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html
tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.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/TilesContextFactory.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/UrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.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/factory/BasicTilesContainerFactory.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/impl/mgmt/DefinitionManager.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/definition/TestRuntimeConfiguredContext.java
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactoryTest.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html
(original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/package.html
Fri Jun 12 17:36:13 2009
@@ -125,7 +125,7 @@
<%@ taglib uri="http://tiles.apache.org/tags-tiles"
prefix="tiles" %>
<HTML>
<HEAD>
- <link rel="stylesheet"
href="<%=request.getContextPath()%>/layouts/stylesheet.css"
+ <link rel="stylesheet"
href="<%=request.getContextPath()%>/layouts/stylesheet.css"
type="text/css"/>
<title><tiles:getAsString
name="title"/></title>
</HEAD>
@@ -197,7 +197,7 @@
struts-config file:</p>
<pre>
<plug-in
className=&&quot;org.apache.struts.tiles.TilesPlugin&&quot; >
- <set-property property=&&quot;definitions-config&&quot;
+ <set-property property=&&quot;definitions-config&&quot;
value=&&quot;/WEB-INF/tiles-defs.xml,
/WEB-INF/tiles-tests-defs.xml,/WEB-INF/tiles-tutorial-defs.xml,
/WEB-INF/tiles-examples-defs.xml&&quot;
/>
@@ -245,10 +245,10 @@
<ul>
<li>Specify The classname of the TilesUtil implementation to
use. The specified class should
be a subclass of TilesUtilStrutsImpl. This option disable
the moduleAware option.
- <br>Specifying
&&quot;TilesUtilStrutsImpl&&quot; is equivalent to moduleAware =
- false.</br>
- <br>Specifying
&&quot;TilesUtilStrutsModuleImpl&&quot; is equivalent to
moduleAware
- = true.</br>
+ <br>Specifying
&&"TilesUtilStrutsImpl&&" is equivalent to
moduleAware =
+ false.
+ <br>Specifying
&&"TilesUtilStrutsModuleImpl&&" is equivalent to
moduleAware
+ = true.
This option is taken into account only once, when it is
first encountered. To avoid problems,
it is advice to specify the same values in all TilesPlugin
declaration.
</li>
@@ -281,20 +281,20 @@
<pre>
<servlet>
<servlet-name>action</servlet-name>
-
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
- <!-- Tiles Servlet parameter
- Specify configuration file names. There can be several comma
+
<servlet-class>org.apache.tiles.web.startup.TilesServlet</servlet-class>
+ <!-- Tiles Servlet parameter
+ Specify configuration file names. There can be several comma
separated file names
- -->
+ -->
<init-param>
<param-name>definitions-config</param-name>
<param-value>/WEB-INF/tiles-defs.xml</param-value>
</init-param>
- <!-- Tiles Servlet parameter
+ <!-- Tiles Servlet parameter
Specify if XML parser should validate the Tiles configuration
file(s).
true : validate. DTD should be specified in file header.
false : no validation
- -->
+ -->
<init-param>
<param-name>org.apache.tiles.definition.digester.DigesterDefinitionsReader.PARSER_VALIDATE</param-name>
<param-value>true</param-value>
@@ -361,7 +361,7 @@
<!-- ========================================================== -->
<!-- This definition inherits from the main definition.
It overloads the page title and the body used.
- Use the same mechanism to define new pages sharing common
+ Use the same mechanism to define new pages sharing common
properties (here header, menu, footer, layout)
-->
Modified:
tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
(original)
+++
tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
Fri Jun 12 17:36:13 2009
@@ -81,7 +81,7 @@
}
/**
- * Tests the {...@link Definition#inherit(Definition)} method.
+ * Tests the {...@link Definition#inherit(BasicAttributeContext)} method.
*/
public void testInherit() {
Definition toCopy = new Definition();
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?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
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
Fri Jun 12 17:36:13 2009
@@ -84,7 +84,7 @@
*
* @param tilesContext current Tiles application context.
* @return BasicAttributeContext or null if context is not found.
- * @deprecated Use {...@link
TilesContainer#getAttributeContext(Object...)}.
+ * @deprecated Use {...@link
org.apache.tiles.TilesContainer#getAttributeContext(Object...)}.
*/
@Deprecated
public static AttributeContext getContext(TilesRequestContext
tilesContext) {
@@ -101,9 +101,9 @@
*
* @param tilesContext The Tiles context object to use.
* @return The needed stack of contexts.
- * @deprecated Use {...@link
TilesContainer#getAttributeContext(Object...)},
- * {...@link TilesContainer#startContext(Object...)} or
- * {...@link TilesContainer#endContext(Object...)}.
+ * @deprecated Use {...@link
org.apache.tiles.TilesContainer#getAttributeContext(Object...)},
+ * {...@link org.apache.tiles.TilesContainer#startContext(Object...)} or
+ * {...@link org.apache.tiles.TilesContainer#endContext(Object...)}.
*/
@Deprecated
@SuppressWarnings("unchecked")
@@ -125,7 +125,7 @@
*
* @param context The context to push.
* @param tilesContext The Tiles context object to use.
- * @deprecated Use {...@link TilesContainer#startContext(Object...)}.
+ * @deprecated Use {...@link
org.apache.tiles.TilesContainer#startContext(Object...)}.
*/
@Deprecated
public static void pushContext(AttributeContext context,
@@ -139,7 +139,7 @@
*
* @param tilesContext The Tiles context object to use.
* @return The popped context object.
- * @deprecated Use {...@link TilesContainer#endContext(Object...)}.
+ * @deprecated Use {...@link
org.apache.tiles.TilesContainer#endContext(Object...)}.
*/
@Deprecated
public static AttributeContext popContext(TilesRequestContext
tilesContext) {
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?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
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
Fri Jun 12 17:36:13 2009
@@ -27,8 +27,7 @@
* implementation.
*
* @version $Rev$ $Date$
- * @deprecated Use {...@link TilesApplicationContextFactory} or
- * {...@link TilesRequestContextFactory}.
+ * @deprecated Use {...@link TilesRequestContextFactory}.
*/
public interface TilesContextFactory extends TilesRequestContextFactory {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
Fri Jun 12 17:36:13 2009
@@ -27,13 +27,14 @@
import java.util.Map;
/**
- * Interface for creating a {...@link org.apache.tiles.definition.Definitions}
object and managing
- * its contents.
+ * Interface for creating a {...@link Definition}s and managing their contents.
* <p/>
- * <p>DefinitionsFactory implementations are responsible for maintaining the
data
- * sources of Tiles configuration data and using the data to create
- * Definitions sets. Implementations also know how to append
- * locale-specific configuration data to an existing Definitions set.</p>
+ * <p>
+ * DefinitionsFactory implementations are responsible for maintaining the data
+ * sources of Tiles configuration data and using the data to create Definitions
+ * sets. Implementations also know how to append locale-specific configuration
+ * data to an existing Definitions set.
+ * </p>
*
* @version $Rev$ $Date$
*/
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
Fri Jun 12 17:36:13 2009
@@ -55,7 +55,8 @@
/**
* Compatibility constant.
*
- * @deprecated use {...@link DEFINITIONS_CONFIG} to avoid namespace
collisions.
+ * @deprecated use {...@link DefinitionsFactory#DEFINITIONS_CONFIG} to
avoid
+ * namespace collisions.
*/
private static final String LEGACY_DEFINITIONS_CONFIG =
"definitions-config";
@@ -67,7 +68,7 @@
/**
* Contains the URL objects identifying where configuration data is found.
*
- * @deprecated Use {...@link #sourceURLs}.
+ * @deprecated Use {...@link URLReader#addSourceURL(URL)}.
*/
protected List<Object> sources;
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAO.java
Fri Jun 12 17:36:13 2009
@@ -66,7 +66,8 @@
/**
* Compatibility constant.
*
- * @deprecated use {...@link DEFINITIONS_CONFIG} to avoid namespace
collisions.
+ * @deprecated use {...@link DefinitionsFactory#DEFINITIONS_CONFIG} to
avoid
+ * namespace collisions.
*/
private static final String LEGACY_DEFINITIONS_CONFIG =
"definitions-config";
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAO.java
Fri Jun 12 17:36:13 2009
@@ -16,7 +16,7 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under te License.
*/
package org.apache.tiles.definition.dao;
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
Fri Jun 12 17:36:13 2009
@@ -294,8 +294,7 @@
* will be read.
* @return a Map of <code>Definition</code> objects read from
* the source.
- * @throws org.apache.tiles.definition.DefinitionsFactoryException
- * if the source is invalid or
+ * @throws DefinitionsFactoryException If the source is invalid or
* an error occurs when reading definitions.
*/
public Map<String, Definition> read(Object source) {
@@ -343,9 +342,8 @@
* This method must be called before the {...@link #read} method is called.
*
* @param params A map of properties used to set up the reader.
- * @throws org.apache.tiles.definition.DefinitionsFactoryException
- * if required properties are not
- * passed in or the initialization fails.
+ * @throws DefinitionsFactoryException if required properties are not
passed
+ * in or the initialization fails.
*/
public void init(Map<String, String> params) {
if (params != null) {
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
Fri Jun 12 17:36:13 2009
@@ -42,6 +42,9 @@
import org.apache.tiles.definition.dao.DefinitionDAO;
import org.apache.tiles.definition.dao.ResolvingLocaleUrlDefinitionDAO;
import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
+import org.apache.tiles.definition.pattern.PatternDefinitionResolver;
+import org.apache.tiles.definition.pattern.PatternDefinitionResolverAware;
+import org.apache.tiles.definition.pattern.WildcardPatternDefinitionResolver;
import org.apache.tiles.evaluator.AttributeEvaluator;
import org.apache.tiles.evaluator.impl.DirectAttributeEvaluator;
import org.apache.tiles.impl.BasicTilesContainer;
@@ -241,7 +244,8 @@
protected BaseLocaleUrlDefinitionDAO
instantiateLocaleDefinitionDao(TilesApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
- return new ResolvingLocaleUrlDefinitionDAO();
+ ResolvingLocaleUrlDefinitionDAO dao = new
ResolvingLocaleUrlDefinitionDAO();
+ return dao;
}
/**
@@ -253,6 +257,7 @@
* @return The definition DAO.
* @since 2.1.1
*/
+ @SuppressWarnings("unchecked")
protected DefinitionDAO<Locale>
createLocaleDefinitionDao(TilesApplicationContext applicationContext,
TilesRequestContextFactory contextFactory,
LocaleResolver resolver) {
@@ -261,6 +266,10 @@
definitionDao.setReader(createDefinitionsReader(applicationContext,
contextFactory));
definitionDao.setSourceURLs(getSourceURLs(applicationContext,
contextFactory));
definitionDao.setApplicationContext(applicationContext);
+ if (definitionDao instanceof PatternDefinitionResolverAware) {
+ ((PatternDefinitionResolverAware<Locale>) definitionDao)
+
.setPatternDefinitionResolver(createPatternDefinitionResolver(Locale.class));
+ }
return definitionDao;
}
@@ -395,6 +404,19 @@
}
/**
+ * Creates a new pattern definition resolver. By default, it instantiate a
{...@link WildcardPatternDefinitionResolver}.
+ *
+ * @param <T> The type of the customization key.
+ * @param customizationKeyClass The customization key class.
+ * @return The pattern definition resolver.
+ * @since 2.2.0
+ */
+ protected <T> PatternDefinitionResolver<T> createPatternDefinitionResolver(
+ Class<T> customizationKeyClass) {
+ return new WildcardPatternDefinitionResolver<T>();
+ }
+
+ /**
* Registers attribute renderers in a {...@link BasicRendererFactory}. By
* default, it registers a {...@link StringAttributeRenderer}, a
* {...@link TemplateAttributeRenderer} and a
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
Fri Jun 12 17:36:13 2009
@@ -165,7 +165,7 @@
* factory.
* @since 2.1.0
* @deprecated Use
- * {...@link
AbstractTilesContainerFactory#getTilesContainerFactory(Object)}.
+ * {...@link
AbstractTilesContainerFactory#getTilesContainerFactory(TilesApplicationContext)}.
*/
@Deprecated
public static TilesContainerFactory getFactory(Object context) {
@@ -187,7 +187,7 @@
* @throws TilesContainerFactoryException if an error occurs creating the
* factory.
* @deprecated Use
- * {...@link
AbstractTilesContainerFactory#getTilesContainerFactory(Object)}
+ * {...@link
AbstractTilesContainerFactory#getTilesContainerFactory(TilesApplicationContext)}
* and then {...@link #setDefaultConfiguration(Map)}.
*/
public static TilesContainerFactory getFactory(Object context,
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
Fri Jun 12 17:36:13 2009
@@ -227,7 +227,7 @@
*
* @param parent The parent definition.
* @param child The child that will be overloaded.
- * @deprecated Use {...@link Definition#inherit(Definition)}.
+ * @deprecated Use {...@link
Definition#inherit(org.apache.tiles.BasicAttributeContext)}.
*/
protected void overload(Definition parent, Definition child) {
child.inherit(parent);
Modified:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
(original)
+++
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/util/WildcardHelper.java
Fri Jun 12 17:36:13 2009
@@ -20,7 +20,9 @@
*/
package org.apache.tiles.util;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
/**
@@ -177,11 +179,37 @@
* @return True if a match
* @throws NullPointerException If any parameters are null
* @since 2.1.0
+ * @deprecated Use {...@link #match(List, String, int[])}.
*/
public boolean match(Map<Integer, String> map, String data, int[] expr) {
if (map == null) {
throw new NullPointerException("No map provided");
}
+ List<String> varsValues = new ArrayList<String>();
+ boolean retValue = match(varsValues, data, expr);
+ int i = 0;
+ for (String value: varsValues) {
+ map.put(i, value);
+ i++;
+ }
+ return retValue;
+ }
+
+ /**
+ * Match a pattern agains a string and isolates wildcard replacement into a
+ * <code>Stack</code>.
+ *
+ * @param varsValues The list to store matched values into.
+ * @param data The string to match
+ * @param expr The compiled wildcard expression
+ * @return True if a match
+ * @throws NullPointerException If any parameters are null
+ * @since 2.2.0
+ */
+ public boolean match(List<String> varsValues, String data, int[] expr) {
+ if (varsValues == null) {
+ throw new NullPointerException("No value list provided");
+ }
if (data == null) {
throw new NullPointerException("No data provided");
@@ -206,11 +234,8 @@
int rsltpos = 0;
int offset = -1;
- // The matching count
- int mcount = 0;
-
// We want the complete data be in {0}
- map.put(mcount, data);
+ varsValues.add(data);
// First check for MATCH_BEGIN
boolean matchBegin = false;
@@ -261,14 +286,14 @@
// Check for END's
if (exprchr == MATCH_END) {
if (rsltpos > 0) {
- map.put(++mcount, new String(rslt, 0, rsltpos));
+ varsValues.add(new String(rslt, 0, rsltpos));
}
// Don't care about rest of input buffer
return (true);
} else if (exprchr == MATCH_THEEND) {
if (rsltpos > 0) {
- map.put(++mcount, new String(rslt, 0, rsltpos));
+ varsValues.add(new String(rslt, 0, rsltpos));
}
// Check that we reach buffer's end
@@ -312,7 +337,7 @@
}
}
- map.put(++mcount, new String(rslt, 0, rsltpos));
+ varsValues.add(new String(rslt, 0, rsltpos));
rsltpos = 0;
}
}
Modified:
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/definition/TestRuntimeConfiguredContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/definition/TestRuntimeConfiguredContext.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/definition/TestRuntimeConfiguredContext.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/definition/TestRuntimeConfiguredContext.java
Fri Jun 12 17:36:13 2009
@@ -34,6 +34,7 @@
*
* @version $Rev$ $Date$
*/
+...@deprecated
public class TestRuntimeConfiguredContext extends TestCase {
/**
Modified:
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspTilesRequestContextFactoryTest.java
Fri Jun 12 17:36:13 2009
@@ -53,7 +53,7 @@
/**
* Tests
- * {...@link
JspTilesContextFactory#createRequestContext(org.apache.tiles.TilesApplicationContext,
Object...)}
+ * {...@link
JspTilesRequestContextFactory#createRequestContext(org.apache.tiles.TilesApplicationContext,
Object...)}
* .
*/
public void testCreateRequestContextWithoutParent() {
@@ -76,7 +76,7 @@
/**
* Tests
- * {...@link
JspTilesContextFactory#createRequestContext(org.apache.tiles.TilesApplicationContext,
Object...)}
+ * {...@link
JspTilesRequestContextFactory#createRequestContext(org.apache.tiles.TilesApplicationContext,
Object...)}
* .
*/
public void testCreateRequestContextWithParent() {
Modified:
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
(original)
+++
tiles/framework/trunk/tiles-jsp/src/test/java/org/apache/tiles/jsp/context/JspUtilTest.java
Fri Jun 12 17:36:13 2009
@@ -104,7 +104,7 @@
/**
* Tests
- * {...@link JspUtil#setCurrentContainer(PageContext, String)}.
+ * {...@link JspUtil#setCurrentContainer(javax.servlet.jsp.JspContext,
String)}.
*/
public void testSetCurrentContainer() {
PageContext pageContext = EasyMock.createMock(PageContext.class);
@@ -127,7 +127,7 @@
/**
* Tests
- * {...@link JspUtil#setCurrentContainer(PageContext, TilesContainer)}.
+ * {...@link JspUtil#setCurrentContainer(javax.servlet.jsp.JspContext,
TilesContainer)}.
*/
public void testSetCurrentContainerWithContainer() {
PageContext pageContext = EasyMock.createMock(PageContext.class);
@@ -146,7 +146,7 @@
}
/**
- * Tests {...@link JspUtil#getCurrentContainer(PageContext)}.
+ * Tests {...@link
JspUtil#getCurrentContainer(javax.servlet.jsp.JspContext)}.
*/
public void testGetCurrentContainer() {
PageContext pageContext = EasyMock.createMock(PageContext.class);
@@ -180,7 +180,7 @@
}
/**
- * Tests {...@link JspUtil#getComposeStack(PageContext)}.
+ * Tests {...@link JspUtil#getComposeStack(javax.servlet.jsp.JspContext)}.
*/
public void testGetComposeStack() {
PageContext pageContext = EasyMock.createMock(PageContext.class);
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletTilesApplicationContextFactory.java
Fri Jun 12 17:36:13 2009
@@ -25,6 +25,7 @@
import javax.portlet.PortletContext;
+import org.apache.tiles.Initializable;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.AbstractTilesApplicationContextFactory;
@@ -36,7 +37,7 @@
* @since 2.1.1
*/
public class PortletTilesApplicationContextFactory extends
- AbstractTilesApplicationContextFactory {
+ AbstractTilesApplicationContextFactory implements Initializable {
/** {...@inheritdoc} */
public void init(Map<String, String> configParameters) {
Modified:
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactoryTest.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactoryTest.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactoryTest.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/test/java/org/apache/tiles/portlet/context/wildcard/WildcardPortletTilesApplicationContextFactoryTest.java
Fri Jun 12 17:36:13 2009
@@ -52,7 +52,7 @@
/**
* Test method for
- * {...@link
org.apache.tiles.servlet.context.wildcard.WildcardPortletTilesApplicationContextFactory
+ * {...@link
org.apache.tiles.portlet.context.wildcard.WildcardPortletTilesApplicationContextFactory
* #createApplicationContext(java.lang.Object)}.
*/
public void testCreateApplicationContext() {
Modified:
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java
(original)
+++
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/ServletTilesApplicationContextFactory.java
Fri Jun 12 17:36:13 2009
@@ -21,6 +21,7 @@
package org.apache.tiles.servlet.context;
+import org.apache.tiles.Initializable;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.AbstractTilesApplicationContextFactory;
@@ -35,7 +36,7 @@
* @since 2.1.1
*/
public class ServletTilesApplicationContextFactory extends
- AbstractTilesApplicationContextFactory {
+ AbstractTilesApplicationContextFactory implements Initializable {
/** {...@inheritdoc} */
public void init(Map<String, String> configParameters) {
Modified:
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
(original)
+++
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/servlet/context/wildcard/WildcardServletTilesApplicationContextFactory.java
Fri Jun 12 17:36:13 2009
@@ -25,6 +25,7 @@
import javax.servlet.ServletContext;
+import org.apache.tiles.Initializable;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.context.AbstractTilesApplicationContextFactory;
@@ -36,7 +37,7 @@
* @since 2.1.1
*/
public class WildcardServletTilesApplicationContextFactory extends
- AbstractTilesApplicationContextFactory {
+ AbstractTilesApplicationContextFactory implements Initializable {
/** {...@inheritdoc} */
public void init(Map<String, String> params) {
Modified:
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java?rev=784215&r1=784214&r2=784215&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java
(original)
+++
tiles/framework/trunk/tiles-servlet/src/main/java/org/apache/tiles/web/startup/TilesFilter.java
Fri Jun 12 17:36:13 2009
@@ -42,7 +42,8 @@
* @deprecated Use {...@link TilesServlet} or {...@link TilesListener}. If you
want a
* decoration Filter, use
* {...@link org.apache.tiles.web.util.TilesDecorationFilter}. Moreover,
definition
- * files reload themselves if the {...@link
.apache.tiles.definition.dao.DefinitionDAO} implements
+ * files reload themselves if the
+ * {...@link org.apache.tiles.definition.dao.DefinitionDAO} implements
* {...@link org.apache.tiles.definition.Refreshable}.
*/
