You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/03/02 18:21:32 UTC
svn commit: r632791 [2/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/TapestryFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryFilter.java Sun Mar 2 09:21:16 2008
@@ -35,9 +35,9 @@
import java.util.List;
/**
- * The TapestryFilter is responsible for intercepting all requests into the web application. It
- * identifies the requests that are relevant to Tapestry, and lets the servlet container handle the
- * rest. It is also responsible for initializing Tapestry.
+ * The TapestryFilter is responsible for intercepting all requests into the web application. It identifies the requests
+ * that are relevant to Tapestry, and lets the servlet container handle the rest. It is also responsible for
+ * initializing Tapestry.
*/
public class TapestryFilter implements Filter
{
@@ -50,9 +50,9 @@
private HttpServletRequestHandler _handler;
/**
- * Initializes the filter using the {@link TapestryAppInitializer}. The application package is
- * defined by the <code>tapestry.app-package</code> context init parameter and the application
- * name is the capitalization of the filter name (as specified in web.xml).
+ * Initializes the filter using the {@link TapestryAppInitializer}. The application package is defined by the
+ * <code>tapestry.app-package</code> context init parameter and the application name is the capitalization of the
+ * filter name (as specified in web.xml).
*/
public final void init(FilterConfig filterConfig) throws ServletException
{
@@ -135,9 +135,8 @@
}
/**
- * Invoked from {@link #init(FilterConfig)} after the Registry has been created, to allow any
- * additional initialization to occur. This implementation does nothing, and my be overriden in
- * subclasses.
+ * Invoked from {@link #init(FilterConfig)} after the Registry has been created, to allow any additional
+ * initialization to occur. This implementation does nothing, and my be overriden in subclasses.
*
* @param registry from which services may be extracted
* @throws ServletException
@@ -148,8 +147,8 @@
}
/**
- * Overridden in subclasses to provide additional module definitions beyond those normally
- * located. This implementation returns an empty array.
+ * Overridden in subclasses to provide additional module definitions beyond those normally located. This
+ * implementation returns an empty array.
*/
protected ModuleDef[] provideExtraModuleDefs(ServletContext context)
{
@@ -186,9 +185,8 @@
}
/**
- * Invoked from {@link #destroy()} to allow subclasses to add additional shutdown logic to the
- * filter. The Registry will be shutdown after this call. This implementation does nothing, and
- * may be overridden in subclasses.
+ * Invoked from {@link #destroy()} to allow subclasses to add additional shutdown logic to the filter. The Registry
+ * will be shutdown after this call. This implementation does nothing, and may be overridden in subclasses.
*
* @param registry
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/TapestryUtils.java Sun Mar 2 09:21:16 2008
@@ -31,9 +31,8 @@
private static final char SLASH = '\\';
/**
- * Quotes the provided value as a JavaScript string literal. The input value is surrounded by
- * single quotes and any interior backslash, single or double quotes are escaped (a preceding
- * backslash is added).
+ * Quotes the provided value as a JavaScript string literal. The input value is surrounded by single quotes and any
+ * interior backslash, single or double quotes are escaped (a preceding backslash is added).
*
* @param text
* @return quoted text
@@ -66,8 +65,8 @@
}
/**
- * Joins together several strings, sorting them alphabetically and separating them with spaces.
- * This is often used when setting the CSS class attribute of an element.
+ * Joins together several strings, sorting them alphabetically and separating them with spaces. This is often used
+ * when setting the CSS class attribute of an element.
*/
public static String join(String... values)
{
@@ -77,8 +76,8 @@
}
/**
- * Joins together several strings, sorting them alphabetically and separating them with spaces.
- * This is often used when setting the CSS class attribute of an element.
+ * Joins together several strings, sorting them alphabetically and separating them with spaces. This is often used
+ * when setting the CSS class attribute of an element.
*/
public static String join(List<String> values)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTracker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTracker.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTracker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTracker.java Sun Mar 2 09:21:16 2008
@@ -19,32 +19,25 @@
import java.util.List;
/**
- * Tracks information related to user input validations. This information is:
- * <ul>
- * <li>The input values provided by the user.
- * <li>Any validation exceptions associated with input fields.
- * </ul>
+ * Tracks information related to user input validations. This information is: <ul> <li>The input values provided by the
+ * user. <li>Any validation exceptions associated with input fields. </ul>
* <p/>
- * The tracker must differentiate between components (which will implement the {@link Field}
- * interfaces) and fields. It is a one to many relationship, because each field may be called upon
- * to render itself multiple times within a request, because of {@link Loop} or other similar
- * components.
+ * The tracker must differentiate between components (which will implement the {@link Field} interfaces) and fields. It
+ * is a one to many relationship, because each field may be called upon to render itself multiple times within a
+ * request, because of {@link Loop} or other similar components.
* <p/>
- * Internally, the tracker indexes its information in terms of the {@linkplain Field#getControlName() control name}
- * for each rendering of the component (the mechanics of Tapestry ensures that this is unique within
- * the form).
+ * Internally, the tracker indexes its information in terms of the {@linkplain Field#getControlName() control name} for
+ * each rendering of the component (the mechanics of Tapestry ensures that this is unique within the form).
* <p/>
- * Validation trackers must be serializable, as they will almost always be stored into the
- * HttpSession.
+ * Validation trackers must be serializable, as they will almost always be stored into the HttpSession.
* <p/>
* Trackers are used by only a single form within a single page; they are not threadsafe.
*/
public interface ValidationTracker
{
/**
- * Called by a field to record the exact input from the user, prior to any validation. If the
- * form is redisplayed (to present errors), the input value will be sent back to the user for
- * correction.
+ * Called by a field to record the exact input from the user, prior to any validation. If the form is redisplayed
+ * (to present errors), the input value will be sent back to the user for correction.
*
* @param field the field recording the input
* @param input the value obtained from the forms submission
@@ -57,8 +50,8 @@
String getInput(Field field);
/**
- * Records an error message for a field. The error message is primarily derived from a
- * {@link ValidationException} thrown by a {@link Validator} or {@link Translator}.
+ * Records an error message for a field. The error message is primarily derived from a {@link ValidationException}
+ * thrown by a {@link Validator} or {@link Translator}.
*
* @param field
* @param errorMessage
@@ -66,16 +59,16 @@
void recordError(Field field, String errorMessage);
/**
- * Records an error message that is not associated with any specific field. This often reflects
- * some amount of cross-form validation.
+ * Records an error message that is not associated with any specific field. This often reflects some amount of
+ * cross-form validation.
*
* @param errorMessage
*/
void recordError(String errorMessage);
/**
- * For a given field, determines if the field is "in error", meaning that an error message has
- * been previously recorded for the field.
+ * For a given field, determines if the field is "in error", meaning that an error message has been previously
+ * recorded for the field.
*
* @param field
* @return true if an error message is present
@@ -93,9 +86,8 @@
boolean getHasErrors();
/**
- * Returns a list of all error messages. The messages are stored in the order that they were
- * added to the tracker, except that unassociated errors (unassociated with any field) are
- * listed first.
+ * Returns a list of all error messages. The messages are stored in the order that they were added to the tracker,
+ * except that unassociated errors (unassociated with any field) are listed first.
*/
List<String> getErrors();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTrackerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTrackerImpl.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTrackerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValidationTrackerImpl.java Sun Mar 2 09:21:16 2008
@@ -22,8 +22,8 @@
import java.util.Map;
/**
- * Standard implmentation of {@link ValidationTracker}. Works pretty hard to ensure a minimum
- * amount of data is stored in the HttpSession.
+ * Standard implmentation of {@link ValidationTracker}. Works pretty hard to ensure a minimum amount of data is stored
+ * in the HttpSession.
*/
public final class ValidationTrackerImpl implements ValidationTracker, Serializable
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/Validator.java Sun Mar 2 09:21:16 2008
@@ -66,9 +66,9 @@
void validate(Field field, C constraintValue, MessageFormatter formatter, T value) throws ValidationException;
/**
- * Returns true if the validator should be invoked for null or blank (empty string) values. This is generally
- * false, but is true for validators that enforce that a non-blank value is required. This is the basis
- * of the {@link org.apache.tapestry.Field#isRequired()} property.
+ * Returns true if the validator should be invoked for null or blank (empty string) values. This is generally false,
+ * but is true for validators that enforce that a non-blank value is required. This is the basis of the {@link
+ * org.apache.tapestry.Field#isRequired()} property.
*/
boolean isRequired();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValueEncoder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValueEncoder.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValueEncoder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/ValueEncoder.java Sun Mar 2 09:21:16 2008
@@ -15,12 +15,12 @@
package org.apache.tapestry;
/**
- * Used to convert server side values to client-side strings. This is used when generating
- * a {@link org.apache.tapestry.EventContext} as part of a URL, or when components (such as {@link org.apache.tapestry.corelib.components.Select})
- * generated other client-side strings.
+ * Used to convert server side values to client-side strings. This is used when generating a {@link
+ * org.apache.tapestry.EventContext} as part of a URL, or when components (such as {@link
+ * org.apache.tapestry.corelib.components.Select}) generated other client-side strings.
* <p/>
- * Often a custom implementation is needed for entity type objects, where the {@link #toClient(Object)} method
- * extracts a primary key, and the {@link #toValue(String)} re-acquires the corresponding entity object.
+ * Often a custom implementation is needed for entity type objects, where the {@link #toClient(Object)} method extracts
+ * a primary key, and the {@link #toValue(String)} re-acquires the corresponding entity object.
*
* @see SelectModel
* @see org.apache.tapestry.services.ValueEncoderSource
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRender.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRender.java Sun Mar 2 09:21:16 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 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.
@@ -21,11 +21,11 @@
import java.lang.annotation.Target;
/**
- * Marker annotation for methods associated with the AfterRender phase. This corresponds closely to
- * {@link org.apache.tapestry.annotations.BeginRender}, but occurs after the template and body of
- * the component have been rendered. Often, this is used to render a close tag. Return void or true (the default)
- * to advance to the {@link org.apache.tapestry.annotations.CleanupRender} phase. Return false to
- * return to the {@link org.apache.tapestry.annotations.BeginRender} phase.
+ * Marker annotation for methods associated with the AfterRender phase. This corresponds closely to {@link
+ * org.apache.tapestry.annotations.BeginRender}, but occurs after the template and body of the component have been
+ * rendered. Often, this is used to render a close tag. Return void or true (the default) to advance to the {@link
+ * org.apache.tapestry.annotations.CleanupRender} phase. Return false to return to the {@link
+ * org.apache.tapestry.annotations.BeginRender} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderBody.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderBody.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderBody.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderBody.java Sun Mar 2 09:21:16 2008
@@ -1,17 +1,17 @@
-// Copyright 2006, 2007 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, 2007, 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.annotations;
import java.lang.annotation.Documented;
@@ -21,11 +21,10 @@
import java.lang.annotation.Target;
/**
- * Corresponds to {@link BeforeRenderBody}, allowing additional markup after rendering the body of
- * a component, but before rendering the rest of the component's template. Return true (the
- * default) to progress to the {@link AfterRenderTemplate} or {@link AfterRender} phase (depending
- * on whether the component does or does not have a template). Return false to return to the
- * {@link BeforeRenderBody} phase.
+ * Corresponds to {@link BeforeRenderBody}, allowing additional markup after rendering the body of a component, but
+ * before rendering the rest of the component's template. Return true (the default) to progress to the {@link
+ * AfterRenderTemplate} or {@link AfterRender} phase (depending on whether the component does or does not have a
+ * template). Return false to return to the {@link BeforeRenderBody} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderTemplate.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderTemplate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/AfterRenderTemplate.java Sun Mar 2 09:21:16 2008
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007 The Apache Software Foundation
+// Copyright 2006, 2007, 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.
@@ -21,9 +21,9 @@
import java.lang.annotation.Target;
/**
- * Corresponds to {@link BeforeRenderTemplate}, allowing additional markup after rendering the
- * component's template. Returning true (the default), will progress to the {@link AfterRender}
- * phase. Return false to return to the {@link BeforeRenderTemplate} phase.
+ * Corresponds to {@link BeforeRenderTemplate}, allowing additional markup after rendering the component's template.
+ * Returning true (the default), will progress to the {@link AfterRender} phase. Return false to return to the {@link
+ * BeforeRenderTemplate} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderBody.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderBody.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderBody.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderBody.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.annotations;
import java.lang.annotation.Documented;
@@ -21,15 +21,14 @@
import java.lang.annotation.Target;
/**
- * Marks methods to be invoked when the component rendering state machine hits the point in the
- * component's template where the body element occurs. Such methods may optionally take a
- * {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or boolean.
+ * Marks methods to be invoked when the component rendering state machine hits the point in the component's template
+ * where the body element occurs. Such methods may optionally take a {@link org.apache.tapestry.MarkupWriter} parameter,
+ * and may return void or boolean.
* <p/>
* Returning true (or void) will queue up the component's body for rendering.
* <p/>
- * Returning false will skip the component's body, but continue rendering the template. The
- * {@link org.apache.tapestry.annotations.AfterRenderBody} phase will still execute after the
- * template finishes rendering.
+ * Returning false will skip the component's body, but continue rendering the template. The {@link
+ * org.apache.tapestry.annotations.AfterRenderBody} phase will still execute after the template finishes rendering.
* <p/>
* This phase is skipped for components which do not have a body.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderTemplate.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderTemplate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeforeRenderTemplate.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.annotations;
import java.lang.annotation.Documented;
@@ -21,11 +21,10 @@
import java.lang.annotation.Target;
/**
- * Associated with components that have a template, this phase is invoked to allow the component to
- * decorate its template with additional markup. Returning true will cause the component's template
- * to render (possibly including additional components, or this component's body), and eventually
- * reach the {@link AfterRenderTemplate} phase. Return false to skip the template and body, and jump
- * directly to the {@link AfterRenderTemplate} phase.
+ * Associated with components that have a template, this phase is invoked to allow the component to decorate its
+ * template with additional markup. Returning true will cause the component's template to render (possibly including
+ * additional components, or this component's body), and eventually reach the {@link AfterRenderTemplate} phase. Return
+ * false to skip the template and body, and jump directly to the {@link AfterRenderTemplate} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeginRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeginRender.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeginRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/BeginRender.java Sun Mar 2 09:21:16 2008
@@ -21,22 +21,20 @@
import java.lang.annotation.Target;
/**
- * Marker annotation for methods that should be executed at the start of rendering the component.
- * This usually includes rendering of the component's start tag.
+ * Marker annotation for methods that should be executed at the start of rendering the component. This usually includes
+ * rendering of the component's start tag.
* <p/>
- * Such methods may optionally take a {@link org.apache.tapestry.MarkupWriter} parameter, and may
- * return void or boolean. Returning true or void will allow the component to advance into the
- * render template / render body phase. If a body is present, the
- * {@link org.apache.tapestry.annotations.BeforeRenderBody} phase will execute. If a component has a
- * template, the {@link BeforeRenderTemplate} phase will execute (and the render body will only
- * occur if the template directs so).
+ * Such methods may optionally take a {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or
+ * boolean. Returning true or void will allow the component to advance into the render template / render body phase. If
+ * a body is present, the {@link org.apache.tapestry.annotations.BeforeRenderBody} phase will execute. If a component
+ * has a template, the {@link BeforeRenderTemplate} phase will execute (and the render body will only occur if the
+ * template directs so).
* <p/>
- * Either way, the {@link org.apache.tapestry.annotations.AfterRender} phase will execute after the
- * template and/or body have rendered. A component with a body but without a template will still see
- * the {@link org.apache.tapestry.annotations.BeforeRenderBody} phase execute.
+ * Either way, the {@link org.apache.tapestry.annotations.AfterRender} phase will execute after the template and/or body
+ * have rendered. A component with a body but without a template will still see the {@link
+ * org.apache.tapestry.annotations.BeforeRenderBody} phase execute.
* <p/>
- * Returning false will skip rendering of the template and/or body, and jump directly to the
- * {@link AfterRender} phase.
+ * Returning false will skip rendering of the template and/or body, and jump directly to the {@link AfterRender} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/CleanupRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/CleanupRender.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/CleanupRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/CleanupRender.java Sun Mar 2 09:21:16 2008
@@ -21,12 +21,11 @@
import java.lang.annotation.Target;
/**
- * Marker annotation for component methods associated with the terminal phase for the component
- * rendering state machine. Methods may optionally take a {@link org.apache.tapestry.MarkupWriter}
- * annotation. Generally, methods marked with this annotation are used to perform post-render
- * cleanup. In addition, a method may return false to return to the
- * {@link org.apache.tapestry.annotations.SetupRender} phase. Returning void or true (the default),
- * is the normal course.
+ * Marker annotation for component methods associated with the terminal phase for the component rendering state machine.
+ * Methods may optionally take a {@link org.apache.tapestry.MarkupWriter} annotation. Generally, methods marked with
+ * this annotation are used to perform post-render cleanup. In addition, a method may return false to return to the
+ * {@link org.apache.tapestry.annotations.SetupRender} phase. Returning void or true (the default), is the normal
+ * course.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Component.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Component.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Component.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Component.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.annotations;
import java.lang.annotation.Documented;
@@ -30,26 +30,25 @@
{
/**
- * The id of the component. When left blank (the default), the component id is determined from
- * the field name.
+ * The id of the component. When left blank (the default), the component id is determined from the field name.
*/
String id() default "";
/**
- * The component type. When this is left unspecified, then the annotated field's type is used
- * directly as the component type.
+ * The component type. When this is left unspecified, then the annotated field's type is used directly as the
+ * component type.
*/
String type() default "";
/**
- * Parameter bindings for the component. Each value in the array is of the form "name=value".
- * The value is a binding expression, with a default binding prefix of "prop:".
+ * Parameter bindings for the component. Each value in the array is of the form "name=value". The value is a binding
+ * expression, with a default binding prefix of "prop:".
*/
String[] parameters() default {};
/**
- * If true, then the component will inherit all informal parameters from its parent component.
- * The default is false.
+ * If true, then the component will inherit all informal parameters from its parent component. The default is
+ * false.
*/
boolean inheritInformalParameters() default false;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ContentType.java Sun Mar 2 09:21:16 2008
@@ -24,7 +24,7 @@
*
* @see org.apache.tapestry.annotations.ResponseEncoding
*/
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface ContentType
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Environmental.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Environmental.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Environmental.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Environmental.java Sun Mar 2 09:21:16 2008
@@ -23,8 +23,7 @@
import java.lang.annotation.Target;
/**
- * Defines a field that is replaced at runtime with a read-only value obtained from the
- * {@link Environment} service.
+ * Defines a field that is replaced at runtime with a read-only value obtained from the {@link Environment} service.
*/
@Target(FIELD)
@Documented
@@ -32,8 +31,8 @@
public @interface Environmental
{
/**
- * The value determines if the environmental service to be injected is required or not. In most
- * cases, it is, so the default is true.
+ * The value determines if the environmental service to be injected is required or not. In most cases, it is, so the
+ * default is true.
*/
boolean value() default true;
}
Added: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java?rev=632791&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java (added)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java Sun Mar 2 09:21:16 2008
@@ -0,0 +1,38 @@
+// Copyright 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.annotations;
+
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.FIELD;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for fields for which accessor methods (getters and setters) should be created. This can help when
+ * defining the kind of placeholder properties often used in components, though the disadvantage is that you can't
+ * access the fields in a unit test, and you may get compiler warnings about unused private variables.
+ */
+@Target(FIELD)
+@Documented
+@Retention(RUNTIME)
+public @interface GenerateAccessors
+{
+ /** Whether to create a readable property (i.e., generate a getter method). */
+ boolean read() default true;
+
+ /** Whether to create a writeable property (i.e., generate a setter method). */
+ boolean write() default true;
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Id.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Id.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Id.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Id.java Sun Mar 2 09:21:16 2008
@@ -24,9 +24,8 @@
import java.lang.annotation.Target;
/**
- * Optional annotation, used with {@link Inject}, which exists to provide the id of an object when
- * it can not be determined by other means (such as from the field name). Currently, this is used
- * when injecting a {@link Block}.
+ * Optional annotation, used with {@link Inject}, which exists to provide the id of an object when it can not be
+ * determined by other means (such as from the field name). Currently, this is used when injecting a {@link Block}.
*/
@Target(FIELD)
@Documented
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeJavaScriptLibrary.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeJavaScriptLibrary.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeJavaScriptLibrary.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeJavaScriptLibrary.java Sun Mar 2 09:21:16 2008
@@ -18,13 +18,13 @@
/**
- * Allows for the inclusion of one or more JavaScript libraries. The libraries are assets, usually
- * (but not always) stored on the classpath with the component.
+ * Allows for the inclusion of one or more JavaScript libraries. The libraries are assets, usually (but not always)
+ * stored on the classpath with the component.
*
* @see org.apache.tapestry.annotations.IncludeStylesheet
* @see org.apache.tapestry.annotations.Path
*/
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface IncludeJavaScriptLibrary
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/IncludeStylesheet.java Sun Mar 2 09:21:16 2008
@@ -19,17 +19,19 @@
/**
* Used to automatically include a CSS stylesheet when rendering the page. The value is an asset reference; relative
- * paths are relative to the Java class, or a "context:" prefix can be used to reference resources in the web application.
+ * paths are relative to the Java class, or a "context:" prefix can be used to reference resources in the web
+ * application.
* <p/>
- * This saves the work of injecting the asset into a field and injecting the PageRenderSupport environmental service, and invoking the method.
+ * This saves the work of injecting the asset into a field and injecting the PageRenderSupport environmental service,
+ * and invoking the method.
* <p/>
- * Does not support setting a media type; if that is required. use {@link org.apache.tapestry.PageRenderSupport#addStylesheetLink(org.apache.tapestry.Asset, String)}
- * directly.
+ * Does not support setting a media type; if that is required. use {@link org.apache.tapestry.PageRenderSupport#addStylesheetLink(org.apache.tapestry.Asset,
+ * String)} directly.
*
* @see org.apache.tapestry.annotations.Path
* @see org.apache.tapestry.annotations.IncludeJavaScriptLibrary
*/
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface IncludeStylesheet
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectContainer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectContainer.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectContainer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectContainer.java Sun Mar 2 09:21:16 2008
@@ -21,8 +21,8 @@
import java.lang.annotation.Target;
/**
- * Used in inject the container of a component as a field of the component. The container of a mixin
- * is the component to which the mixin is attached.
+ * Used in inject the container of a component as a field of the component. The container of a mixin is the component to
+ * which the mixin is attached.
*/
@Target(FIELD)
@Documented
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectPage.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectPage.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectPage.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/InjectPage.java Sun Mar 2 09:21:16 2008
@@ -21,8 +21,7 @@
import java.lang.annotation.Target;
/**
- * Allows a a page (really, the root component of the page) to be injected into another component as
- * a read-only field.
+ * Allows a a page (really, the root component of the page) to be injected into another component as a read-only field.
*/
@Target(FIELD)
@Documented
@@ -30,9 +29,9 @@
public @interface InjectPage
{
/**
- * The name of the page to inject, which is used when the field type is not sufficient to
- * identify the page (for example, when the field type is an interface implemented by the page).
- * A non-blank value here overrides the lookup by class name (from the field type).
+ * The name of the page to inject, which is used when the field type is not sufficient to identify the page (for
+ * example, when the field type is an interface implemented by the page). A non-blank value here overrides the
+ * lookup by class name (from the field type).
*/
String value() default "";
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Meta.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Meta.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Meta.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Meta.java Sun Mar 2 09:21:16 2008
@@ -23,9 +23,9 @@
import java.lang.annotation.Target;
/**
- * Allows for the specification of per-component meta-data. Meta data can later be accessed via
- * {@link ComponentModel#getMeta(String)}. Meta data keys are case insensitive. Meta data defined
- * by a subclass overrides meta data for the super class (where the keys conflict).
+ * Allows for the specification of per-component meta-data. Meta data can later be accessed via {@link
+ * ComponentModel#getMeta(String)}. Meta data keys are case insensitive. Meta data defined by a subclass overrides meta
+ * data for the super class (where the keys conflict).
*/
@Target(TYPE)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixin.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixin.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixin.java Sun Mar 2 09:21:16 2008
@@ -1,17 +1,17 @@
-// Copyright 2006, 2007 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, 2007 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.annotations;
import java.lang.annotation.Documented;
@@ -30,11 +30,10 @@
{
/**
- * Defines the type of mixin, using a logical mixin name. This value takes precedence over the
- * type of field (to which the annotation is attached). In such cases, it is presumed that the
- * field's type is an interface implemented by the actual mixin. The default value (the empty
- * string) directs Tapestry to use the field type as the mixin class to instantiate and attach
- * to the component.
+ * Defines the type of mixin, using a logical mixin name. This value takes precedence over the type of field (to
+ * which the annotation is attached). In such cases, it is presumed that the field's type is an interface
+ * implemented by the actual mixin. The default value (the empty string) directs Tapestry to use the field type as
+ * the mixin class to instantiate and attach to the component.
*/
String value() default "";
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinAfter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinAfter.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinAfter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinAfter.java Sun Mar 2 09:21:16 2008
@@ -22,10 +22,10 @@
import java.lang.annotation.Target;
/**
- * A marker annotation applied to a mixin to indicate that the mixin's render state behavior is
- * deferred until after the the behavior of the component to which the mixin is attached. Normally,
- * mixins occur before the component. This divides each phase in the render state machine into three
- * virtual phases: before the component, the component itself, and after the component.
+ * A marker annotation applied to a mixin to indicate that the mixin's render state behavior is deferred until after the
+ * the behavior of the component to which the mixin is attached. Normally, mixins occur before the component. This
+ * divides each phase in the render state machine into three virtual phases: before the component, the component itself,
+ * and after the component.
*/
@Target(TYPE)
@Documented
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinClasses.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinClasses.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinClasses.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/MixinClasses.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.annotations;
import java.lang.annotation.Documented;
@@ -21,9 +21,8 @@
import java.lang.annotation.Target;
/**
- * Used to attach one or more instance mixins to an embedded component. Each mixin is specified as a
- * specific class. This annotation is only recognized when used in conjuction with the
- * {@link Component} annotation.
+ * Used to attach one or more instance mixins to an embedded component. Each mixin is specified as a specific class.
+ * This annotation is only recognized when used in conjuction with the {@link Component} annotation.
*
* @see Mixins
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixins.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixins.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixins.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Mixins.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.annotations;
import java.lang.annotation.Documented;
@@ -21,9 +21,8 @@
import java.lang.annotation.Target;
/**
- * Used to attach one ore more instance mixin to an embedded component. Each mixin is specified in
- * terms of a logical mixin type name. This annotation is only recognized when used in conjuction
- * with the {@link Component} annotation.
+ * Used to attach one ore more instance mixin to an embedded component. Each mixin is specified in terms of a logical
+ * mixin type name. This annotation is only recognized when used in conjuction with the {@link Component} annotation.
*
* @see MixinClasses
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/OnEvent.java Sun Mar 2 09:21:16 2008
@@ -23,27 +23,25 @@
import java.lang.annotation.Target;
/**
- * Marks a method as a handler for a client side event. The handler method will be invoked when a
- * component triggers an event. Filters on the type of event and on the originating component ensure
- * that only the appropriate methods are invoked.
+ * Marks a method as a handler for a client side event. The handler method will be invoked when a component triggers an
+ * event. Filters on the type of event and on the originating component ensure that only the appropriate methods are
+ * invoked.
* <p/>
- * Client events include a <em>context</em> of one or more values. These context values are
- * included in the action URI. The values are optionally supplied to the handler method as
- * parameters. Automatic {@linkplain org.apache.tapestry.ValueEncoder conversion} from string to the type of the actual parameter occur.
+ * Client events include a <em>context</em> of one or more values. These context values are included in the action URI.
+ * The values are optionally supplied to the handler method as parameters. Automatic {@linkplain
+ * org.apache.tapestry.ValueEncoder conversion} from string to the type of the actual parameter occur.
* <p/>
- * Handlers may return a value. Returning a non-null value will abort the handling of the event, and
- * will usually control the response sent to the client web browser. The details are somewhat
- * specific to the type of event and the component involved.
+ * Handlers may return a value. Returning a non-null value will abort the handling of the event, and will usually
+ * control the response sent to the client web browser. The details are somewhat specific to the type of event and the
+ * component involved.
* <p/>
- * If a handler is not found within the originating component (or no handler aborts the event
- * handling), then handlers within the containing component will be searched. This continues up the
- * page hierarchy. In some cases, having no handlers (or no aborting handlers) is considered
- * acceptible; in others, it is an error. Again, this is defined by the type of originating
- * component, and the type of event.
+ * If a handler is not found within the originating component (or no handler aborts the event handling), then handlers
+ * within the containing component will be searched. This continues up the page hierarchy. In some cases, having no
+ * handlers (or no aborting handlers) is considered acceptible; in others, it is an error. Again, this is defined by the
+ * type of originating component, and the type of event.
* <p/>
- * <strong>If you fail to provide filters on either component or event type, then your method will
- * be invoked for all component events, possibly including events that bubble up from embedded
- * sub-components. </strong>
+ * <strong>If you fail to provide filters on either component or event type, then your method will be invoked for all
+ * component events, possibly including events that bubble up from embedded sub-components. </strong>
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
@@ -52,17 +50,16 @@
{
/**
- * The event type to match. The handler will only be invoked if the client event type matches
- * the value. The default value is "action". Matching is case-insensitive.
+ * The event type to match. The handler will only be invoked if the client event type matches the value. The default
+ * value is "action". Matching is case-insensitive.
*/
String value() default TapestryConstants.ACTION_EVENT;
/**
- * The local id of the component from which the event originates. If not specified, then the
- * default is to match any component. If an event from a component is not handled in the
- * component's container, it is re-triggered inside the component's grand-container and will
- * appear to originate from the container. Thus events that escape a component will appear to
- * originate in the component's container, and so forth.
+ * The local id of the component from which the event originates. If not specified, then the default is to match any
+ * component. If an event from a component is not handled in the component's container, it is re-triggered inside
+ * the component's grand-container and will appear to originate from the container. Thus events that escape a
+ * component will appear to originate in the component's container, and so forth.
* <p/>
* <p/>
* Matching by component id is case insensitive.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageAttached.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageAttached.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageAttached.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageAttached.java Sun Mar 2 09:21:16 2008
@@ -21,12 +21,12 @@
import java.lang.annotation.Target;
/**
- * Method annotation used for methods that should be invoked when the page is first attached to a
- * request. This is useful for initializations that should occur on each request that involves the
- * page. Often, such initializations will be balanced by cleanups when the page is detached.
+ * Method annotation used for methods that should be invoked when the page is first attached to a request. This is
+ * useful for initializations that should occur on each request that involves the page. Often, such initializations will
+ * be balanced by cleanups when the page is detached.
* <p/>
- * PageAttached methods should take no parameters and return void. They must either have this
- * annotation, or be named "pageAttached".
+ * PageAttached methods should take no parameters and return void. They must either have this annotation, or be named
+ * "pageAttached".
*
* @see PageDetached
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageDetached.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageDetached.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageDetached.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageDetached.java Sun Mar 2 09:21:16 2008
@@ -21,11 +21,11 @@
import java.lang.annotation.Target;
/**
- * Method annotation used for methods that should be invoked when the page is detached at the end of
- * a request, before it is returned to the page pool for later reuse.
+ * Method annotation used for methods that should be invoked when the page is detached at the end of a request, before
+ * it is returned to the page pool for later reuse.
* <p/>
- * PageDetached methods should take no parameters and return void. They must either have this
- * annotation, or be named "pageDetached".
+ * PageDetached methods should take no parameters and return void. They must either have this annotation, or be named
+ * "pageDetached".
*
* @see PageAttached
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageLoaded.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageLoaded.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageLoaded.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/PageLoaded.java Sun Mar 2 09:21:16 2008
@@ -21,12 +21,12 @@
import java.lang.annotation.Target;
/**
- * Method annotation used for methods that should be invoked once the page is fully loaded. This is
- * useful for one-time component initializations that can't be done at instantance initialzation
- * time, such as refrerences to embedded components or blocks.
+ * Method annotation used for methods that should be invoked once the page is fully loaded. This is useful for one-time
+ * component initializations that can't be done at instantance initialzation time, such as refrerences to embedded
+ * components or blocks.
* <p/>
- * PageLoaded methods should take no parameters and return void. They must either have this
- * annotation, or be named "pageLoaded".
+ * PageLoaded methods should take no parameters and return void. They must either have this annotation, or be named
+ * "pageLoaded".
*/
@Target(METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Parameter.java Sun Mar 2 09:21:16 2008
@@ -24,8 +24,8 @@
import java.lang.annotation.Target;
/**
- * Annotation placed on a field to indicate that it is, in fact, an parameter. Parameters may be
- * optional or required. Required parameters must be bound.
+ * Annotation placed on a field to indicate that it is, in fact, an parameter. Parameters may be optional or required.
+ * Required parameters must be bound.
*/
@Target(FIELD)
@Documented
@@ -34,48 +34,46 @@
{
/**
- * The name of the parameter. If not specified, the name of the parameter is derived from the
- * name of the field (after stripping off leading punctuation) from the field name.
+ * The name of the parameter. If not specified, the name of the parameter is derived from the name of the field
+ * (after stripping off leading punctuation) from the field name.
*/
String name() default "";
/**
- * If true, the parameter is required and and must be bound. If false (the default), then the
- * parameter is optional.
+ * If true, the parameter is required and and must be bound. If false (the default), then the parameter is
+ * optional.
*/
boolean required() default false;
/**
- * If true (the default), then the value for the parameter is cached while the component is,
- * itself, rendering. Values from invariant bindings (such as literal strings) are always
- * cached, regardless of this setting. Set this attribute to false to force the parameter to be
- * {@link org.apache.tapestry.Binding#get() re-read} every time the field is accessed, even
- * while the component is rendering.
+ * If true (the default), then the value for the parameter is cached while the component is, itself, rendering.
+ * Values from invariant bindings (such as literal strings) are always cached, regardless of this setting. Set this
+ * attribute to false to force the parameter to be {@link org.apache.tapestry.Binding#get() re-read} every time the
+ * field is accessed, even while the component is rendering.
*/
boolean cache() default true;
/**
- * The default value for the parameter if not bound (at not the empty string). This is a binding
- * expression, typically the name of a property of the component to bind.
+ * The default value for the parameter if not bound (at not the empty string). This is a binding expression,
+ * typically the name of a property of the component to bind.
*/
String value() default "";
/**
- * The default binding prefix for the parameter, if no specific binding prefix is provided with
- * the binding. There is <em>rarely</em> a reason to override this. Typically, non-standard
- * default binding prefixes are paired with specific {@link BindingFactory} implementations, and
- * used with parameters whose name reflects the binding prefix.
+ * The default binding prefix for the parameter, if no specific binding prefix is provided with the binding. There
+ * is <em>rarely</em> a reason to override this. Typically, non-standard default binding prefixes are paired with
+ * specific {@link BindingFactory} implementations, and used with parameters whose name reflects the binding
+ * prefix.
*/
String defaultPrefix() default TapestryConstants.PROP_BINDING_PREFIX;
/**
- * Used to mark a parameter as requiring earlier initialization than other parameters. This is
- * used when default bindings for secondary parameters rely on a principal parameter, which
- * itself may have a default value. This ensures that the binding for the principal parameter(s)
- * are initialized, possibly involving a defaulter method, before the secondary parameters are
- * initialized (as they may need to know if the principal parameter is bound, and what type of
- * value it is bound to). This is rarely used, and it is highly unlikely a single component
- * would have more than a single principal parameter.
+ * Used to mark a parameter as requiring earlier initialization than other parameters. This is used when default
+ * bindings for secondary parameters rely on a principal parameter, which itself may have a default value. This
+ * ensures that the binding for the principal parameter(s) are initialized, possibly involving a defaulter method,
+ * before the secondary parameters are initialized (as they may need to know if the principal parameter is bound,
+ * and what type of value it is bound to). This is rarely used, and it is highly unlikely a single component would
+ * have more than a single principal parameter.
*/
boolean principal() default false;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Path.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Path.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Path.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Path.java Sun Mar 2 09:21:16 2008
@@ -25,19 +25,17 @@
import java.lang.annotation.Target;
/**
- * Used in conjunction with the {@link Inject} annotation to inject an {@link Asset} based on a
- * path.
+ * Used in conjunction with the {@link Inject} annotation to inject an {@link Asset} based on a path.
*/
@Target(
- {FIELD, PARAMETER})
+ { FIELD, PARAMETER })
@Documented
@Retention(RUNTIME)
public @interface Path
{
/**
- * The path to the resource; if prefixed (say with "classpath:") then its a complete path within
- * the identified namespace; otherwise it's a relative path from the class containing the
- * annotation. Symbols will be expanded.
+ * The path to the resource; if prefixed (say with "classpath:") then its a complete path within the identified
+ * namespace; otherwise it's a relative path from the class containing the annotation. Symbols will be expanded.
*/
String value();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Persist.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Persist.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Persist.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Persist.java Sun Mar 2 09:21:16 2008
@@ -24,18 +24,17 @@
import java.lang.annotation.Target;
/**
- * Identifies a field as persistent, meaning its value persists from one request to the next.
- * Different strategies exist for how this is accomplished, the most common being the default,
- * "session", which stores the field's value in the {@link Session}.
+ * Identifies a field as persistent, meaning its value persists from one request to the next. Different strategies exist
+ * for how this is accomplished, the most common being the default, "session", which stores the field's value in the
+ * {@link Session}.
* <p/>
- * In most cases, the value will be omitted and will default to the empty string. This forces a
- * search for the correct strategy. Starting with the component (or mixin) itself, a check is made
- * for the {@link Meta meta data property} <code>tapestry.persistence-strategy</code>. If a value
- * is found, it is used, otherwise the search continues up the inheritance hierarchy, towards the
- * page. If not found, then the "session" strategy is used.
+ * In most cases, the value will be omitted and will default to the empty string. This forces a search for the correct
+ * strategy. Starting with the component (or mixin) itself, a check is made for the {@link Meta meta data property}
+ * <code>tapestry.persistence-strategy</code>. If a value is found, it is used, otherwise the search continues up the
+ * inheritance hierarchy, towards the page. If not found, then the "session" strategy is used.
* <p/>
- * In this way, the session persistence strategy for a component and all of its sub-components can
- * be controlled by the containing component.
+ * In this way, the session persistence strategy for a component and all of its sub-components can be controlled by the
+ * containing component.
*
* @see MetaDataLocator
*/
@@ -46,8 +45,8 @@
{
/**
- * The strategy used to persist the value. The default value, the empty string, allows
- * persistence to be decided by the containing component and component hierarchy.
+ * The strategy used to persist the value. The default value, the empty string, allows persistence to be decided by
+ * the containing component and component hierarchy.
*/
String value() default "";
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/ResponseEncoding.java Sun Mar 2 09:21:16 2008
@@ -24,7 +24,7 @@
*
* @see org.apache.tapestry.annotations.ContentType
*/
-@Target({ElementType.TYPE})
+@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface ResponseEncoding
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Retain.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Retain.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Retain.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Retain.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.annotations;
import java.lang.annotation.Documented;
@@ -21,17 +21,15 @@
import java.lang.annotation.Target;
/**
- * Marker annotation placed on fields whose value should be retained past the end of the request.
- * This is most often associated with fields that are <em>lazily loaded</em>. By marking such
- * fields with the Retain annotation, the fields will <em>not</em> be discarded at the end of the
- * request.
+ * Marker annotation placed on fields whose value should be retained past the end of the request. This is most often
+ * associated with fields that are <em>lazily loaded</em>. By marking such fields with the Retain annotation, the fields
+ * will <em>not</em> be discarded at the end of the request.
* <p/>
- * This is quite different from {@link Persist}, because the value that's allowed to be retained is
- * not stored persistently; it is simply not cleared out. A subsequent request, even from the same
- * user, may be processed by a different instance of the page where the value is still null.
+ * This is quite different from {@link Persist}, because the value that's allowed to be retained is not stored
+ * persistently; it is simply not cleared out. A subsequent request, even from the same user, may be processed by a
+ * different instance of the page where the value is still null.
* <p/>
- * This annotation should only be used with lazily-evaluated objects that contain no client-specific
- * information.
+ * This annotation should only be used with lazily-evaluated objects that contain no client-specific information.
*/
@Target(FIELD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Service.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Service.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Service.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Service.java Sun Mar 2 09:21:16 2008
@@ -24,12 +24,12 @@
import java.lang.annotation.Target;
/**
- * Used in conjunction with the {@link Inject} annotation to identify a service <em>by name</em>
- * and not by type. This is most useful when there are multiple services with the same service
- * interface and a particular one needs to be selected.
+ * Used in conjunction with the {@link Inject} annotation to identify a service <em>by name</em> and not by type. This
+ * is most useful when there are multiple services with the same service interface and a particular one needs to be
+ * selected.
*/
@Target(
- {FIELD, PARAMETER})
+ { FIELD, PARAMETER })
@Documented
@Retention(RUNTIME)
public @interface Service
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SetupRender.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SetupRender.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SetupRender.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SetupRender.java Sun Mar 2 09:21:16 2008
@@ -21,11 +21,10 @@
import java.lang.annotation.Target;
/**
- * Marker annotation for methods that should be executed during the SetupRender phase. Such methods
- * may optionally take a {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or
- * boolean. Returning true or void will advance to the
- * {@link org.apache.tapestry.annotations.BeginRender} phase. Return false to skip the BeginRender
- * phase and procede directly to the {@link org.apache.tapestry.annotations.CleanupRender} phase.
+ * Marker annotation for methods that should be executed during the SetupRender phase. Such methods may optionally take
+ * a {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or boolean. Returning true or void will
+ * advance to the {@link org.apache.tapestry.annotations.BeginRender} phase. Return false to skip the BeginRender phase
+ * and procede directly to the {@link org.apache.tapestry.annotations.CleanupRender} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SupportsInformalParameters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SupportsInformalParameters.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SupportsInformalParameters.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/SupportsInformalParameters.java Sun Mar 2 09:21:16 2008
@@ -24,8 +24,8 @@
import java.lang.annotation.Target;
/**
- * Used to identify a component that can support informal parameters. By default, components do not
- * support informal parameters.
+ * Used to identify a component that can support informal parameters. By default, components do not support informal
+ * parameters.
*
* @see ComponentModel#getSupportsInformalParameters()
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java?rev=632791&r1=632790&r2=632791&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java Sun Mar 2 09:21:16 2008
@@ -16,6 +16,7 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry.annotations.GenerateAccessors;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.beaneditor.BeanModel;
@@ -42,6 +43,7 @@
* component's id will be used.
*/
@Parameter(required = true)
+ @GenerateAccessors(write = false)
private Object _object;
/**
@@ -56,6 +58,7 @@
* a default bean model will be created from the type of the object bound to the object parameter.
*/
@Parameter
+ @GenerateAccessors(write = false)
private BeanModel _model;
/**
@@ -80,6 +83,7 @@
* searched.
*/
@Parameter(value = "componentResources")
+ @GenerateAccessors(write = false)
private ComponentResources _overrides;
@Inject
@@ -91,6 +95,7 @@
@Inject
private BeanModelSource _modelSource;
+ @GenerateAccessors
private String _propertyName;
/**
@@ -100,12 +105,7 @@
{
return _defaultProvider.defaultBinding("object", _resources);
}
-
- public Object getObject()
- {
- return _object;
- }
-
+
void setupRender()
{
if (_model == null) _model = _modelSource.create(_object.getClass(), false, _overrides
@@ -116,32 +116,12 @@
if (_reorder != null) BeanModelUtils.reorder(_model, _reorder);
}
- public BeanModel getModel()
- {
- return _model;
- }
-
- public String getPropertyName()
- {
- return _propertyName;
- }
-
- public void setPropertyName(String propertyName)
- {
- _propertyName = propertyName;
- }
-
/**
* Returns the property model for the current property.
*/
public PropertyModel getPropertyModel()
{
return _model.get(_propertyName);
- }
-
- public ComponentResources getOverrides()
- {
- return _overrides;
}
public String getLabelClass()