Author: apetrelli
Date: Thu Feb 7 12:05:11 2008
New Revision: 619613
URL: http://svn.apache.org/viewvc?rev=619613&view=rev
Log:
TILES-248
Fixed "@since" tags in trunk.
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java?rev=619613&r1=619612&r2=619613&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
(original)
+++
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/AttributeContext.java
Thu Feb 7 12:05:11 2008
@@ -50,6 +50,7 @@
* Copies the cascaded attributes to this attribute context.
*
* @param parent The parent context to be used.
+ * @since 2.1.0
*/
void inheritCascadedAttributes(AttributeContext parent);
@@ -58,6 +59,7 @@
* context to this one.
*
* @param parent The attribute context to copy attributes from.
+ * @since 2.1.0
*/
void inherit(AttributeContext parent);
@@ -76,6 +78,7 @@
* @param name key name for the attribute.
* @return Attribute The local attribute associated with the given name, if
* present, or <code>null</code> otherwise.
+ * @since 2.1.0
*/
Attribute getLocalAttribute(String name);
@@ -85,6 +88,7 @@
* @param name key name for the attribute.
* @return Attribute The cascaded attribute associated with the given name,
* if present, or <code>null</code> otherwise.
+ * @since 2.1.0
*/
Attribute getCascadedAttribute(String name);
@@ -103,6 +107,7 @@
* been cascaded.
*
* @return The local attribute names.
+ * @since 2.1.0
*/
Set<String> getLocalAttributeNames();
@@ -110,6 +115,7 @@
* Returns the names of the cascaded attributes.
*
* @return The cascaded attribute names.
+ * @since 2.1.0
*/
Set<String> getCascadedAttributeNames();
@@ -132,6 +138,7 @@
* @param cascade If <code>true</code>, the attribute value will be
* available in all nested contexts. If <code>false</code>, it will be
* available only in the current context.
+ * @since 2.1.0
*/
void putAttribute(String name, Attribute value, boolean cascade);
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java?rev=619613&r1=619612&r2=619613&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
(original)
+++
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/BasicAttributeContext.java
Thu Feb 7 12:05:11 2008
@@ -33,21 +33,26 @@
* Basic implementation for <code>AttributeContext</code>.
*
* @version $Rev$ $Date$
+ * @since 2.1.0
*/
public class BasicAttributeContext implements AttributeContext, Serializable {
/**
* Template attributes.
+ * @since 2.1.0
*/
protected Map<String, Attribute> attributes = null;
/**
* Cascaded template attributes.
+ * @since 2.1.0
*/
protected Map<String, Attribute> cascadedAttributes = null;
/**
* Constructor.
+ *
+ * @since 2.1.0
*/
public BasicAttributeContext() {
super();
@@ -58,6 +63,7 @@
* Create a context and set specified attributes.
*
* @param attributes Attributes to initialize context.
+ * @since 2.1.0
*/
public BasicAttributeContext(Map<String, Attribute> attributes) {
if (attributes != null) {
@@ -69,6 +75,7 @@
* Copy constructor.
*
* @param context The constructor to copy.
+ * @since 2.1.0
*/
public BasicAttributeContext(AttributeContext context) {
if (context instanceof BasicAttributeContext) {
@@ -86,6 +93,7 @@
* Copy constructor.
*
* @param context The constructor to copy.
+ * @since 2.1.0
*/
public BasicAttributeContext(BasicAttributeContext context) {
copyBasicAttributeContext(context);
@@ -131,6 +139,7 @@
* the attributes.
*
* @param parent The attribute context to inherit.
+ * @since 2.1.0
*/
public void inherit(BasicAttributeContext parent) {
cascadedAttributes = addMissingAttributes(
@@ -147,6 +156,7 @@
* currently in the specified attribute map.
*
* @param newAttributes Attributes to add.
+ * @since 2.1.0
*/
public void addAll(Map<String, Attribute> newAttributes) {
if (newAttributes == null) {
@@ -168,6 +178,7 @@
* this context.
*
* @param defaultAttributes Attributes to add.
+ * @since 2.1.0
*/
public void addMissing(Map<String, Attribute> defaultAttributes) {
if (defaultAttributes == null) {
Modified:
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java?rev=619613&r1=619612&r2=619613&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
(original)
+++
tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
Thu Feb 7 12:05:11 2008
@@ -324,6 +324,7 @@
* other properties (roles, template, preparer) are inherited.
*
* @param parent The attribute context to inherit.
+ * @since 2.1.0
*/
@Override
public void inherit(AttributeContext parent) {
@@ -339,6 +340,7 @@
* other properties (roles, template, preparer) are inherited.
*
* @param parent The attribute context to inherit.
+ * @since 2.1.0
*/
@Override
public void inherit(BasicAttributeContext parent) {
@@ -354,6 +356,7 @@
* present, attributes, template, roles, preparer.
*
* @param parent The definition to inherit.
+ * @since 2.1.0
*/
public void inherit(Definition parent) {
super.inherit(parent);
Modified:
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java?rev=619613&r1=619612&r2=619613&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
(original)
+++
tiles/framework/trunk/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/CompatibilityDigesterDefinitionsReader.java
Thu Feb 7 12:05:11 2008
@@ -28,6 +28,7 @@
* Digester reader that can read Tiles 1.1, 1.2, 1.3, 1.4 and 2.0 files.
*
* @version $Rev$ $Date$
+ * @since 2.1.0
*/
public class CompatibilityDigesterDefinitionsReader extends
DigesterDefinitionsReader {
@@ -35,6 +36,8 @@
* The set of public identifiers, and corresponding resource names for the
* versions of the configuration file DTDs we know about. There
<strong>MUST</strong>
* be an even number of Strings in this list!
+ *
+ * @since 2.1.0
*/
protected String[] registrations;
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=619613&r1=619612&r2=619613&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
Thu Feb 7 12:05:11 2008
@@ -121,24 +121,32 @@
/**
* The handler to create definitions.
+ *
+ * @since 2.1.0
*/
protected static final String DEFINITION_HANDLER_CLASS =
Definition.class.getName();
/**
* The handler to create attributes.
+ *
+ * @since 2.1.0
*/
protected static final String PUT_ATTRIBUTE_HANDLER_CLASS =
Attribute.class.getName();
/**
* The handler to create list attributes.
+ *
+ * @since 2.1.0
*/
protected static final String LIST_HANDLER_CLASS =
ListAttribute.class.getName();
/**
* Digester rule to manage attribute filling.
+ *
+ * @since 2.1.0
*/
public static class FillAttributeRule extends Rule {
@@ -157,6 +165,8 @@
/**
* Digester rule to manage assignment of the attribute to the parent
* element.
+ *
+ * @since 2.1.0
*/
public static class PutAttributeRule extends Rule {
@@ -406,6 +416,7 @@
*
* @return An array containing the locations for registrations of local
* DTDs.
+ * @since 2.1.0
*/
protected String[] getRegistrations() {
if (registrations == null) {
