You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/05/11 15:46:10 UTC
svn commit: r537191 - in /tiles/framework/trunk:
tiles-api/src/main/java/org/apache/tiles/mgmt/
tiles-core/src/main/java/org/apache/tiles/definition/
tiles-core/src/main/java/org/apache/tiles/definition/digester/
tiles-core/src/main/java/org/apache/til...
Author: apetrelli
Date: Fri May 11 06:46:06 2007
New Revision: 537191
URL: http://svn.apache.org/viewvc?view=rev&rev=537191
Log:
TILES-177
Moved code from old Definition class to TileDefinition.
Moved all the references to the old Definition class to TileDefinition.
Removed the old Definition class.
Renamed the TileDefinition class to Definition.
Added:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java
- copied, changed from r537184, tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
Removed:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definition.java
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
Copied: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java (from r537184, tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java?view=diff&rev=537191&p1=tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java&r1=537184&p2=tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/TileDefinition.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java Fri May 11 06:46:06 2007
@@ -21,24 +21,27 @@
package org.apache.tiles.mgmt;
import org.apache.tiles.Attribute;
+import org.apache.tiles.Attribute.AttributeType;
import java.util.Map;
import java.util.HashMap;
/**
- * Data transfer object used for registering new
+ * A definition, i.e. a template with (completely or not) filled attributes.
+ * Attributes of a template can be defined with the help of this class.<br>
+ * It can be used as a data transfer object used for registering new
* definitions with the Container.
*
* @since Tiles 2.0
* @version $Rev$ $Date$
*/
-public class TileDefinition {
+public class Definition {
/**
* Extends attribute value.
*/
protected String inherit;
/**
- * TileDefinition name.
+ * Definition name.
*/
protected String name = null;
/**
@@ -62,11 +65,42 @@
/**
* Constructor.
*/
- public TileDefinition() {
+ public Definition() {
attributes = new HashMap<String, Attribute>();
}
/**
+ * Copy Constructor.
+ * Create a new definition initialized with parent definition.
+ * Do a shallow copy : attributes are shared between copies, but not the Map
+ * containing attributes.
+ *
+ * @param definition The definition to copy.
+ */
+ public Definition(Definition definition) {
+ attributes = new HashMap<String, Attribute>(
+ definition.getAttributes());
+ this.name = definition.getName();
+ this.template = definition.getTemplate();
+ this.role = definition.getRole();
+ this.preparer = definition.getPreparer();
+ this.inherit = definition.getExtends();
+ }
+
+ /**
+ * Constructor.
+ * @param name The name of the definition.
+ * @param template The template of the definition.
+ * @param attributes The attribute map of the definition.
+ */
+ public Definition(String name, String template,
+ Map<String, Attribute> attributes) {
+ this.name = name;
+ this.template = template;
+ this.attributes = attributes;
+ }
+
+ /**
* Access method for the name property.
*
* @return the current value of the name property
@@ -163,6 +197,56 @@
}
/**
+ * Checks whether the <code>key</code> attribute has been set.
+ *
+ * @param key The attribute key to check.
+ * @return <code>true</code> if the attribute has a value.
+ */
+ public boolean hasAttributeValue(String key) {
+ return attributes.containsKey(key);
+ }
+
+ /**
+ * Put an attribute in template definition.
+ * Attribute can be used as content for tag get.
+ *
+ * @param name Attribute name
+ * @param content Attribute value
+ */
+ public void put(String name, Object content) {
+ put(name, content, null);
+ }
+
+ /**
+ * Put an attribute in template definition.
+ * Attribute can be used as content for tag get.
+ *
+ * @param name Attribute name
+ * @param content Attribute value
+ * @param role Determine if content is used by get tag. If user is in role, content is used.
+ */
+ public void put(String name, Object content, String role) {
+ put(name, content, null, role);
+ }
+
+ /**
+ * Put an attribute in template definition.
+ * Attribute can be used as content for tag get.
+ *
+ * @param name Attribute name
+ * @param content Attribute value
+ * @param type attribute type: template, string, definition
+ * @param role Determine if content is used by get tag. If user is in role, content is used.
+ */
+ public void put(String name, Object content, AttributeType type, String role) {
+ // Is there a type set ?
+ // First check direct attribute, and translate it to a valueType.
+ // Then, evaluate valueType, and create requested typed attribute.
+ Attribute attribute = new Attribute(content, role, type);
+ putAttribute(name, attribute);
+ }
+
+ /**
* Get associated preparerInstance.
*
* @return The preparer name.
@@ -196,5 +280,39 @@
*/
public String getExtends() {
return inherit;
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public int hashCode() {
+ return name != null ? name.hashCode() : 0;
+ }
+
+ /**
+ * Get extends flag.
+ *
+ * @return <code>true</code> if this definition extends another.
+ */
+ public boolean isExtending() {
+ return inherit != null;
+ }
+
+ /**
+ * Returns a description of the attributes.
+ *
+ * @return A string representation of the content of this definition.
+ */
+ public String toString() {
+ return "{name="
+ + name
+ + ", template="
+ + template
+ + ", role="
+ + role
+ + ", preparerInstance="
+ + preparer
+ + ", attributes="
+ + attributes
+ + "}\n";
}
}
Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java Fri May 11 06:46:06 2007
@@ -38,6 +38,6 @@
* @param requestItems the current request objects.
* @throws TilesException If something goes wrong during registration.
*/
- void register(TileDefinition definition, Object... requestItems)
+ void register(Definition definition, Object... requestItems)
throws TilesException;
}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java Fri May 11 06:46:06 2007
@@ -24,6 +24,8 @@
import java.util.Locale;
import java.util.Map;
+import org.apache.tiles.mgmt.Definition;
+
/**
* Interface for managing collections of {@link Definition} objects.
* <p/>
@@ -64,7 +66,8 @@
* @throws NoSuchDefinitionException if a Definition extends from
* one that doesn't exist.
*/
- void addDefinitions(Map<String, Definition> defsMap, Locale locale) throws NoSuchDefinitionException;
+ void addDefinitions(Map<String, Definition> defsMap, Locale locale)
+ throws NoSuchDefinitionException;
/**
* Returns a Definition object that matches the given name and locale.
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?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- 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 May 11 06:46:06 2007
@@ -22,6 +22,7 @@
package org.apache.tiles.definition;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.TilesException;
import java.util.Map;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java Fri May 11 06:46:06 2007
@@ -24,6 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
+import org.apache.tiles.mgmt.Definition;
import java.util.HashMap;
import java.util.HashSet;
@@ -55,7 +56,8 @@
*/
public DefinitionsImpl() {
baseDefinitions = new HashMap<String, Definition>();
- localeSpecificDefinitions = new HashMap<Locale, Map<String, Definition>>();
+ localeSpecificDefinitions =
+ new HashMap<Locale, Map<String, Definition>>();
}
/**
@@ -92,7 +94,8 @@
* @throws NoSuchDefinitionException If something goes wrong during
* inheritance resolution.
*/
- public void addDefinitions(Map<String, Definition> defsMap, Locale locale) throws NoSuchDefinitionException {
+ public void addDefinitions(Map<String, Definition> defsMap,
+ Locale locale) throws NoSuchDefinitionException {
localeSpecificDefinitions.put(locale, defsMap);
resolveInheritances(locale);
}
@@ -109,8 +112,8 @@
Definition definition = null;
if (locale != null) {
- Map<String, Definition> localeSpecificMap = localeSpecificDefinitions
- .get(locale);
+ Map<String, Definition> localeSpecificMap =
+ localeSpecificDefinitions.get(locale);
if (localeSpecificMap != null) {
definition = localeSpecificMap.get(name);
}
@@ -160,7 +163,8 @@
*/
public void reset() {
this.baseDefinitions = new HashMap<String, Definition>();
- this.localeSpecificDefinitions = new HashMap<Locale, Map<String, Definition>>();
+ this.localeSpecificDefinitions =
+ new HashMap<Locale, Map<String, Definition>>();
}
/**
@@ -185,9 +189,7 @@
Definition retValue = null;
Object attrValue = attr.getValue();
- if (attrValue instanceof Definition) {
- retValue = (Definition) attrValue;
- } else if (attrValue instanceof String) {
+ if (attrValue instanceof String) {
retValue = this.getDefinition((String) attr
.getValue(), locale);
}
@@ -256,8 +258,7 @@
* @param child The child that will be overloaded.
*/
// FIXME This is the same as DefinitionManager.overload.
- protected void overload(Definition parent,
- Definition child) {
+ protected void overload(Definition parent, Definition child) {
// Iterate on each parent's attribute and add it if not defined in child.
for (Map.Entry<String, Attribute> entry : parent.getAttributes().entrySet()) {
if (!child.hasAttributeValue(entry.getKey())) {
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java Fri May 11 06:46:06 2007
@@ -23,11 +23,13 @@
import java.util.Map;
+import org.apache.tiles.mgmt.Definition;
+
/**
- * Interface for reading <code>{@link org.apache.tiles.definition.Definition}</code> from a source.
+ * Interface for reading <code>{@link Definition}</code> from a source.
* <p/>
* <p>This interface provides a standard way to read
- * <code>{@link org.apache.tiles.definition.Definition}</code> objects from a source. Implementations
+ * <code>{@link Definition}</code> objects from a source. Implementations
* should define what the source is, whether it be a persistent store such as a
* configuration file or database, or something like a web service. The
* DefinitionsReader is responsible for reading from a single location. It does
@@ -50,7 +52,7 @@
void init(Map<String, String> params) throws DefinitionsFactoryException;
/**
- * Reads <code>{@link org.apache.tiles.definition.Definition}</code> objects from a source.
+ * Reads <code>{@link Definition}</code> objects from a source.
* <p/>
* Implementations should publish what type of source object is expected.
*
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?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- 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 May 11 06:46:06 2007
@@ -27,6 +27,7 @@
import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.locale.impl.DefaultLocaleResolver;
+import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.util.ClassUtil;
import java.io.FileNotFoundException;
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?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- 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 May 11 06:46:06 2007
@@ -25,9 +25,10 @@
import org.apache.commons.digester.Rule;
import org.apache.tiles.Attribute;
import org.apache.tiles.Attribute.AttributeType;
-import org.apache.tiles.definition.Definition;
+import org.apache.tiles.context.ListAttribute;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
+import org.apache.tiles.mgmt.Definition;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -38,7 +39,7 @@
import java.util.Map;
/**
- * Reads {@link org.apache.tiles.definition.Definition Definition} objects from
+ * Reads {@link Definition} objects from
* an XML InputStream using Digester. <p/>
* <p>
* This <code>DefinitionsReader</code> implementation expects the source to be
@@ -117,24 +118,22 @@
// Handler class names.
/**
- * The package name.
- */
- private static final String PACKAGE_NAME = "org.apache.tiles";
-
- /**
* The handler to create definitions.
*/
- private static final String DEFINITION_HANDLER_CLASS = PACKAGE_NAME + ".definition.Definition";
+ private static final String DEFINITION_HANDLER_CLASS =
+ Definition.class.getName();
/**
* The handler to create attributes.
*/
- private static final String PUT_ATTRIBUTE_HANDLER_CLASS = PACKAGE_NAME + ".Attribute";
+ private static final String PUT_ATTRIBUTE_HANDLER_CLASS =
+ Attribute.class.getName();
/**
* The handler to create list attributes.
*/
- private static final String LIST_HANDLER_CLASS = PACKAGE_NAME + ".context.ListAttribute";
+ private static final String LIST_HANDLER_CLASS =
+ ListAttribute.class.getName();
/**
* Digester rule to manage attribute filling.
@@ -214,7 +213,8 @@
* if the source is invalid or
* an error occurs when reading definitions.
*/
- public Map<String, Definition> read(Object source) throws DefinitionsFactoryException {
+ public Map<String, Definition> read(Object source)
+ throws DefinitionsFactoryException {
// Get out if we have not been initialized.
if (!inited) {
@@ -302,7 +302,7 @@
digester.addRule(PUT_TAG, new FillAttributeRule());
digester.addSetNext(PUT_TAG, "addAttribute", PUT_ATTRIBUTE_HANDLER_CLASS);
digester.addCallMethod(PUT_TAG, "setBody", 0);
- // TileDefinition level list rules
+ // Definition level list rules
// This is rules for lists nested in a definition
digester.addObjectCreate(DEF_LIST_TAG, LIST_HANDLER_CLASS);
digester.addSetProperties(DEF_LIST_TAG);
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Fri May 11 06:46:06 2007
@@ -31,10 +31,10 @@
import org.apache.tiles.context.BasicAttributeContext;
import org.apache.tiles.context.TilesContextFactory;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.NoSuchDefinitionException;
+import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.preparer.NoSuchPreparerException;
import org.apache.tiles.preparer.PreparerFactory;
import org.apache.tiles.preparer.ViewPreparer;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java Fri May 11 06:46:06 2007
@@ -26,9 +26,9 @@
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.mgmt.Definition;
/**
* Container that can be used to store multiple {@link DefinitionsFactory}
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java Fri May 11 06:46:06 2007
@@ -26,12 +26,11 @@
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.mgmt.TileDefinition;
+import org.apache.tiles.mgmt.Definition;
/**
* Container that can be used to store multiple {@link DefinitionsFactory}
@@ -63,7 +62,7 @@
= new HashMap<String, DefinitionManager>();
/** {@inheritDoc} */
- public void register(TileDefinition definition, Object... requestItems) throws TilesException {
+ public void register(Definition definition, Object... requestItems) throws TilesException {
TilesRequestContext requestContext = getContextFactory().createRequestContext(
getApplicationContext(),
requestItems
@@ -122,7 +121,7 @@
* @throws DefinitionsFactoryException If something goes wrong during adding
* a definition, such as missing parent definitions.
*/
- protected void register(TileDefinition definition,
+ protected void register(Definition definition,
TilesRequestContext request) throws DefinitionsFactoryException {
DefinitionManager mgr = getProperDefinitionManager(
getDefinitionsFactoryKey(request));
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java Fri May 11 06:46:06 2007
@@ -22,11 +22,10 @@
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.impl.BasicTilesContainer;
-import org.apache.tiles.mgmt.TileDefinition;
+import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.mgmt.MutableTilesContainer;
/**
@@ -46,7 +45,7 @@
private DefinitionManager mgr = new DefinitionManager();
/** {@inheritDoc} */
- public void register(TileDefinition definition, Object... requestItems) throws TilesException {
+ public void register(Definition definition, Object... requestItems) throws TilesException {
TilesRequestContext requestContext = getContextFactory().createRequestContext(
getApplicationContext(),
requestItems
@@ -85,7 +84,7 @@
* @throws DefinitionsFactoryException If something goes wrong during adding
* a definition, such as missing parent definitions.
*/
- protected void register(TileDefinition definition,
+ protected void register(Definition definition,
TilesRequestContext request) throws DefinitionsFactoryException {
Definition def = new Definition(definition);
mgr.addDefinition(def, request);
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?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- 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 May 11 06:46:06 2007
@@ -22,11 +22,10 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.Definition;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.NoSuchDefinitionException;
-import org.apache.tiles.mgmt.TileDefinition;
+import org.apache.tiles.mgmt.Definition;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -145,7 +144,7 @@
*
* @param definition The definition to validate.
*/
- private void validate(TileDefinition definition) {
+ private void validate(Definition definition) {
Map<String, Attribute> attrs = definition.getAttributes();
for (Attribute attribute : attrs.values()) {
if (attribute.getName() == null) {
@@ -217,8 +216,7 @@
* @param child The child that will be overloaded.
*/
// FIXME This is the same as DefinitionsImpl.overload.
- protected void overload(Definition parent,
- Definition child) {
+ protected void overload(Definition parent, Definition child) {
// Iterate on each parent's attribute and add it if not defined in child.
for (Map.Entry<String, Attribute> entry : parent.getAttributes().entrySet()) {
if (!child.hasAttributeValue(entry.getKey())) {
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java Fri May 11 06:46:06 2007
@@ -25,6 +25,8 @@
import java.util.Locale;
import java.util.Map;
+import org.apache.tiles.mgmt.Definition;
+
/**
*
* @version $Rev$ $Date$
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java Fri May 11 06:46:06 2007
@@ -24,6 +24,8 @@
import java.util.Collections;
import java.util.Map;
+import org.apache.tiles.mgmt.Definition;
+
/**
* Mock Defintions Reader implementation. Stubs out all functionality.
*
@@ -51,7 +53,7 @@
}
/**
- * Reads <code>{@link org.apache.tiles.definition.Definition}</code> objects from a source.
+ * Reads <code>{@link Definition}</code> objects from a source.
*
* Implementations should publish what type of source object is expected.
*
@@ -62,7 +64,8 @@
* an error occurs when reading definitions.
*/
@SuppressWarnings("unchecked")
- public Map<String, Definition> read(Object source) throws DefinitionsFactoryException {
+ public Map<String, Definition> read(Object source)
+ throws DefinitionsFactoryException {
return Collections.EMPTY_MAP;
}
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java Fri May 11 06:46:06 2007
@@ -23,6 +23,7 @@
import org.apache.tiles.Attribute;
import org.apache.tiles.Attribute.AttributeType;
+import org.apache.tiles.mgmt.Definition;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java Fri May 11 06:46:06 2007
@@ -29,6 +29,7 @@
import junit.framework.TestSuite;
import org.apache.tiles.Attribute;
import org.apache.tiles.Attribute.AttributeType;
+import org.apache.tiles.mgmt.Definition;
/**
* Tests the DefinitionsImpl class.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Fri May 11 06:46:06 2007
@@ -33,7 +33,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
-import org.apache.tiles.definition.Definition;
+import org.apache.tiles.mgmt.Definition;
/**
* Tests the <code>org.apache.tiles.definition.digester.DigesterDefinitionsReader</code> class.
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java Fri May 11 06:46:06 2007
@@ -26,7 +26,6 @@
import org.apache.shale.test.mock.MockServletConfig;
import org.apache.shale.test.mock.MockServletContext;
-import org.apache.tiles.web.util.ServletContextAdapter;
import junit.framework.TestCase;
Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?view=diff&rev=537191&r1=537190&r2=537191
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java Fri May 11 06:46:06 2007
@@ -26,7 +26,7 @@
import org.apache.tiles.jsp.taglib.PutAttributeTag;
import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.mgmt.TileDefinition;
+import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.Attribute.AttributeType;
import org.apache.tiles.access.TilesAccess;
@@ -206,7 +206,7 @@
/** {@inheritDoc} */
public int doEndTag() throws JspException {
- TileDefinition d = new TileDefinition();
+ Definition d = new Definition();
d.setName(name);
d.setTemplate(template);
d.setExtends(extend);