You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/03/02 18:21:32 UTC
svn commit: r632791 [6/8] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/
tapestry-core/src/main/java/org/apache/tapestry/annotations/
tapestry-core/src/main/java/org/apache/tapestry/corelib/components/
tapestry-core/sr...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java Sun Mar 2 09:21:16 2008
@@ -44,23 +44,19 @@
import java.util.Set;
/**
- * A JSONObject is an unordered collection of name/value pairs. Its external form is a string
- * wrapped in curly braces with colons between the names and values, and commas between the values
- * and names. The internal form is an object having <code>get</code> and <code>opt</code>
- * methods for accessing the values by name, and <code>put</code> methods for adding or replacing
- * values by name. The values can be any of these types: <code>Boolean</code>,
- * <code>JSONArray</code>, <code>JSONObject</code>, <code>Number</code>,
- * <code>String</code>, or the <code>JSONObject.NULL</code> object. A JSONObject constructor
- * can be used to convert an external form JSON text into an internal form whose values can be
- * retrieved with the <code>get</code> and <code>opt</code> methods, or to convert values into a
- * JSON text using the <code>put</code> and <code>toString</code> methods. A <code>get</code>
- * method returns a value if one can be found, and throws an exception if one cannot be found. An
- * <code>opt</code> method returns a default value instead of throwing an exception, and so is
- * useful for obtaining optional values.
+ * A JSONObject is an unordered collection of name/value pairs. Its external form is a string wrapped in curly braces
+ * with colons between the names and values, and commas between the values and names. The internal form is an object
+ * having <code>get</code> and <code>opt</code> methods for accessing the values by name, and <code>put</code> methods
+ * for adding or replacing values by name. The values can be any of these types: <code>Boolean</code>,
+ * <code>JSONArray</code>, <code>JSONObject</code>, <code>Number</code>, <code>String</code>, or the
+ * <code>JSONObject.NULL</code> object. A JSONObject constructor can be used to convert an external form JSON text into
+ * an internal form whose values can be retrieved with the <code>get</code> and <code>opt</code> methods, or to convert
+ * values into a JSON text using the <code>put</code> and <code>toString</code> methods. A <code>get</code> method
+ * returns a value if one can be found, and throws an exception if one cannot be found. An <code>opt</code> method
+ * returns a default value instead of throwing an exception, and so is useful for obtaining optional values.
* <p/>
- * The generic <code>get()</code> and <code>opt()</code> methods return an object, which you can
- * cast or query for type. There are also typed <code>get</code> and <code>opt</code> methods
- * that do type checking and type coersion for you.
+ * The generic <code>get()</code> and <code>opt()</code> methods return an object, which you can cast or query for type.
+ * There are also typed <code>get</code> and <code>opt</code> methods that do type checking and type coersion for you.
* <p/>
* The <code>put</code> methods adds values to an object. For example,
* <p/>
@@ -70,47 +66,39 @@
* <p/>
* produces the string <code>{"JSON": "Hello, World"}</code>.
* <p/>
- * The texts produced by the <code>toString</code> methods strictly conform to the JSON sysntax
- * rules. The constructors are more forgiving in the texts they will accept:
- * <ul>
- * <li>An extra <code>,</code> <small>(comma)</small> may appear just before the closing
- * brace.</li>
- * <li>Strings may be quoted with <code>'</code> <small>(single quote)</small>.</li>
- * <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
- * and if they do not contain leading or trailing spaces, and if they do not contain any of these
- * characters: <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers and if they
- * are not the reserved words <code>true</code>, <code>false</code>, or <code>null</code>.</li>
- * <li>Keys can be followed by <code>=</code> or <code>=></code> as well as by <code>:</code>.</li>
- * <li>Values can be followed by <code>;</code> <small>(semicolon)</small> as well as by
- * <code>,</code> <small>(comma)</small>.</li>
- * <li>Numbers may have the <code>0-</code> <small>(octal)</small> or <code>0x-</code>
- * <small>(hex)</small> prefix.</li>
- * <li>Comments written in the slashshlash, slashstar, and hash conventions will be ignored.</li>
- * </ul>
- * <hr/>
+ * The texts produced by the <code>toString</code> methods strictly conform to the JSON sysntax rules. The constructors
+ * are more forgiving in the texts they will accept: <ul> <li>An extra <code>,</code> <small>(comma)</small> may
+ * appear just before the closing brace.</li> <li>Strings may be quoted with <code>'</code> <small>(single
+ * quote)</small>.</li> <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
+ * and if they do not contain leading or trailing spaces, and if they do not contain any of these characters: <code>{ }
+ * [ ] / \ : , = ; #</code> and if they do not look like numbers and if they are not the reserved words
+ * <code>true</code>, <code>false</code>, or <code>null</code>.</li> <li>Keys can be followed by <code>=</code> or
+ * <code>=></code> as well as by <code>:</code>.</li> <li>Values can be followed by <code>;</code>
+ * <small>(semicolon)</small> as well as by <code>,</code> <small>(comma)</small>.</li> <li>Numbers may have the
+ * <code>0-</code> <small>(octal)</small> or <code>0x-</code> <small>(hex)</small> prefix.</li> <li>Comments written in
+ * the slashshlash, slashstar, and hash conventions will be ignored.</li> </ul> <hr/>
* <p/>
- * This class, and the other related classes, have been heavily modified from the original source,
- * to fit Tapestry standards and to make use of JDK 1.5 features such as generics. Further, since
- * the interest of Tapestry is primarily constructing JSON (and not parsing it), many of the
- * non-essential methods have been removed (since the original code came with no tests).
+ * This class, and the other related classes, have been heavily modified from the original source, to fit Tapestry
+ * standards and to make use of JDK 1.5 features such as generics. Further, since the interest of Tapestry is primarily
+ * constructing JSON (and not parsing it), many of the non-essential methods have been removed (since the original code
+ * came with no tests).
*
* @author JSON.org
* @version 2
*/
-@SuppressWarnings({"CloneDoesntCallSuperClone"})
+@SuppressWarnings({ "CloneDoesntCallSuperClone" })
public final class JSONObject
{
/**
- * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is
- * equivalent to the value that JavaScript calls undefined.
+ * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is equivalent to the
+ * value that JavaScript calls undefined.
*/
private static final class Null
{
/**
- * There is only intended to be a single instance of the NULL object, so the clone method
- * returns itself.
+ * There is only intended to be a single instance of the NULL object, so the clone method returns itself.
*
* @return NULL.
*/
@@ -150,9 +138,9 @@
private final Map<String, Object> _properties = CollectionFactory.newMap();
/**
- * It is sometimes more convenient and less ambiguous to have a <code>NULL</code> object than
- * to use Java's <code>null</code> value. <code>JSONObject.NULL.equals(null)</code> returns
- * <code>true</code>. <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
+ * It is sometimes more convenient and less ambiguous to have a <code>NULL</code> object than to use Java's
+ * <code>null</code> value. <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
+ * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
*/
public static final Object NULL = new Null();
@@ -164,8 +152,8 @@
}
/**
- * Construct a JSONObject from a subset of another JSONObject. An array of strings is used to
- * identify the keys that should be copied. Missing keys are ignored.
+ * Construct a JSONObject from a subset of another JSONObject. An array of strings is used to identify the keys that
+ * should be copied. Missing keys are ignored.
*
* @param source A JSONObject.
* @param propertyNames The strings to copy.
@@ -184,8 +172,7 @@
/**
* Construct a JSONObject from a JSONTokener.
*
- * @param x A JSONTokener object containing the source string. @ If there is a syntax error in the source
- * string.
+ * @param x A JSONTokener object containing the source string. @ If there is a syntax error in the source string.
*/
JSONObject(JSONTokener x)
{
@@ -253,8 +240,8 @@
/**
* Construct a JSONObject from a string. This is the most commonly used JSONObject constructor.
*
- * @param string A string beginning with <code>{</code> <small>(left brace)</small> and
- * ending with <code>}</code> <small>(right brace)</small>.
+ * @param string A string beginning with <code>{</code> <small>(left brace)</small> and ending with
+ * <code>}</code> <small>(right brace)</small>.
* @throws RuntimeException If there is a syntax error in the source string.
*/
public JSONObject(String string)
@@ -263,16 +250,14 @@
}
/**
- * Accumulate values under a key. It is similar to the put method except that if there is
- * already an object stored under the key then a JSONArray is stored under the key to hold all
- * of the accumulated values. If there is already a JSONArray, then the new value is appended to
- * it. In contrast, the put method replaces the previous value.
+ * Accumulate values under a key. It is similar to the put method except that if there is already an object stored
+ * under the key then a JSONArray is stored under the key to hold all of the accumulated values. If there is already
+ * a JSONArray, then the new value is appended to it. In contrast, the put method replaces the previous value.
*
* @param key A key string.
* @param value An object to be accumulated under the key.
* @return this.
- * @throws {@link RuntimeException}
- * If the value is an invalid number or if the key is null.
+ * @throws {@link RuntimeException} If the value is an invalid number or if the key is null.
*/
public JSONObject accumulate(String key, Object value)
{
@@ -303,15 +288,13 @@
}
/**
- * Append values to the array under a key. If the key does not exist in the JSONObject, then the
- * key is put in the JSONObject with its value being a JSONArray containing the value parameter.
- * If the key was already associated with a JSONArray, then the value parameter is appended to
- * it.
+ * Append values to the array under a key. If the key does not exist in the JSONObject, then the key is put in the
+ * JSONObject with its value being a JSONArray containing the value parameter. If the key was already associated
+ * with a JSONArray, then the value parameter is appended to it.
*
* @param key A key string.
* @param value An object to be accumulated under the key.
- * @return this. @ If the key is null or if the current value associated with the key is not a
- * JSONArray.
+ * @return this. @ If the key is null or if the current value associated with the key is not a JSONArray.
*/
public JSONObject append(String key, Object value)
{
@@ -334,8 +317,7 @@
}
/**
- * Produce a string from a double. The string "null" will be returned if the number is not
- * finite.
+ * Produce a string from a double. The string "null" will be returned if the number is not finite.
*
* @param d A double.
* @return A String.
@@ -411,8 +393,8 @@
* Get the double value associated with a key.
*
* @param key A key string.
- * @return The numeric value. @ if the key is not found or if the value is not a Number object
- * and cannot be converted to a number.
+ * @return The numeric value. @ if the key is not found or if the value is not a Number object and cannot be
+ * converted to a number.
*/
public double getDouble(String key)
{
@@ -433,12 +415,10 @@
}
/**
- * Get the int value associated with a key. If the number value is too large for an int, it will
- * be clipped.
+ * Get the int value associated with a key. If the number value is too large for an int, it will be clipped.
*
* @param key A key string.
- * @return The integer value. @ if the key is not found or if the value cannot be converted to
- * an integer.
+ * @return The integer value. @ if the key is not found or if the value cannot be converted to an integer.
*/
public int getInt(String key)
{
@@ -487,12 +467,10 @@
}
/**
- * Get the long value associated with a key. If the number value is too long for a long, it will
- * be clipped.
+ * Get the long value associated with a key. If the number value is too long for a long, it will be clipped.
*
* @param key A key string.
- * @return The long value. @ if the key is not found or if the value cannot be converted to a
- * long.
+ * @return The long value. @ if the key is not found or if the value cannot be converted to a long.
*/
public long getLong(String key)
{
@@ -527,8 +505,7 @@
* Determine if the value associated with the key is null or if there is no value.
*
* @param key A key string.
- * @return true if there is no value associated with the key or if the value is the
- * JSONObject.NULL object.
+ * @return true if there is no value associated with the key or if the value is the JSONObject.NULL object.
*/
public boolean isNull(String key)
{
@@ -614,12 +591,12 @@
}
/**
- * Put a key/value pair in the JSONObject. If the value is null, then the key will be removed
- * from the JSONObject if it is present.
+ * Put a key/value pair in the JSONObject. If the value is null, then the key will be removed from the JSONObject if
+ * it is present.
*
* @param key A key string.
- * @param value An object which is the value. It should be of one of these types: Boolean, Double,
- * Integer, JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
+ * @param value An object which is the value. It should be of one of these types: Boolean, Double, Integer,
+ * JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
* @return this.
* @throws RuntimeException If the value is non-finite number or if the key is null.
*/
@@ -641,9 +618,9 @@
}
/**
- * Produce a string in double quotes with backslash sequences in all the right places. A
- * backslash will be inserted within </, allowing JSON text to be delivered in HTML. In JSON
- * text, a string cannot contain a control character or an unescaped quote or backslash.
+ * Produce a string in double quotes with backslash sequences in all the right places. A backslash will be inserted
+ * within </, allowing JSON text to be delivered in HTML. In JSON text, a string cannot contain a control character
+ * or an unescaped quote or backslash.
*
* @param string A String
* @return A String correctly formatted for insertion in a JSON text.
@@ -723,12 +700,11 @@
return _properties.remove(key);
}
- private static final Class[] ALLOWED = new Class[]{String.class, Boolean.class, Number.class, JSONObject.class,
- JSONArray.class, Null.class};
+ private static final Class[] ALLOWED = new Class[] { String.class, Boolean.class, Number.class, JSONObject.class,
+ JSONArray.class, Null.class };
/**
- * Throw an exception if the object is an NaN or infinite number, or not a type which may be
- * stored.
+ * Throw an exception if the object is an NaN or infinite number, or not a type which may be stored.
*
* @param value The object to test. @ If o is a non-finite number.
*/
@@ -780,14 +756,14 @@
}
/**
- * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would
- * not result in a syntactically correct JSON text, then null will be returned instead.
+ * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not result in a
+ * syntactically correct JSON text, then null will be returned instead.
* <p/>
* Warning: This method assumes that the data structure is acyclical.
*
- * @return a printable, displayable, portable, transmittable representation of the object,
- * beginning with <code>{</code> <small>(left brace)</small> and ending with
- * <code>}</code> <small>(right brace)</small>.
+ * @return a printable, displayable, portable, transmittable representation of the object, beginning with
+ * <code>{</code> <small>(left brace)</small> and ending with <code>}</code> <small>(right
+ * brace)</small>.
*/
@Override
public String toString()
@@ -813,10 +789,9 @@
}
/**
- * Make a JSON text of an Object value. If the object has an value.toJSONString() method, then
- * that method will be used to produce the JSON text. The method is required to produce a
- * strictly conforming text. If the object does not contain a toJSONString method (which is the
- * most common case), then a text will be produced by the rules.
+ * Make a JSON text of an Object value. If the object has an value.toJSONString() method, then that method will be
+ * used to produce the JSON text. The method is required to produce a strictly conforming text. If the object does
+ * not contain a toJSONString method (which is the most common case), then a text will be produced by the rules.
* <p/>
* Warning: This method assumes that the data structure is acyclical.
*
@@ -861,8 +836,7 @@
}
/**
- * Returns true if the other object is a JSONObject and its set of properties
- * matches this object's properties.
+ * Returns true if the other object is a JSONObject and its set of properties matches this object's properties.
* <p/>
* '
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONString.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONString.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONString.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONString.java Sun Mar 2 09:21:16 2008
@@ -15,18 +15,15 @@
package org.apache.tapestry.json;
/**
- * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
- * method so that a class can change the behavior of
- * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
- * and <code>JSONWriter.value(</code>Object<code>)</code>. The
- * <code>toJSONString</code> method will be used instead of the default behavior
- * of using the Object's <code>toString()</code> method and quoting the result.
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code> method so that a class can change the
+ * behavior of <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>, and
+ * <code>JSONWriter.value(</code>Object<code>)</code>. The <code>toJSONString</code> method will be used instead of the
+ * default behavior of using the Object's <code>toString()</code> method and quoting the result.
*/
public interface JSONString
{
/**
- * The <code>toJSONString</code> method allows a class to produce its own JSON
- * serialization.
+ * The <code>toJSONString</code> method allows a class to produce its own JSON serialization.
*
* @return A strictly syntactically correct JSON text.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java Sun Mar 2 09:21:16 2008
@@ -39,8 +39,8 @@
*/
/**
- * A JSONTokener takes a source string and extracts characters and tokens from it. It is used by the
- * JSONObject and JSONArray constructors to parse JSON source strings.
+ * A JSONTokener takes a source string and extracts characters and tokens from it. It is used by the JSONObject and
+ * JSONArray constructors to parse JSON source strings.
*
* @author JSON.org
* @version 2
@@ -72,8 +72,8 @@
}
/**
- * Back up one character. This provides a sort of lookahead capability, so that you can test for
- * a digit or letter before attempting to parse the next number or identifier.
+ * Back up one character. This provides a sort of lookahead capability, so that you can test for a digit or letter
+ * before attempting to parse the next number or identifier.
*/
public void back()
{
@@ -153,8 +153,7 @@
*
* @param n The number of characters to take.
* @return A string of n characters.
- * @throws RuntimeException Substring bounds error if there are not n characters remaining in the source
- * string.
+ * @throws RuntimeException Substring bounds error if there are not n characters remaining in the source string.
*/
public String next(int n)
{
@@ -169,8 +168,7 @@
}
/**
- * Get the next char in the string, skipping whitespace and comments (slashslash, slashstar, and
- * hash).
+ * Get the next char in the string, skipping whitespace and comments (slashslash, slashstar, and hash).
*
* @return A character, or 0 if there are no more characters.
* @throws RuntimeException
@@ -231,12 +229,11 @@
}
/**
- * Return the characters up to the next close quote character. Backslash processing is done. The
- * formal JSON format does not allow strings in single quotes, but an implementation is allowed
- * to accept them.
+ * Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format
+ * does not allow strings in single quotes, but an implementation is allowed to accept them.
*
- * @param quote The quoting character, either <code>"</code> <small>(double quote)</small>
- * or <code>'</code> <small>(single quote)</small>.
+ * @param quote The quoting character, either <code>"</code> <small>(double quote)</small> or
+ * <code>'</code> <small>(single quote)</small>.
* @return A String.
* @throws RuntimeException Unterminated string.
*/
@@ -293,8 +290,7 @@
}
/**
- * Get the text up but not including the specified character or the end of line, whichever comes
- * first.
+ * Get the text up but not including the specified character or the end of line, whichever comes first.
*
* @param d A delimiter character.
* @return A string.
@@ -318,8 +314,8 @@
}
/**
- * Get the text up but not including one of the specified delimeter characters or the end of
- * line, whichever comes first.
+ * Get the text up but not including one of the specified delimeter characters or the end of line, whichever comes
+ * first.
*
* @param delimiters A set of delimiter characters.
* @return A string, trimmed.
@@ -344,8 +340,8 @@
}
/**
- * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long,
- * or String, or the JSONObject.NULL object.
+ * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+ * JSONObject.NULL object.
*
* @return An object.
* @throws RuntimeException If syntax error.
@@ -467,8 +463,8 @@
}
/**
- * Skip characters until the next character is the requested character. If the requested
- * character is not found, no characters are skipped.
+ * Skip characters until the next character is the requested character. If the requested character is not found, no
+ * characters are skipped.
*
* @param to A character to skip to.
* @return The requested character, or zero if the requested character is not found.
@@ -491,8 +487,7 @@
}
/**
- * Skip characters until past the requested string. If it is not found, we are left at the end
- * of the source.
+ * Skip characters until past the requested string. If it is not found, we are left at the end of the source.
*
* @param to A string to skip past.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java Sun Mar 2 09:21:16 2008
@@ -23,17 +23,17 @@
import java.util.List;
/**
- * Defines a component in terms of its capabilities, parameters, sub-components, etc. During
- * <em>runtime</em>, the component model is immutable. During <em>construction</em> time, when
- * the class is being transformed and loaded, the model is mutable.
+ * Defines a component in terms of its capabilities, parameters, sub-components, etc. During <em>runtime</em>, the
+ * component model is immutable. During <em>construction</em> time, when the class is being transformed and loaded, the
+ * model is mutable.
*
* @see MutableComponentModel
*/
public interface ComponentModel
{
/**
- * Returns the resource corresponding to the class file for this component. This is used to find
- * related resources, such as the component's template and message catalog.
+ * Returns the resource corresponding to the class file for this component. This is used to find related resources,
+ * such as the component's template and message catalog.
*/
Resource getBaseResource();
@@ -43,8 +43,8 @@
String getComponentClassName();
/**
- * Returns the ids of all embedded components defined within the component class (via the
- * {@link org.apache.tapestry.annotations.Component} annotation).
+ * Returns the ids of all embedded components defined within the component class (via the {@link
+ * org.apache.tapestry.annotations.Component} annotation).
*/
List<String> getEmbeddedComponentIds();
@@ -83,67 +83,62 @@
ParameterModel getParameterModel(String parameterName);
/**
- * Returns an alphabetically sorted list of the names of all formal parameters. This includes
- * parameters defined by a base class.
+ * Returns an alphabetically sorted list of the names of all formal parameters. This includes parameters defined by
+ * a base class.
*/
List<String> getParameterNames();
/**
- * Returns an alphabetically sorted list of the names of all formal parameters defined by this
- * specific class (parameters inherited from base classes are not identified).
+ * Returns an alphabetically sorted list of the names of all formal parameters defined by this specific class
+ * (parameters inherited from base classes are not identified).
*/
List<String> getDeclaredParameterNames();
/**
- * Returns a list of the names of all persistent fields (within this class, or any super-class).
- * The names are sorted alphabetically.
+ * Returns a list of the names of all persistent fields (within this class, or any super-class). The names are
+ * sorted alphabetically.
*
* @see Persist
*/
List<String> getPersistentFieldNames();
/**
- * Returns true if the modeled component is a root class, a component class whose parent
- * class is not a component class. We may in the future require that components only extend
- * from Object.
+ * Returns true if the modeled component is a root class, a component class whose parent class is not a component
+ * class. We may in the future require that components only extend from Object.
*
* @return true if a root class, false if a subclass
*/
boolean isRootClass();
/**
- * Returns true if the model indicates that informal parameters, additional parameters beyond
- * the formal parameter defined for the component, are supported. This is false in most cases,
- * but may be set to true for specific classes (when the {@link SupportsInformalParameters}
- * annotation is present, or inherited from a super-class).
+ * Returns true if the model indicates that informal parameters, additional parameters beyond the formal parameter
+ * defined for the component, are supported. This is false in most cases, but may be set to true for specific
+ * classes (when the {@link SupportsInformalParameters} annotation is present, or inherited from a super-class).
*
* @return true if this component model supports informal parameters
*/
boolean getSupportsInformalParameters();
/**
- * Returns the component model for this component's super-class, if it exists. Remember that
- * only classes in the correct packages, are
- * considered component classes.
+ * Returns the component model for this component's super-class, if it exists. Remember that only classes in the
+ * correct packages, are considered component classes.
*
- * @return the parent class model, or null if this component's super class is not itself a
- * component class
+ * @return the parent class model, or null if this component's super class is not itself a component class
*/
ComponentModel getParentModel();
/**
- * Relevant for component mixins only. Indicates that the mixin behavior should occur
- * <em>after</em> (not before) the component. Normally, this flag is set by the presence of
- * the {@link MixinAfter} annotation.
+ * Relevant for component mixins only. Indicates that the mixin behavior should occur <em>after</em> (not before)
+ * the component. Normally, this flag is set by the presence of the {@link MixinAfter} annotation.
*
* @return true if the mixin should operate after, not before, the component
*/
boolean isMixinAfter();
/**
- * Gets a meta value identified by the given key. If the current model does not provide a value
- * for the key, then the parent component model (if any) is searched.
+ * Gets a meta value identified by the given key. If the current model does not provide a value for the key, then
+ * the parent component model (if any) is searched.
*
* @param key identifies the value to be accessed
* @return the value for the key (possibly inherited from a parent model), or null
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/EmbeddedComponentModel.java Sun Mar 2 09:21:16 2008
@@ -1,17 +1,17 @@
-// Copyright 2006, 2008 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "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.
-
+// Copyright 2006, 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "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.
+
package org.apache.tapestry.model;
import org.apache.tapestry.annotations.Component;
@@ -20,8 +20,8 @@
import java.util.List;
/**
- * The model for a component embedded within another component, as defined by the
- * {@link org.apache.tapestry.annotations.Component} annotation.
+ * The model for a component embedded within another component, as defined by the {@link
+ * org.apache.tapestry.annotations.Component} annotation.
*/
public interface EmbeddedComponentModel extends Locatable
{
@@ -36,8 +36,8 @@
String getComponentType();
/**
- * The class name of the component, as derived from the field to which the {@link Component}
- * annotation is applied. This value is only used when the componentType property is blank.
+ * The class name of the component, as derived from the field to which the {@link Component} annotation is applied.
+ * This value is only used when the componentType property is blank.
*/
String getComponentClassName();
@@ -52,8 +52,7 @@
String getParameterValue(String parameterName);
/**
- * Returns the fully qualified class names of all mixins added to this component, sorted
- * alphabetically.
+ * Returns the fully qualified class names of all mixins added to this component, sorted alphabetically.
*/
List<String> getMixinClassNames();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableComponentModel.java Sun Mar 2 09:21:16 2008
@@ -20,14 +20,13 @@
import org.apache.tapestry.ioc.Location;
/**
- * Mutable version of {@link org.apache.tapestry.model.ComponentModel} used during the
- * transformation phase.
+ * Mutable version of {@link org.apache.tapestry.model.ComponentModel} used during the transformation phase.
*/
public interface MutableComponentModel extends ComponentModel
{
/**
- * Adds a new formal parameter to the model. Each parameter has a unique name (though access to
- * parameters is case insensitive).
+ * Adds a new formal parameter to the model. Each parameter has a unique name (though access to parameters is case
+ * insensitive).
*
* @param name new, unique name for the parameter
* @param required if true, the parameter must be bound
@@ -42,26 +41,26 @@
*
* @param id the unique id for the embedded component, which must not already exist.
* @param type the type of the component (posslibly blank)
- * @param componentClassName the fully qualified class name (derived from the field), used if the type is blank
- * @param inheritInformalParameters if true, then the component will inherit informal parameters provided to its container
- * @param location where the component is defined @return a mutable model allowing parameters to be set
+ * @param componentClassName the fully qualified class name (derived from the field), used if the type is
+ * blank
+ * @param inheritInformalParameters if true, then the component will inherit informal parameters provided to its
+ * container
+ * @param location where the component is defined @return a mutable model allowing parameters to be
+ * set
*/
MutableEmbeddedComponentModel addEmbeddedComponent(String id, String type, String componentClassName,
boolean inheritInformalParameters, Location location);
/**
- * Used to define the field persistence strategy for a particular field name. Returns a logical
- * name for the field, which is guaranteed to be unique (this is necessary for handling the case
- * where a subclass has a persistent field with the same name as a persistent field from a
- * super-class).
+ * Used to define the field persistence strategy for a particular field name. Returns a logical name for the field,
+ * which is guaranteed to be unique (this is necessary for handling the case where a subclass has a persistent field
+ * with the same name as a persistent field from a super-class).
*
* @param fieldName the name of the field which is to be made persistent
- * @param strategy the strategy for persisting the field, from {@link Persist#value()}. This value
- * may be blank, in which case the stategy is inherited from the component, or the
- * component's container.
- * @return a logical name for the field, to be used with
- * {@link ComponentModel#getFieldPersistenceStrategy(String)}, and with
- * {@link InternalComponentResources#persistFieldChange(String, Object)}, etc.
+ * @param strategy the strategy for persisting the field, from {@link Persist#value()}. This value may be blank, in
+ * which case the stategy is inherited from the component, or the component's container.
+ * @return a logical name for the field, to be used with {@link ComponentModel#getFieldPersistenceStrategy(String)},
+ * and with {@link InternalComponentResources#persistFieldChange(String, Object)}, etc.
*/
String setFieldPersistenceStrategy(String fieldName, String strategy);
@@ -71,8 +70,8 @@
void addMixinClassName(String mixinClassName);
/**
- * Sets the internal flag to indicate that this model (and all models that extend from it)
- * support informal parameters.
+ * Sets the internal flag to indicate that this model (and all models that extend from it) support informal
+ * parameters.
*/
void enableSupportsInformalParameters();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableEmbeddedComponentModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableEmbeddedComponentModel.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableEmbeddedComponentModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/MutableEmbeddedComponentModel.java Sun Mar 2 09:21:16 2008
@@ -1,22 +1,22 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "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.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "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.
+
package org.apache.tapestry.model;
/**
- * A mutable version of {@link org.apache.tapestry.model.EmbeddedComponentModel} that allows the
- * parameters to be incrementally stored.
+ * A mutable version of {@link org.apache.tapestry.model.EmbeddedComponentModel} that allows the parameters to be
+ * incrementally stored.
*/
public interface MutableEmbeddedComponentModel extends EmbeddedComponentModel
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentResourcesAware.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentResourcesAware.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentResourcesAware.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/ComponentResourcesAware.java Sun Mar 2 09:21:16 2008
@@ -1,24 +1,24 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "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.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "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.
+
package org.apache.tapestry.runtime;
import org.apache.tapestry.ComponentResources;
/**
- * Interface implemented by components (after they have been transformed at load time). Component
- * classes should not implement this interface directly.
+ * Interface implemented by components (after they have been transformed at load time). Component classes should not
+ * implement this interface directly.
*/
public interface ComponentResourcesAware
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/PageLifecycleListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/PageLifecycleListener.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/PageLifecycleListener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/PageLifecycleListener.java Sun Mar 2 09:21:16 2008
@@ -20,20 +20,20 @@
public interface PageLifecycleListener
{
/**
- * Invoked when the page finishes loading. This occurs once all components are loaded and all
- * parameters have been set.
+ * Invoked when the page finishes loading. This occurs once all components are loaded and all parameters have been
+ * set.
*/
void containingPageDidLoad();
/**
- * Invoked when the page is detached, allowing components a chance to clear out any temporary or
- * client specific state.
+ * Invoked when the page is detached, allowing components a chance to clear out any temporary or client specific
+ * state.
*/
void containingPageDidDetach();
/**
- * Invoked when a page is first attached to the current request, giving components a chance to
- * initialize for the current request.
+ * Invoked when a page is first attached to the current request, giving components a chance to initialize for the
+ * current request.
*/
void containingPageDidAttach();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/RenderCommand.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/RenderCommand.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/RenderCommand.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/RenderCommand.java Sun Mar 2 09:21:16 2008
@@ -1,17 +1,17 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "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.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "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.
+
package org.apache.tapestry.runtime;
import org.apache.tapestry.MarkupWriter;
@@ -22,12 +22,11 @@
public interface RenderCommand
{
/**
- * Invoked on an object to request that it render itself. This involves a mix of invoking
- * methods on the writer, and queueing up additional commands (often, representing children of
- * the object that was invoked) to perform additional rendering.
+ * Invoked on an object to request that it render itself. This involves a mix of invoking methods on the writer, and
+ * queueing up additional commands (often, representing children of the object that was invoked) to perform
+ * additional rendering.
* <p/>
- * In this way, rendering is a tail recursive algorithm, but is not implemented using tail
- * recursion.
+ * In this way, rendering is a tail recursive algorithm, but is not implemented using tail recursion.
*/
void render(MarkupWriter writer, RenderQueue queue);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Ajax.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Ajax.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Ajax.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Ajax.java Sun Mar 2 09:21:16 2008
@@ -23,7 +23,7 @@
*
* @see ComponentEventRequestHandler
*/
-@Target({ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface Ajax
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Alias.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Alias.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Alias.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Alias.java Sun Mar 2 09:21:16 2008
@@ -17,16 +17,15 @@
import org.apache.tapestry.ioc.ObjectProvider;
/**
- * The Alias service provides an ObjectProvider that fits into the MasterObjectProvider command chain and
- * disambiguates injections based on type. {@linkplain org.apache.tapestry.services.AliasContribution Contibutions}
- * to the Alias service identify the desired service
- * to inject for a particular service interface; this is only necessary when there is more than one
- * service implementing the same interface.
+ * The Alias service provides an ObjectProvider that fits into the MasterObjectProvider command chain and disambiguates
+ * injections based on type. {@linkplain org.apache.tapestry.services.AliasContribution Contibutions} to the Alias
+ * service identify the desired service to inject for a particular service interface; this is only necessary when there
+ * is more than one service implementing the same interface.
* <p/>
- * The {@linkplain AliasManager AliasOverrides}
- * service also takes an unordered configuration of {@link org.apache.tapestry.services.AliasContribution}; such
- * contributions override the "factory" contributions to the Alias service itself. This is often used
- * to replace built-in service implementations with ones that are specific to a particular application.
+ * The {@linkplain AliasManager AliasOverrides} service also takes an unordered configuration of {@link
+ * org.apache.tapestry.services.AliasContribution}; such contributions override the "factory" contributions to the Alias
+ * service itself. This is often used to replace built-in service implementations with ones that are specific to a
+ * particular application.
*/
public interface Alias
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasContribution.java Sun Mar 2 09:21:16 2008
@@ -31,8 +31,7 @@
private final T _object;
/**
- * Simplifies the creation of an AliasContribution around a known type and instance of that
- * type.
+ * Simplifies the creation of an AliasContribution around a known type and instance of that type.
*/
public static <X> AliasContribution<X> create(Class<X> contributionType, X object)
{
@@ -40,8 +39,7 @@
}
/**
- * Simplifies the creation of an AliasContribution around a known type, mode, and an instance of
- * that type.
+ * Simplifies the creation of an AliasContribution around a known type, mode, and an instance of that type.
*/
public static <X> AliasContribution<X> create(Class<X> contributionType, String mode, X object)
{
@@ -64,10 +62,9 @@
}
/**
- * Returns the mode of operation for this instance of Tapestry. Most of the time, this will be
- * the empty string, meaning that the contribution applies to Tapestry is any mode. In other
- * cases, the mode will be "servlet" but may be other modes via add on modules, such as
- * "portlet" or "offline".
+ * Returns the mode of operation for this instance of Tapestry. Most of the time, this will be the empty string,
+ * meaning that the contribution applies to Tapestry is any mode. In other cases, the mode will be "servlet" but may
+ * be other modes via add on modules, such as "portlet" or "offline".
*/
public String getMode()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasManager.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasManager.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AliasManager.java Sun Mar 2 09:21:16 2008
@@ -22,11 +22,10 @@
public interface AliasManager
{
/**
- * Filters down the contributions based on the mode. Each {@link AliasContribution contribution}
- * will identify a contribution type and a non-null object that implements the type and may
- * identify a mode. Only contributions where the mode is blank or the mode matches the provided
- * mode are returned. Mode specific contributions quietly override non-specific contributions
- * (where the mode is blank).
+ * Filters down the contributions based on the mode. Each {@link AliasContribution contribution} will identify a
+ * contribution type and a non-null object that implements the type and may identify a mode. Only contributions
+ * where the mode is blank or the mode matches the provided mode are returned. Mode specific contributions quietly
+ * override non-specific contributions (where the mode is blank).
*
* @param mode
* @return map from contribution type to contribution object
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateContribution.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateContribution.java Sun Mar 2 09:21:16 2008
@@ -17,8 +17,8 @@
import org.apache.tapestry.ioc.internal.util.Defense;
/**
- * A contribution to the configuration of the {@link ApplicationStateManager}, identifying the
- * strategy and creator for a particular ASO (identified by the ASO's class).
+ * A contribution to the configuration of the {@link ApplicationStateManager}, identifying the strategy and creator for
+ * a particular ASO (identified by the ASO's class).
*/
public final class ApplicationStateContribution
{
@@ -40,8 +40,8 @@
}
/**
- * The creator for the ASO. If null, the the ASO is created directly from the ASO class, via its
- * public no-arguments constructor.
+ * The creator for the ASO. If null, the the ASO is created directly from the ASO class, via its public no-arguments
+ * constructor.
*/
public ApplicationStateCreator getCreator()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateCreator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateCreator.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateCreator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStateCreator.java Sun Mar 2 09:21:16 2008
@@ -15,8 +15,8 @@
package org.apache.tapestry.services;
/**
- * Used by {@link ApplicationStateManager} and {@link ApplicationStatePersistenceStrategy} to create
- * an application state object on demand.
+ * Used by {@link ApplicationStateManager} and {@link ApplicationStatePersistenceStrategy} to create an application
+ * state object on demand.
*
* @param <T>
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategy.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategy.java Sun Mar 2 09:21:16 2008
@@ -15,16 +15,15 @@
package org.apache.tapestry.services;
/**
- * Used by {@link ApplicationStateManager} to manage a specific kind of ASO persistence. The stategy
- * is responsible for managing ASO instances within its domain.
+ * Used by {@link ApplicationStateManager} to manage a specific kind of ASO persistence. The stategy is responsible for
+ * managing ASO instances within its domain.
*
* @see org.apache.tapestry.services.ApplicationStatePersistenceStrategySource
*/
public interface ApplicationStatePersistenceStrategy
{
/**
- * Gets the ASO from the domain. If the ASO does not already exist, it is created and stored,
- * then returned.
+ * Gets the ASO from the domain. If the ASO does not already exist, it is created and stored, then returned.
*/
<T> T get(Class<T> asoClass, ApplicationStateCreator<T> creator);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategySource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategySource.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategySource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ApplicationStatePersistenceStrategySource.java Sun Mar 2 09:21:16 2008
@@ -17,7 +17,8 @@
/**
* Used to provide access to stategies via a logical name for the stategy, such as "session".
*
- * @see org.apache.tapestry.services.TapestryModule#contributeApplicationStatePersistenceStrategySource(org.apache.tapestry.ioc.MappedConfiguration, Request)
+ * @see org.apache.tapestry.services.TapestryModule#contributeApplicationStatePersistenceStrategySource(org.apache.tapestry.ioc.MappedConfiguration,
+ * Request)
*/
public interface ApplicationStatePersistenceStrategySource
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetFactory.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetFactory.java Sun Mar 2 09:21:16 2008
@@ -25,8 +25,7 @@
public interface AssetFactory
{
/**
- * Returns the Resource representing the root folder of the domain this factory is responsible
- * for.
+ * Returns the Resource representing the root folder of the domain this factory is responsible for.
*/
Resource getRootResource();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetSource.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/AssetSource.java Sun Mar 2 09:21:16 2008
@@ -23,21 +23,22 @@
/**
* Used to find or create an {@link Asset} with a given path.
* <p/>
- * Assets are defined with a domain, and the domain is indicated by a prefix. The two builtin domains are "context:" (for files inside
- * the web application context) and "classpath:" for files stored on the classpath (typically, inside a JAR, such as a component library).
+ * Assets are defined with a domain, and the domain is indicated by a prefix. The two builtin domains are "context:"
+ * (for files inside the web application context) and "classpath:" for files stored on the classpath (typically, inside
+ * a JAR, such as a component library).
*
- * @see org.apache.tapestry.services.TapestryModule#contributeAssetSource(org.apache.tapestry.ioc.MappedConfiguration, AssetFactory, AssetFactory)
+ * @see org.apache.tapestry.services.TapestryModule#contributeAssetSource(org.apache.tapestry.ioc.MappedConfiguration,
+ * AssetFactory, AssetFactory)
*/
public interface AssetSource
{
/**
- * Finds the asset. The path may either be a simple file name or a relative path (relative to
- * the base resource) <em>or</em> it may have a prefix, such as "context:" or "classpath:", in
- * which case it is treated as a complete path within the indicated domain. The resulting
- * Resource is then localized (to the provided Locale) and returned as an Asset.
+ * Finds the asset. The path may either be a simple file name or a relative path (relative to the base resource)
+ * <em>or</em> it may have a prefix, such as "context:" or "classpath:", in which case it is treated as a complete
+ * path within the indicated domain. The resulting Resource is then localized (to the provided Locale) and returned
+ * as an Asset.
* <p/>
- * The AssetSource caches its results, so a single Asset instance may be shared among many
- * different components.
+ * The AssetSource caches its results, so a single Asset instance may be shared among many different components.
*
* @param baseResource base resource for computing relative paths, or null to search the classpath
* @param path relative to the base resource
@@ -57,8 +58,7 @@
Asset getClasspathAsset(String path, Locale locale);
/**
- * Obtains a classpath alias in the current locale (as defined by the {@link ThreadLocale}
- * service).
+ * Obtains a classpath alias in the current locale (as defined by the {@link ThreadLocale} service).
*
* @param path
* @return the asset
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BeanBlockContribution.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BeanBlockContribution.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BeanBlockContribution.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BeanBlockContribution.java Sun Mar 2 09:21:16 2008
@@ -18,8 +18,8 @@
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
/**
- * A contribution to the {@link BeanBlockSource} service, defining a page name and block id (within
- * the page) that can edit or display a particular type of property.
+ * A contribution to the {@link BeanBlockSource} service, defining a page name and block id (within the page) that can
+ * edit or display a particular type of property.
*/
public final class BeanBlockContribution
{
@@ -60,9 +60,9 @@
}
/**
- * If true, then the block provides an editor for the property, consisting of a {@link Label}
- * and some field component (or set of field components). If false, the block is used to display
- * the value of the property, usually by applying some kind of formatting to the raw value.
+ * If true, then the block provides an editor for the property, consisting of a {@link Label} and some field
+ * component (or set of field components). If false, the block is used to display the value of the property, usually
+ * by applying some kind of formatting to the raw value.
*/
public boolean isEdit()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BindingFactory.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/BindingFactory.java Sun Mar 2 09:21:16 2008
@@ -19,23 +19,21 @@
import org.apache.tapestry.ioc.Location;
/**
- * Creates a binding of a particular type. This is usually invoked from the {@link org.apache.tapestry.services.BindingSource} service.
+ * Creates a binding of a particular type. This is usually invoked from the {@link
+ * org.apache.tapestry.services.BindingSource} service.
*/
public interface BindingFactory
{
/**
* Creates a new binding instance.
* <p/>
- * The binding represents a connection between the container and the component (the component is
- * usually the child of the component, though in a few cases, it is the component itself). In
- * most cases, the expression is evaluated in terms of the resources of the <em>container</em>
- * and the component is ignored.
+ * The binding represents a connection between the container and the component (the component is usually the child
+ * of the component, though in a few cases, it is the component itself). In most cases, the expression is evaluated
+ * in terms of the resources of the <em>container</em> and the component is ignored.
*
* @param description of the binding, such as, "parameter foo"
- * @param container the component, as represented by its resources, for which a binding is to be
- * created.
- * @param component the component whose parameter is to be bound by the resulting binding (rarely
- * used)
+ * @param container the component, as represented by its resources, for which a binding is to be created.
+ * @param component the component whose parameter is to be bound by the resulting binding (rarely used)
* @param expression
* @param location from which the binding was generate, or null if not known
* @return the new binding instance
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java Sun Mar 2 09:21:16 2008
@@ -39,7 +39,7 @@
* <p/>
* Instances of this class are not designed to be thread safe, access to an instance should be restricted to a single
* thread. In fact, the design of this type is to allow stateless singletons in multiple threads to work on
- * thread-specific data (within the ClassTransformation).
+ * thread-specific data (within the ClassTransformation).
* <p/>
* The majority of methods concern the <em>declared</em> members (field and methods) of a specific class, rather than
* any fields or methods inherited from a base class.
@@ -81,6 +81,10 @@
*/
List<String> findFieldsWithAnnotation(Class<? extends Annotation> annotationClass);
+ /**
+ * As with {@link #findFieldsWithAnnotation(Class)}, but finds fields even if they are claimed.
+ */
+ List<String> findAllFieldsWithAnnotation(Class<? extends Annotation> annotationClass);
/**
* Finds all methods defined in the class that are marked with the provided annotation.
@@ -227,7 +231,7 @@
* is added that first invokes the super implementation. Use {@link #addMethod(TransformMethodSignature, String)}
* when it is necessary to control when the super-class method is invoked.
* <p/>
- * The extended method is considered <em>new</em>. New methods <em>do not</em> are not scanned for {@linkplain
+ * The extended method is considered <em>new</em>. New methods <em>are not</em> scanned for {@linkplain
* #removeField(String)} removed}, {@linkplain #replaceReadAccess(String, String)} read replaced}, or {@linkplain
* #replaceWriteAccess(String, String) write replaced} fields. Generally that's what you want!
*
@@ -286,6 +290,12 @@
void addMethod(TransformMethodSignature signature, String methodBody);
/**
+ * As with {@link #addMethod(TransformMethodSignature, String)}, but field references inside the method
+ * <em>will</em> be transformed.
+ */
+ void addTransformedMethod(TransformMethodSignature methodSignature, String methodBody);
+
+ /**
* Adds a statement to the constructor. The statement is added as is, though a newline is added.
*
* @param statement the statement to add, which should end with a semicolon
@@ -350,4 +360,6 @@
* @return true if root class, false is sub-class
*/
boolean isRootTransformation();
+
+
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathAssetAliasManager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathAssetAliasManager.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathAssetAliasManager.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathAssetAliasManager.java Sun Mar 2 09:21:16 2008
@@ -17,8 +17,8 @@
public interface ClasspathAssetAliasManager
{
/**
- * Takes a resource path to a classpath resource and adds the asset path prefix to the path. May
- * also convert part of the path to an alias (based on the manager's configuration).
+ * Takes a resource path to a classpath resource and adds the asset path prefix to the path. May also convert part
+ * of the path to an alias (based on the manager's configuration).
*
* @param resourcePath resource path on the classpath (with no leading slash)
* @return URL ready to send to the client
@@ -26,8 +26,8 @@
String toClientURL(String resourcePath);
/**
- * Reverses {@link #toClientURL(String)}, stripping off the asset prefix, and re-expanding any
- * aliased folders back to complete folders.
+ * Reverses {@link #toClientURL(String)}, stripping off the asset prefix, and re-expanding any aliased folders back
+ * to complete folders.
*/
String toResourcePath(String clientURL);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathProvider.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClasspathProvider.java Sun Mar 2 09:21:16 2008
@@ -27,7 +27,7 @@
* assets located on the classpath.
*/
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface ClasspathProvider
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentClassTransformWorker.java Sun Mar 2 09:21:16 2008
@@ -1,33 +1,32 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "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.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "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.
+
package org.apache.tapestry.services;
import org.apache.tapestry.model.MutableComponentModel;
/**
- * Interface for a set of objects that can perform component class transformations. Implementations
- * should be multithreaded, ideally they should be stateless (all necessary state can be stored in
- * the {@link org.apache.tapestry.services.ClassTransformation}).
+ * Interface for a set of objects that can perform component class transformations. Implementations should be
+ * multithreaded, ideally they should be stateless (all necessary state can be stored in the {@link
+ * org.apache.tapestry.services.ClassTransformation}).
*/
public interface ComponentClassTransformWorker
{
/**
- * Invoked to perform a transformation on an as-yet unloaded component class, represented by the
- * {@link ClassTransformation} instance. In some cases, the worker may make changes to the
- * component model -- for example, a worker that deals with parameters may update the model to
- * reflect those parameters.
+ * Invoked to perform a transformation on an as-yet unloaded component class, represented by the {@link
+ * ClassTransformation} instance. In some cases, the worker may make changes to the component model -- for example,
+ * a worker that deals with parameters may update the model to reflect those parameters.
*/
void transform(ClassTransformation transformation, MutableComponentModel model);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentDefaultProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentDefaultProvider.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentDefaultProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentDefaultProvider.java Sun Mar 2 09:21:16 2008
@@ -17,8 +17,7 @@
import org.apache.tapestry.*;
/**
- * A service that can be injected into a component to provide common defaults for various
- * types of parameters.
+ * A service that can be injected into a component to provide common defaults for various types of parameters.
*/
public interface ComponentDefaultProvider
{
@@ -26,15 +25,15 @@
* Computes the default label for the component (which will generally be a {@link Field}).
*
* @param resources
- * @return the label, either extracted from the component's container's message catalog, or
- * derived from the component's {@link ComponentResourcesCommon#getId()}.
+ * @return the label, either extracted from the component's container's message catalog, or derived from the
+ * component's {@link ComponentResourcesCommon#getId()}.
*/
String defaultLabel(ComponentResources resources);
/**
- * Checks to see if the container of the component (identified by its resources) contains a
- * property matching the component's id. If so, a binding for that property is returned. This is
- * usually the default for a {@link Field}'s value parameter (or equivalent).
+ * Checks to see if the container of the component (identified by its resources) contains a property matching the
+ * component's id. If so, a binding for that property is returned. This is usually the default for a {@link Field}'s
+ * value parameter (or equivalent).
*
* @param parameterName the name of the parameter
* @param resources the resources of the component for which a binding is needed
@@ -43,9 +42,11 @@
Binding defaultBinding(String parameterName, ComponentResources resources);
/**
- * Gets or creates a value encoder based on the <em>type</em> of the named parameter. ValueEncoders are cached based on type.
+ * Gets or creates a value encoder based on the <em>type</em> of the named parameter. ValueEncoders are cached
+ * based on type.
*
- * @param parameterName the name of the parameter whose type is used to locate a {@link org.apache.tapestry.services.ValueEncoderFactory}
+ * @param parameterName the name of the parameter whose type is used to locate a {@link
+ * org.apache.tapestry.services.ValueEncoderFactory}
* @param resources the resources of the component, from which parameter and its type are extracted
* @return the value encoder, or null if the type of the parameter is not known
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentEventRequestParameters.java Sun Mar 2 09:21:16 2008
@@ -125,7 +125,8 @@
/**
* The activation context for the <em>active page</em>, possibly empty (but not null).
*
- * @see org.apache.tapestry.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry.EventContext, org.apache.tapestry.ComponentEventCallback)
+ * @see org.apache.tapestry.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry.EventContext,
+ * org.apache.tapestry.ComponentEventCallback)
*/
public EventContext getPageActivationContext()
{
@@ -135,7 +136,8 @@
/**
* The event context information passed in the URL. Possibly empty (not not null).
*
- * @see org.apache.tapestry.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry.EventContext, org.apache.tapestry.ComponentEventCallback)
+ * @see org.apache.tapestry.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry.EventContext,
+ * org.apache.tapestry.ComponentEventCallback)
*/
public EventContext getEventContext()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentLayer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentLayer.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentLayer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentLayer.java Sun Mar 2 09:21:16 2008
@@ -22,13 +22,13 @@
import java.lang.annotation.Target;
/**
- * Marker annotation used to identify a service from the component layer that conflicts, in terms of service
- * interface, with a service from elsewhere. In particular, this is used to disambiguate
- * {@link org.apache.tapestry.ioc.services.ClassFactory} which has one implementation (marked with {@link org.apache.tapestry.ioc.services.Builtin} and
- * another with this annotation.
+ * Marker annotation used to identify a service from the component layer that conflicts, in terms of service interface,
+ * with a service from elsewhere. In particular, this is used to disambiguate {@link
+ * org.apache.tapestry.ioc.services.ClassFactory} which has one implementation (marked with {@link
+ * org.apache.tapestry.ioc.services.Builtin} and another with this annotation.
*/
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface ComponentLayer
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentMessagesSource.java Sun Mar 2 09:21:16 2008
@@ -26,10 +26,9 @@
public interface ComponentMessagesSource extends InvalidationEventHub
{
/**
- * Used to obtain a {@link Messages} instance for a particular component, within a particular
- * locale. If the component extends from another component, then its localized properties will
- * merge with its parent's properties (with the subclass overriding the super class on any
- * conflicts).
+ * Used to obtain a {@link Messages} instance for a particular component, within a particular locale. If the
+ * component extends from another component, then its localized properties will merge with its parent's properties
+ * (with the subclass overriding the super class on any conflicts).
*
* @param componentModel
* @param locale