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 2007/11/12 23:23:28 UTC
svn commit: r594319 [4/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/org...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/BeanModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/BeanModel.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/BeanModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/BeanModel.java Mon Nov 12 14:22:31 2007
@@ -14,22 +14,24 @@
package org.apache.tapestry.beaneditor;
-import java.util.List;
-
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.services.BeanModelSource;
+import java.util.List;
+
/**
* Provides the information necessary to build a user interface to view, create or edit an instance
* of a particular type.
- * <p>
+ * <p/>
* BeanModels are not thread-safe, they are also not serializable.
- *
+ *
* @see BeanModelSource
*/
public interface BeanModel
{
- /** Returns the type of bean for which this model was initially created. */
+ /**
+ * Returns the type of bean for which this model was initially created.
+ */
Class getBeanType();
/**
@@ -39,83 +41,66 @@
/**
* Returns the named model.
- *
- * @param propertyName
- * name of property to retrieve model for (case is ignored)
+ *
+ * @param propertyName name of property to retrieve model for (case is ignored)
* @return the model for the property
- * @throws RuntimeException
- * if the bean editor model does not have a property model for the provided name
+ * @throws RuntimeException if the bean editor model does not have a property model for the provided name
*/
PropertyModel get(String propertyName);
/**
* Adds a new property to the model, returning its mutable model for further refinement. The
* property is added to the <em>end</em> of the list of properties.
- *
- * @param propertyName
- * name of property to add
+ *
+ * @param propertyName name of property to add
* @return the new property model (for further configuration)
- * @throws RuntimeException
- * if the property already exists
+ * @throws RuntimeException if the property already exists
*/
PropertyModel add(String propertyName);
/**
* Adds a new property to the model, ordered before or after an existing property.
- *
- * @param position
- * controls whether the new property is ordered before or after the existing property
- * @param existingPropertyName
- * the name of an existing property (this must exist)
- * @param propertyName
- * the new property to add
- * @throws RuntimeException
- * if the existing property does not exist, or if the new property already does
- * exist
+ *
+ * @param position controls whether the new property is ordered before or after the existing property
+ * @param existingPropertyName the name of an existing property (this must exist)
+ * @param propertyName the new property to add
* @return the new property model (for further configuration)
+ * @throws RuntimeException if the existing property does not exist, or if the new property already does
+ * exist
*/
PropertyModel add(RelativePosition position, String existingPropertyName, String propertyName);
/**
* Adds a new property to the model, ordered before or after an existing property.
- *
- * @param position
- * controls whether the new property is ordered before or after the existing property
- * @param existingPropertyName
- * the name of an existing property (this must exist)
- * @param propertyName
- * the new property to add
- * @param conduit
- * conduit used to read or update the property; this may be null for a synthetic or
- * placeholder property
- * @throws RuntimeException
- * if the existing property does not exist, or if the new property already does
- * exist
+ *
+ * @param position controls whether the new property is ordered before or after the existing property
+ * @param existingPropertyName the name of an existing property (this must exist)
+ * @param propertyName the new property to add
+ * @param conduit conduit used to read or update the property; this may be null for a synthetic or
+ * placeholder property
* @return the new property model (for further configuration)
+ * @throws RuntimeException if the existing property does not exist, or if the new property already does
+ * exist
*/
PropertyModel add(RelativePosition position, String existingPropertyName, String propertyName,
- PropertyConduit conduit);
+ PropertyConduit conduit);
/**
* Adds a new property to the model, returning its mutable model for further refinement.
- *
- * @param propertyName
- * name of property to add
- * @param conduit
- * the conduit used to read or update the property; this may be null for a synthetic
- * or placeholder property
+ *
+ * @param propertyName name of property to add
+ * @param conduit the conduit used to read or update the property; this may be null for a synthetic
+ * or placeholder property
* @return the model for the property
- * @throws RuntimeException
- * if the property already exists
+ * @throws RuntimeException if the property already exists
*/
PropertyModel add(String propertyName, PropertyConduit conduit);
/**
* Removes the named properties from the model, if present. It is not considered an error to
* remove a property that does not exist.
- *
- * @param propertyName
- * the names of properties to be removed (case insensitive)
+ *
+ * @param propertyName the names of properties to be removed (case insensitive)
* @return the model for further modifications
*/
BeanModel remove(String... propertyName);
@@ -123,9 +108,8 @@
/**
* Re-orders the properties of the model into the specified order. Existing properties that are
* not indicated are retained, but ordered to the end of the list.
- *
- * @param propertyName
- * property names in order they should be displayed (case insensitive)
+ *
+ * @param propertyName property names in order they should be displayed (case insensitive)
* @return the model for further modifications
*/
BeanModel reorder(String... propertyName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java Mon Nov 12 14:22:31 2007
@@ -21,7 +21,9 @@
*/
public interface PropertyModel
{
- /** Returns the name of the property (which may, in fact, be a property expression). */
+ /**
+ * Returns the name of the property (which may, in fact, be a property expression).
+ */
String getPropertyName();
/**
@@ -30,10 +32,14 @@
*/
String getId();
- /** Returns a user-presentable label for the property. */
+ /**
+ * Returns a user-presentable label for the property.
+ */
String getLabel();
- /** Returns the type of the property. */
+ /**
+ * Returns the type of the property.
+ */
Class getPropertyType();
/**
@@ -44,7 +50,7 @@
/**
* Changes the data type for the property.
- *
+ *
* @param dataType
* @return the property edit model, for further changes
*/
@@ -59,14 +65,15 @@
/**
* Changes the label for the property to the provided value.
- *
- * @param label
- * new label for property
+ *
+ * @param label new label for property
* @return the property edit model, for further changes
*/
PropertyModel label(String label);
- /** Returns the containing model, often used for "fluent" construction of the model. */
+ /**
+ * Returns the containing model, often used for "fluent" construction of the model.
+ */
BeanModel model();
/**
@@ -75,6 +82,8 @@
*/
boolean isSortable();
- /** Updates sortable and returns the model for further changes. */
+ /**
+ * Updates sortable and returns the model for further changes.
+ */
PropertyModel sortable(boolean sortable);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java Mon Nov 12 14:22:31 2007
@@ -14,25 +14,8 @@
package org.apache.tapestry.corelib.base;
-import java.io.Serializable;
-
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.ValidationDecorator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.annotations.AfterRender;
-import org.apache.tapestry.annotations.BeginRender;
-import org.apache.tapestry.annotations.Environmental;
-import org.apache.tapestry.annotations.Mixin;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.SetupRender;
-import org.apache.tapestry.annotations.SupportsInformalParameters;
+import org.apache.tapestry.*;
+import org.apache.tapestry.annotations.*;
import org.apache.tapestry.corelib.mixins.DiscardBody;
import org.apache.tapestry.corelib.mixins.RenderDisabled;
import org.apache.tapestry.corelib.mixins.RenderInformals;
@@ -40,6 +23,8 @@
import org.apache.tapestry.services.ComponentDefaultProvider;
import org.apache.tapestry.services.FormSupport;
+import java.io.Serializable;
+
/**
* Provides initialization of the clientId and elementName properties. In addition, adds the
* {@link RenderInformals}, {@link RenderDisabled} and {@link DiscardBody} mixins.
@@ -114,7 +99,9 @@
}
}
- /** Used a shared instance for all types of fields, for efficiency. */
+ /**
+ * Used a shared instance for all types of fields, for efficiency.
+ */
private static final ProcessSubmissionAction PROCESS_SUBMISSION_ACTION = new ProcessSubmissionAction();
/**
@@ -202,7 +189,7 @@
/**
* Used by subclasses to create a default binding to a property of the container matching the
* component id.
- *
+ *
* @return a binding to the property, or null if the container does not have a corresponding
* property
*/
@@ -215,17 +202,17 @@
* Method implemented by subclasses to actually do the work of processing the submission of the
* form. The element's elementName property will already have been set. This method is only
* invoked if the field is <strong>not {@link #isDisabled() disabled}</strong>.
- *
- * @param formSupport
- * support for the form submission, used to
- * {@link FormSupport#getParameterValue(String) obtain submitted parameter values}.
- * Passing this value in saves subclasses from having to (re)inject it.
- * @param elementName
- * the name of the element (used to find the correct parameter in the request)
+ *
+ * @param formSupport support for the form submission, used to
+ * {@link FormSupport#getParameterValue(String) obtain submitted parameter values}.
+ * Passing this value in saves subclasses from having to (re)inject it.
+ * @param elementName the name of the element (used to find the correct parameter in the request)
*/
protected abstract void processSubmission(FormSupport formSupport, String elementName);
- /** Allows the validation decorator to write markup before the field itself writes markup. */
+ /**
+ * Allows the validation decorator to write markup before the field itself writes markup.
+ */
@BeginRender
final void beforeDecorator(MarkupWriter writer)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractPropertyOutput.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractPropertyOutput.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractPropertyOutput.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractPropertyOutput.java Mon Nov 12 14:22:31 2007
@@ -30,16 +30,18 @@
* relationship between such a component and its container, as the container may provide messages in
* its message catalog needed by the {@link Block}s that render the values. In addition, the
* component may be passed Block parameters that are output overrides for specified properties.
- * <p>
+ * <p/>
* Subclasses will implement a <code>beginRender()</code> method that invokes
* {@link #renderPropertyValue(MarkupWriter, String)}.
- *
+ *
* @see BeanBlockSource
*/
public class AbstractPropertyOutput
{
- /** Model for property displayed by the cell. */
+ /**
+ * Model for property displayed by the cell.
+ */
@Parameter(required = true)
private PropertyModel _model;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java Mon Nov 12 14:22:31 2007
@@ -14,26 +14,16 @@
package org.apache.tapestry.corelib.base;
-import java.util.Locale;
-
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ValidationTracker;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.AfterRender;
import org.apache.tapestry.annotations.BeginRender;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.TranslatorDefaultSource;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry.services.*;
+
+import java.util.Locale;
/**
* Abstract class for a variety of components that render some variation of a text field. Most of
@@ -152,16 +142,14 @@
* <input>). The {@link AbstractField#getElementName() elementName} and
* {@link AbstractField#getClientId() clientId} properties will already have been set or
* updated.
- * <p>
+ * <p/>
* Generally, the subclass will invoke {@link MarkupWriter#element(String, Object[])}, and will
* be responsible for including an {@link AfterRender} phase method to invoke
* {@link MarkupWriter#end()}.
- *
- * @param writer
- * markup write to send output to
- * @param value
- * the value (either obtained and translated from the value parameter, or obtained
- * from the tracker)
+ *
+ * @param writer markup write to send output to
+ * @param value the value (either obtained and translated from the value parameter, or obtained
+ * from the tracker)
*/
protected abstract void writeFieldTag(MarkupWriter writer, String value);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ActionLink.java Mon Nov 12 14:22:31 2007
@@ -14,19 +14,14 @@
package org.apache.tapestry.corelib.components;
+import org.apache.tapestry.*;
import static org.apache.tapestry.TapestryConstants.ACTION_EVENT;
-
-import java.util.List;
-
-import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.ioc.annotations.Inject;
+
+import java.util.List;
/**
* Component that triggers an action on the server with a subsequent full page refresh.
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=594319&r1=594318&r2=594319&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 Mon Nov 12 14:22:31 2007
@@ -122,7 +122,9 @@
_propertyName = propertyName;
}
- /** Returns the property model for the current property. */
+ /**
+ * Returns the property model for the current property.
+ */
public PropertyModel getPropertyModel()
{
return _model.get(_propertyName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,7 @@
package org.apache.tapestry.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FormValidationControl;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
@@ -36,15 +32,15 @@
* UI for editing the properties of a JavaBean, with the flavor of UI for each property (text field,
* checkbox, drop down list) determined from the property type, and the order and validation for the
* properties determined from annotations on the property's getter and setter methods.
- * <p>
+ * <p/>
* You may add <t:parameter>s to the component; when the name matches (case insensitive) the
* name of a property, then the corresponding Block is renderered, rather than any of the built in
* property editor blocks. This allows you to override specific properties with your own customized
* UI, for cases where the default UI is insufficient, or no built-in editor type is appropriate.
- * <p>
+ * <p/>
* This component is likely to change more than any other thing in Tapestry! What's available now is
* a very limited preview of its eventual functionality.
- *
+ *
* @see BeanModel
* @see BeanModelSource
* @see PropertyEditor
@@ -52,7 +48,9 @@
@SupportsInformalParameters
public class BeanEditForm implements ClientElement, FormValidationControl
{
- /** The text label for the submit button of the form, by default "Create/Update". */
+ /**
+ * The text label for the submit button of the form, by default "Create/Update".
+ */
@Parameter(value = "message:submit-label", defaultPrefix = "literal")
private String _submitLabel;
@@ -83,7 +81,9 @@
@Parameter(defaultPrefix = "literal")
private String _reorder;
- /** If true, the default, then the embedded Form component will use client-side validation. */
+ /**
+ * If true, the default, then the embedded Form component will use client-side validation.
+ */
@SuppressWarnings("unused")
@Parameter
private boolean _clientValidation;
@@ -148,7 +148,9 @@
return _object;
}
- /** Returns the client id of the embedded form. */
+ /**
+ * Returns the client id of the embedded form.
+ */
public String getClientId()
{
return _form.getClientId();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java Mon Nov 12 14:22:31 2007
@@ -43,7 +43,9 @@
{
component.doPrepare();
}
- };
+ }
+
+ ;
/**
* The object to be edited by the BeanEditor. This will be read when the component renders and
@@ -120,7 +122,9 @@
_propertyName = propertyName;
}
- /** Returns the object being edited. */
+ /**
+ * Returns the object being edited.
+ */
public Object getObject()
{
return _object;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java Mon Nov 12 14:22:31 2007
@@ -25,7 +25,9 @@
import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Request;
-/** A Checkbox component is simply a <input type="checkbox">. */
+/**
+ * A Checkbox component is simply a <input type="checkbox">.
+ */
public class Checkbox extends AbstractField
{
@Inject
@@ -51,11 +53,11 @@
{
writer.element("input", "type", "checkbox",
- "name", getElementName(),
+ "name", getElementName(),
- "id", getClientId(),
+ "id", getClientId(),
- "checked", _value ? "checked" : null);
+ "checked", _value ? "checked" : null);
_resources.renderInformalParameters(writer);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,7 @@
package org.apache.tapestry.corelib.components;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.ValidationTracker;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.Path;
@@ -39,6 +28,11 @@
import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Request;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
/**
* A component used to collect a provided date from the user. This is a wrapper around the LGPL <a
* href="http://www.dynarch.com/projects/calendar/">dynarch.com DHTML/JavaScript Calendar</a>.
@@ -153,11 +147,11 @@
writer.element("input", "type", "text",
- "name", getElementName(),
+ "name", getElementName(),
- "id", clientId,
+ "id", clientId,
- "value", value);
+ "value", value);
_validate.render(writer);
@@ -171,15 +165,15 @@
writer.element("button",
- "class", "t-calendar-trigger",
+ "class", "t-calendar-trigger",
- "id", triggerId);
+ "id", triggerId);
writer.element("img",
- "src", _defaultIcon.toClientURL(),
+ "src", _defaultIcon.toClientURL(),
- "alt", "[Show]");
+ "alt", "[Show]");
writer.end(); // img
writer.end(); // button
@@ -205,9 +199,8 @@
* Calendar.setup() function. The values inputField, ifFormat and button are pre-configured.
* Subclasses may override this method to configure additional features of the client-side
* Calendar. This implementation does nothing.
- *
- * @param setup
- * parameters object
+ *
+ * @param setup parameters object
*/
protected void configure(JSONObject setup)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Errors.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.corelib.components;
-import java.util.List;
-
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.ValidationTracker;
import org.apache.tapestry.annotations.Environmental;
@@ -24,6 +22,8 @@
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.services.FormSupport;
+import java.util.List;
+
/**
* Standard validation error presenter. Must be enclosed by a {@link Form} component. If errors are
* present, renders a div element around a banner message and around an unnumbered list of error
@@ -38,7 +38,9 @@
@Parameter("message:default-banner")
private String _banner;
- /** The CSS class for the div element rendered by the component. The default value is "t-error". */
+ /**
+ * The CSS class for the div element rendered by the component. The default value is "t-error".
+ */
@Parameter
private String _class = InternalConstants.TAPESTRY_ERROR_CLASS;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java Mon Nov 12 14:22:31 2007
@@ -14,25 +14,7 @@
package org.apache.tapestry.corelib.components;
-import static java.lang.String.format;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.util.List;
-
-import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.ComponentEventHandler;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FormValidationControl;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.TapestryConstants;
-import org.apache.tapestry.ValidationTracker;
-import org.apache.tapestry.ValidationTrackerImpl;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Mixin;
import org.apache.tapestry.annotations.Parameter;
@@ -48,28 +30,28 @@
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ActionResponseGenerator;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.services.ComponentSource;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Heartbeat;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry.services.*;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import static java.lang.String.format;
+import java.util.List;
/**
* An HTML form, which will enclose other components to render out the various types of fields.
- * <p>
+ * <p/>
* A Form emits several notification events; when it renders it sends a {@link #PREPARE prepare}
* notification event, to allow any listeners to set up the state of the page prior to rendering out
* the form's content.
- * <p>
+ * <p/>
* When the form is submitted, the component emits four notifications: first another prepare event
* to allow the page to update its state as necessary to prepare for the form submission, then
* (after components enclosed by the form have operated), a "validate" event is emitted, to allow
* for cross-form validation. After that, either a "success" or "failure" event (depending on
* whether the {@link ValidationTracker} has recorded any errors). Lastly, a "submit" event, for any
* listeners that care only about form submission, regardless of success or failure.
- * <p>
+ * <p/>
* For all of these notifications, the event context is derived from the <strong>context</strong>
* parameter. This context is encoded into the form's action URI (the parameter is not read when the
* form is submitted, instead the values encoded into the form are used).
@@ -307,7 +289,7 @@
ComponentEventHandler handler = new ComponentEventHandler()
{
public boolean handleResult(Object result, Component component,
- String methodDescription)
+ String methodDescription)
{
if (result instanceof Boolean) return ((Boolean) result);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java Mon Nov 12 14:22:31 2007
@@ -18,11 +18,7 @@
import org.apache.tapestry.Block;
import org.apache.tapestry.ComponentAction;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.Environmental;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.SupportsInformalParameters;
+import org.apache.tapestry.annotations.*;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.beaneditor.PropertyModel;
import org.apache.tapestry.corelib.data.GridPagerPosition;
@@ -39,13 +35,13 @@
* A grid presents tabular data. It is a composite component, created in terms of several
* sub-components. The sub-components are statically wired to the Grid, as it provides access to the
* data and other models that they need.
- * <p>
+ * <p/>
* A Grid may operate inside a {@link Form}. By overriding the cell renderers of properties, the
* default output only behavior can be changed to produce a complex form with individual control for
* editing properties of each row. This is currently workable but less than ideal -- if the order of
* rows provided by the {@link GridDataSource} changes between render and form submission, then
* there's the possibility that data will be applied to the wrong server-side objects.
- *
+ *
* @see BeanModel
* @see BeanModelSource
*/
@@ -149,17 +145,17 @@
@SuppressWarnings("unused")
@Component(parameters =
- { "sortColumnId=sortColumnId", "sortAscending=sortAscending" })
+ {"sortColumnId=sortColumnId", "sortAscending=sortAscending"})
private GridColumns _columns;
@SuppressWarnings("unused")
@Component(parameters =
- { "rowClass=rowClass", "rowsPerPage=rowsPerPage", "currentPage=currentPage", "row=row",
- "volatile=inherit:volatile" })
+ {"rowClass=rowClass", "rowsPerPage=rowsPerPage", "currentPage=currentPage", "row=row",
+ "volatile=inherit:volatile"})
private GridRows _rows;
@Component(parameters =
- { "source=dataSource", "rowsPerPage=rowsPerPage", "currentPage=currentPage" })
+ {"source=dataSource", "rowsPerPage=rowsPerPage", "currentPage=currentPage"})
private GridPager _pager;
@SuppressWarnings("unused")
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.corelib.components;
-import java.util.List;
-
import org.apache.tapestry.Asset;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.Parameter;
@@ -25,6 +23,8 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.annotations.Inject;
+import java.util.List;
+
/**
* Renders out the column headers for the grid. Eventually, this will include control over column
* sorting, perhaps even column ordering.
@@ -48,13 +48,15 @@
@Parameter(required = true)
private String _sortColumnId;
- /** If true, then the sort is ascending (A - Z), if false the descending (Z - A). */
+ /**
+ * If true, then the sort is ascending (A - Z), if false the descending (Z - A).
+ */
@Parameter(required = true)
private boolean _sortAscending;
@SuppressWarnings("unused")
@Component(parameters =
- { "disabled=sortDisabled", "context=columnModel.id", "class=sortLinkClass" })
+ {"disabled=sortDisabled", "context=columnModel.id", "class=sortLinkClass"})
private ActionLink _sort, _sort2;
@Inject
@@ -118,7 +120,7 @@
public String getIconLabel()
{
String key = isActiveSortColumn() ? (_sortAscending ? "ascending" : "descending")
- : "sortable";
+ : "sortable";
return _messages.get(key);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridPager.java Mon Nov 12 14:22:31 2007
@@ -36,11 +36,15 @@
@Parameter(required = true)
private GridDataSource _source;
- /** The number of rows displayed per page. */
+ /**
+ * The number of rows displayed per page.
+ */
@Parameter(required = true)
private int _rowsPerPage;
- /** The current page number (indexed from 1). */
+ /**
+ * The current page number (indexed from 1).
+ */
@Parameter(required = true)
private int _currentPage;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.corelib.components;
-import java.util.List;
-
import org.apache.tapestry.ComponentAction;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
@@ -24,9 +22,11 @@
import org.apache.tapestry.grid.GridModelProvider;
import org.apache.tapestry.services.FormSupport;
+import java.util.List;
+
/**
* Renders out a series of rows within the table.
- * <p>
+ * <p/>
* Inside a {@link Form}, a series of row index numbers are stored into the form (
* {@linkplain FormSupport#store(Object, ComponentAction) as ComponentActions}). This is not ideal
* ... in a situation where the data set can shift between the form render and the form submission,
@@ -49,7 +49,9 @@
{
component.setupForRow(_rowIndex);
}
- };
+ }
+
+ ;
/**
* Parameter used to set the CSS class for each row (each <tr> element) within the
@@ -58,15 +60,21 @@
@Parameter(cache = false)
private String _rowClass;
- /** Object that provides access to the bean and data models used to render the Grid. */
+ /**
+ * Object that provides access to the bean and data models used to render the Grid.
+ */
@Parameter(value = "componentResources.container")
private GridModelProvider _provider;
- /** Number of rows displayed on each page. Long result sets are split across multiple pages. */
+ /**
+ * Number of rows displayed on each page. Long result sets are split across multiple pages.
+ */
@Parameter(required = true)
private int _rowsPerPage;
- /** The current page number within the available pages (indexed from 1). */
+ /**
+ * The current page number within the available pages (indexed from 1).
+ */
@Parameter(required = true)
private int _currentPage;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/If.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/If.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/If.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/If.java Mon Nov 12 14:22:31 2007
@@ -22,7 +22,9 @@
*/
public class If
{
- /** If true, then the body of the If component is rendered. If false, the body is omitted. */
+ /**
+ * If true, then the body of the If component is rendered. If false, the body is omitted.
+ */
@Parameter(required = true)
private boolean _test;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Label.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Label.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Label.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Label.java Mon Nov 12 14:22:31 2007
@@ -18,17 +18,14 @@
import org.apache.tapestry.Field;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.ValidationDecorator;
-import org.apache.tapestry.annotations.AfterRender;
-import org.apache.tapestry.annotations.BeforeRenderBody;
-import org.apache.tapestry.annotations.BeginRender;
-import org.apache.tapestry.annotations.Environmental;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.SupportsInformalParameters;
+import org.apache.tapestry.annotations.*;
import org.apache.tapestry.dom.Element;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.services.Heartbeat;
-/** Generates a <label> element for a particular field. */
+/**
+ * Generates a <label> element for a particular field.
+ */
@SupportsInformalParameters
public class Label
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java Mon Nov 12 14:22:31 2007
@@ -14,26 +14,20 @@
package org.apache.tapestry.corelib.components;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.io.Serializable;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.tapestry.ComponentAction;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.PrimaryKeyEncoder;
-import org.apache.tapestry.annotations.AfterRender;
-import org.apache.tapestry.annotations.BeginRender;
-import org.apache.tapestry.annotations.Environmental;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.SetupRender;
-import org.apache.tapestry.annotations.SupportsInformalParameters;
+import org.apache.tapestry.annotations.*;
import org.apache.tapestry.ioc.annotations.Inject;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Heartbeat;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
+
/**
* Basic looping class; loops over a number of items (provided by its source parameter), rendering
* its body for each one. It turns out that gettting the component to <em>not</em> store its state
@@ -45,7 +39,9 @@
@SupportsInformalParameters
public class Loop
{
- /** Setup command for non-volatile rendering. */
+ /**
+ * Setup command for non-volatile rendering.
+ */
private static final ComponentAction<Loop> RESET_INDEX = new ComponentAction<Loop>()
{
private static final long serialVersionUID = 6477493424977597345L;
@@ -67,7 +63,9 @@
public void execute(Loop component)
{
component.setupForVolatile();
- };
+ }
+
+ ;
};
/**
@@ -96,7 +94,9 @@
public void execute(Loop component)
{
component.endHeartbeat();
- };
+ }
+
+ ;
};
/**
@@ -118,7 +118,9 @@
{
component.restoreState(_storedValue);
}
- };
+ }
+
+ ;
/**
* Restores the value using a stored primary key via
@@ -139,7 +141,9 @@
{
component.restoreStateViaEncodedPrimaryKey(_primaryKey);
}
- };
+ }
+
+ ;
/**
* Stores a list of keys to be passed to {@link PrimaryKeyEncoder#prepareForKeys(List)}.
@@ -148,7 +152,9 @@
{
private static final long serialVersionUID = -6515255627142956828L;
- /** The variable is final, the contents are mutable while the Loop renders. */
+ /**
+ * The variable is final, the contents are mutable while the Loop renders.
+ */
private final List<Serializable> _keys;
public PrepareForKeys(final List<Serializable> keys)
@@ -160,7 +166,9 @@
{
component.prepareForKeys(_keys);
}
- };
+ }
+
+ ;
/**
* Defines the collection of values for the loop to iterate over.
@@ -271,7 +279,9 @@
startHeartbeat();
}
- /** Begins a new heartbeat. */
+ /**
+ * Begins a new heartbeat.
+ */
@BeginRender
void begin()
{
@@ -314,7 +324,9 @@
if (_elementName != null) writer.end();
}
- /** Ends the current heartbeat. */
+ /**
+ * Ends the current heartbeat.
+ */
@AfterRender
boolean after()
{
@@ -337,7 +349,9 @@
_index = 0;
}
- /** Restores state previously stored by the Loop into a Form. */
+ /**
+ * Restores state previously stored by the Loop into a Form.
+ */
private void restoreState(Object storedValue)
{
_value = storedValue;
@@ -345,7 +359,9 @@
startHeartbeat();
}
- /** Restores state previously encoded by the Loop and stored into the Form. */
+ /**
+ * Restores state previously encoded by the Loop and stored into the Form.
+ */
private void restoreStateViaEncodedPrimaryKey(Serializable primaryKey)
{
// We assume that if a encoder is available when we rendered, that one will be available
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Output.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Output.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Output.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Output.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.corelib.components;
-import java.text.Format;
-
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
@@ -25,6 +23,8 @@
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.ComponentDefaultProvider;
+import java.text.Format;
+
/**
* A component for formatting output. If the component is represented in the template using an
* element, then the element (plus any informal parameters) will be output around the formatted
@@ -40,7 +40,9 @@
@Parameter(required = true)
private Object _value;
- /** The format to be applied to the object. */
+ /**
+ * The format to be applied to the object.
+ */
@Parameter(required = true)
private Format _format;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/OutputRaw.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/OutputRaw.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/OutputRaw.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/OutputRaw.java Mon Nov 12 14:22:31 2007
@@ -25,7 +25,7 @@
* Used to output raw markup to the client. Unlike, say, an expansion, the output from OutputRaw is
* unfiltered, with any special characters or entities left exactly as is. This is used in
* situations where the markup is provided externally, rather than constructed within Tapestry.
- *
+ *
* @see MarkupWriter#writeRaw(String)
*/
public class OutputRaw
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PageLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PageLink.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PageLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PageLink.java Mon Nov 12 14:22:31 2007
@@ -14,24 +14,20 @@
package org.apache.tapestry.corelib.components;
-import java.util.List;
-
-import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.ioc.annotations.Inject;
+import java.util.List;
+
/**
* Generates a render request link to some other page in the application. If an activation context
* is supplied (as the context parameter), then the context values will be encoded into the URL. If
* no context is supplied, then the target page itself will supply the context via a passivate
* event.
- * <p>
+ * <p/>
* Pages are not required to have an activation context. When a page does have an activation
* context, the value typically represents the identity of some object displayed or otherwise
* manipulated by the page.
@@ -39,7 +35,9 @@
@SupportsInformalParameters
public class PageLink implements ClientElement
{
- /** The logical name of the page to link to. */
+ /**
+ * The logical name of the page to link to.
+ */
@Parameter(required = true, defaultPrefix = "literal")
private String _page;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java Mon Nov 12 14:22:31 2007
@@ -14,67 +14,55 @@
package org.apache.tapestry.corelib.components;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.OptionGroupModel;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.Renderable;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.SelectModelVisitor;
-import org.apache.tapestry.ValueEncoder;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.Path;
import org.apache.tapestry.corelib.base.AbstractField;
import org.apache.tapestry.internal.util.SelectModelRenderer;
import org.apache.tapestry.ioc.annotations.Inject;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Request;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
/**
* Multiple selection component. Generates a UI consisting of two <select> elements configured
* for multiple selection; the one on the left is the list of "available" elements, the one on the
* right is "selected". Elements can be moved between the lists by clicking a button, or double
* clicking an option (and eventually, via drag and drop).
- * <p>
+ * <p/>
* The items in the available list are kept ordered as per {@link SelectModel} order. When items are
* moved from the selected list to the available list, they items are inserted back into their
* proper positions.
- * <p>
+ * <p/>
* The Palette may operate in normal or re-orderable mode, controlled by the reorder parameter.
- * <p>
+ * <p/>
* In normal mode, the items in the selected list are kept in the same "natural" order as the items
* in the available list.
- * <p>
+ * <p/>
* In re-order mode, items moved to the selected list are simply added to the bottom of the list. In
* addition, two extra buttons appear to move items up and down within the selected list.
- * <p>
+ * <p/>
* Much of the look and feel is driven by CSS, the default Tapestry CSS is used to set up the
* columns, etc. By default, the <select> element's widths are driven by the length of the
* longest <option>, and it is common to override this to a fixed value:
- *
+ * <p/>
* <pre>
* <style>
* DIV.t-palette SELECT { width: 300px; }
* </style>
* </pre>
- *
- * <p>
+ * <p/>
+ * <p/>
* This ensures that the two columns are the same width, and that the column widths don't change as
* items move back and forth.
- * <p>
+ * <p/>
* Option groups within the {@link SelectModel} will be rendered, but are not supported by the many
* browsers, and are not fully handled on the client side.
*/
@@ -180,7 +168,9 @@
}
}
- /** List of Runnable commands to render the available options. */
+ /**
+ * List of Runnable commands to render the available options.
+ */
private List<Runnable> _availableOptions;
/**
@@ -217,11 +207,15 @@
@Path("palette.js")
private Asset _paletteLibrary;
- /** Used to include scripting code in the rendered page. */
+ /**
+ * Used to include scripting code in the rendered page.
+ */
@Environmental
private PageRenderSupport _renderSupport;
- /** Needed to access query parameters when processing form submission. */
+ /**
+ * Needed to access query parameters when processing form submission.
+ */
@Inject
private Request _request;
@@ -385,13 +379,17 @@
writer.end();
}
- /** Prevent the body from rendering. */
+ /**
+ * Prevent the body from rendering.
+ */
boolean beforeRenderBody()
{
return false;
}
- /** The natural order of elements, in terms of their client ids. */
+ /**
+ * The natural order of elements, in terms of their client ids.
+ */
private List<String> _naturalOrder;
@SuppressWarnings("unchecked")
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,7 @@
package org.apache.tapestry.corelib.components;
-import java.util.Locale;
-
-import org.apache.tapestry.Block;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Translator;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.beaneditor.BeanModel;
@@ -29,12 +22,9 @@
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BeanBlockSource;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.PropertyEditContext;
-import org.apache.tapestry.services.TranslatorDefaultSource;
+import org.apache.tapestry.services.*;
+
+import java.util.Locale;
/**
* Used to edit a single property of a bean. This is used primarily by {@link BeanEditForm}. Unlike
@@ -61,7 +51,9 @@
{
component.setupEnvironment(_property);
}
- };
+ }
+
+ ;
static class CleanupEnvironment implements ComponentAction<PropertyEditor>
{
@@ -71,7 +63,9 @@
{
component.cleanupEnvironment();
}
- };
+ }
+
+ ;
/**
* The object to be edited by the BeanEditor. This will be read when the component renders and
@@ -129,7 +123,9 @@
private PropertyModel _propertyModel;
- /** Creates a {@link PropertyEditContext} and pushes it onto the {@link Environment} stack. */
+ /**
+ * Creates a {@link PropertyEditContext} and pushes it onto the {@link Environment} stack.
+ */
void setupEnvironment(final String propertyName)
{
_propertyModel = _model.get(propertyName);
@@ -225,7 +221,10 @@
{
Block override = _overrides.getBlockParameter(_propertyModel.getId());
- if (override != null) { return override; }
+ if (override != null)
+ {
+ return override;
+ }
String dataType = _propertyModel.getDataType();
@@ -256,10 +255,12 @@
return false;
}
- /** Used for testing. */
+ /**
+ * Used for testing.
+ */
void inject(ComponentResources resources, ComponentResources overrides,
- PropertyModel propertyModel, BeanBlockSource beanBlockSource, Messages messages,
- Object object)
+ PropertyModel propertyModel, BeanBlockSource beanBlockSource, Messages messages,
+ Object object)
{
_resources = resources;
_overrides = overrides;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Radio.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,7 @@
package org.apache.tapestry.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.RadioContainer;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Mixin;
import org.apache.tapestry.annotations.Parameter;
@@ -32,7 +27,7 @@
/**
* A radio button (i.e., <input type="radio">). Radio buttons <strong>must</strong> operate
* within a {@link RadioContainer} (normally, the {@link RadioGroup} component).
- * <p>
+ * <p/>
* If the value parameter is not bound, then the default value is a property of the container
* component whose name matches the Radio component's id.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java Mon Nov 12 14:22:31 2007
@@ -14,20 +14,12 @@
package org.apache.tapestry.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.RadioContainer;
-import org.apache.tapestry.ValueEncoder;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.ValueEncoderSource;
+import org.apache.tapestry.services.*;
public class RadioGroup
{
@@ -48,7 +40,7 @@
/**
* Allows a specific implementation of {@link ValueEncoder} to be supplied. This is used to
* create client-side string values for the different radio button values.
- *
+ *
* @see ValueEncoderSource
*/
@Parameter(required = true)
@@ -99,7 +91,9 @@
{
component.setup(_elementName);
}
- };
+ }
+
+ ;
private static final ComponentAction<RadioGroup> PROCESS_SUBMISSION = new ComponentAction<RadioGroup>()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java Mon Nov 12 14:22:31 2007
@@ -14,35 +14,22 @@
package org.apache.tapestry.corelib.components;
-import java.util.Locale;
-
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.SelectModelVisitor;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ValidationTracker;
-import org.apache.tapestry.ValueEncoder;
+import org.apache.tapestry.*;
import org.apache.tapestry.annotations.BeforeRenderTemplate;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.corelib.base.AbstractField;
import org.apache.tapestry.internal.util.SelectModelRenderer;
import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.ValueEncoderFactory;
-import org.apache.tapestry.services.ValueEncoderSource;
+import org.apache.tapestry.services.*;
import org.apache.tapestry.util.EnumSelectModel;
+import java.util.Locale;
+
/**
* Select an item from a list of values, using an [X]HTML <select> element on the client side.
* An validation decorations will go around the entire <select> element.
- * <p>
+ * <p/>
* A core part of this component is the {@link ValueEncoder} (the encoder parameter) that is used to
* convert between server-side values and client-side strings. In many cases, a {@link ValueEncoder}
* can be generated automatically from the type of the value parameter. The
@@ -72,7 +59,7 @@
/**
* Allows a specific implementation of {@link ValueEncoder} to be supplied. This is used to
* create client-side string values for the different options.
- *
+ *
* @see ValueEncoderSource
*/
@Parameter
@@ -101,12 +88,16 @@
@Environmental
private ValidationTracker _tracker;
- /** Performs input validation on the value supplied by the user in the form submission. */
+ /**
+ * Performs input validation on the value supplied by the user in the form submission.
+ */
@Parameter(defaultPrefix = "validate")
@SuppressWarnings("unchecked")
private FieldValidator<Object> _validate = NOOP_VALIDATOR;
- /** The value to read or update. */
+ /**
+ * The value to read or update.
+ */
@Parameter(required = true, principal = true)
private Object _value;
@@ -143,7 +134,7 @@
writer.element("select", "name", getElementName(), "id", getClientId());
_resources.renderInformalParameters(writer);
-
+
// Disabled via mixin
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/data/GridPagerPosition.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/data/GridPagerPosition.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/data/GridPagerPosition.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/data/GridPagerPosition.java Mon Nov 12 14:22:31 2007
@@ -20,17 +20,26 @@
* Used by the {@link Grid} component to control where the pager portion of the Grid should be
* displayed.
*/
-public enum GridPagerPosition {
- /** Position the pager above the Grid's table. */
+public enum GridPagerPosition
+{
+ /**
+ * Position the pager above the Grid's table.
+ */
TOP(true, false),
- /** Position the pager below the Grid's table (this is the default). */
+ /**
+ * Position the pager below the Grid's table (this is the default).
+ */
BOTTOM(false, true),
- /** Show the pager above and below the Grid's table. */
+ /**
+ * Show the pager above and below the Grid's table.
+ */
BOTH(true, true),
- /** Don't show a pager (the application will need to supply its own navigation mechanism). */
+ /**
+ * Don't show a pager (the application will need to supply its own navigation mechanism).
+ */
NONE(false, false);
private final boolean _matchTop;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java Mon Nov 12 14:22:31 2007
@@ -14,24 +14,21 @@
package org.apache.tapestry.corelib.internal;
+import org.apache.tapestry.ComponentAction;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.cast;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import static org.apache.tapestry.ioc.internal.util.Defense.*;
+import org.apache.tapestry.ioc.internal.util.IdAllocator;
+import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry.services.FormSupport;
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.List;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.FormSupport;
-
/**
* Provides support to components enclosed by a form when the form is rendering (allowing the
* components to registry form submit callback commands), and also during form submission time.
- * <p>
+ * <p/>
* TODO: Most methods should only be invokable depending on whether the form is rendering or
* processing a submission.
*/
@@ -47,13 +44,17 @@
private String _encodingType;
- /** Constructor used when processing a form submission. */
+ /**
+ * Constructor used when processing a form submission.
+ */
public FormSupportImpl()
{
this(null, null);
}
- /** Constructor used when rendering. */
+ /**
+ * Constructor used when rendering.
+ */
public FormSupportImpl(String clientId, ObjectOutputStream actions)
{
_clientId = clientId;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/InternalMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/InternalMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/InternalMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/InternalMessages.java Mon Nov 12 14:22:31 2007
@@ -33,7 +33,7 @@
}
public static String failureInstantiatingObject(Class objectType, String componentId,
- Throwable cause)
+ Throwable cause)
{
return MESSAGES.format("failure-instantitating-object", ClassFabUtils
.toJavaClassName(objectType), componentId, cause);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java Mon Nov 12 14:22:31 2007
@@ -16,24 +16,20 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.AfterRenderTemplate;
-import org.apache.tapestry.annotations.BeforeRenderTemplate;
-import org.apache.tapestry.annotations.BeginRender;
-import org.apache.tapestry.annotations.MixinAfter;
-import org.apache.tapestry.annotations.SupportsInformalParameters;
+import org.apache.tapestry.annotations.*;
import org.apache.tapestry.ioc.annotations.Inject;
/**
* Used to render out all informal parameters, in the {@link PostBeginRender} phase.
- * <p>
+ * <p/>
* This mixin can be used with components that render a single tag inside the {@link BeginRender}
* phase. RenderInformals will activate during the PostBeginRender phase to write additional
* attributes, from the informal parameters, into the active element.
- * <p>
+ * <p/>
* If you want this behavior, but need to render more than a single tag, then implement render phase
* methods for the {@link BeforeRenderTemplate} and {@link AfterRenderTemplate} phases. Use those
* phases to write the additional elements and close them.
- * <p>
+ * <p/>
* This is often used as a base class, for cases where a component doesn't have other mixins.
*/
@MixinAfter
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.corelib.pages;
-import java.util.List;
-
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.services.ExceptionAnalysis;
import org.apache.tapestry.ioc.services.ExceptionAnalyzer;
@@ -23,6 +21,8 @@
import org.apache.tapestry.services.ExceptionReporter;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Session;
+
+import java.util.List;
/**
* Responsible for reporting runtime exceptions. This page is quite verbose and is usually
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyDisplayBlocks.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyDisplayBlocks.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyDisplayBlocks.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyDisplayBlocks.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.corelib.pages;
-import java.text.DateFormat;
-import java.util.Locale;
-
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.services.PropertyOutputContext;
+
+import java.text.DateFormat;
+import java.util.Locale;
public class PropertyDisplayBlocks
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/PropertyEditBlocks.java Mon Nov 12 14:22:31 2007
@@ -19,11 +19,7 @@
import org.apache.tapestry.ValueEncoder;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.Environmental;
-import org.apache.tapestry.corelib.components.BeanEditForm;
-import org.apache.tapestry.corelib.components.Checkbox;
-import org.apache.tapestry.corelib.components.DateField;
-import org.apache.tapestry.corelib.components.Select;
-import org.apache.tapestry.corelib.components.TextField;
+import org.apache.tapestry.corelib.components.*;
import org.apache.tapestry.services.BeanBlockContribution;
import org.apache.tapestry.services.BeanBlockSource;
import org.apache.tapestry.services.PropertyEditContext;
@@ -33,7 +29,7 @@
/**
* A page that exists to contain blocks used to edit different types of properties. The blocks on
* this page are contributed into the {@link BeanBlockSource} service configuration.
- *
+ *
* @see BeanBlockContribution
* @see BeanEditForm
*/
@@ -43,26 +39,26 @@
private PropertyEditContext _context;
@Component(parameters =
- { "value=context.propertyValue", "label=prop:context.label",
- "translate=prop:context.translator", "validate=prop:textFieldValidator",
- "clientId=prop:context.propertyId" })
+ {"value=context.propertyValue", "label=prop:context.label",
+ "translate=prop:context.translator", "validate=prop:textFieldValidator",
+ "clientId=prop:context.propertyId"})
private TextField _textField;
@Component(parameters =
- { "value=context.propertyValue", "label=prop:context.label", "encoder=valueEncoderForProperty",
- "model=selectModelForProperty", "validate=prop:selectValidator",
- "clientId=prop:context.propertyId" })
+ {"value=context.propertyValue", "label=prop:context.label", "encoder=valueEncoderForProperty",
+ "model=selectModelForProperty", "validate=prop:selectValidator",
+ "clientId=prop:context.propertyId"})
private Select _select;
@SuppressWarnings("unused")
@Component(parameters =
- { "value=context.propertyValue", "label=prop:context.label", "clientId=prop:context.propertyId" })
+ {"value=context.propertyValue", "label=prop:context.label", "clientId=prop:context.propertyId"})
private Checkbox _checkboxField;
@SuppressWarnings("unused")
@Component(parameters =
- { "value=context.propertyValue", "label=prop:context.label",
- "clientId=prop:context.propertyid", "validate=prop:dateFieldValidator" })
+ {"value=context.propertyValue", "label=prop:context.label",
+ "clientId=prop:context.propertyid", "validate=prop:dateFieldValidator"})
private DateField _dateField;
public PropertyEditContext getContext()
@@ -85,14 +81,18 @@
return _context.getValidator(_select);
}
- /** Provide a value encoder for an enum type. */
+ /**
+ * Provide a value encoder for an enum type.
+ */
@SuppressWarnings("unchecked")
public ValueEncoder getValueEncoderForProperty()
{
return new EnumValueEncoder(_context.getPropertyType());
}
- /** Provide a select mode for an enum type. */
+ /**
+ * Provide a select mode for an enum type.
+ */
@SuppressWarnings("unchecked")
public SelectModel getSelectModelForProperty()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.corelib.pages;
-import java.util.List;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.ioc.Registry;
@@ -24,11 +22,13 @@
import org.apache.tapestry.ioc.services.ServiceActivityScoreboard;
import org.apache.tapestry.services.BeanModelSource;
+import java.util.List;
+
/**
* Page used to see the status of all services defined by the {@link Registry}.
- * <p>
+ * <p/>
* TODO: Add filters to control which services are displayed.
- * <p>
+ * <p/>
* TODO: Disable this page if in production mode (or not, as it does no harm).
*/
public class ServiceStatus
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/DefaultMarkupModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/DefaultMarkupModel.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/DefaultMarkupModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/DefaultMarkupModel.java Mon Nov 12 14:22:31 2007
@@ -38,7 +38,9 @@
"option",
"param");
- /** Passes all characters but '<', '>' and '&' through unchanged. */
+ /**
+ * Passes all characters but '<', '>' and '&' through unchanged.
+ */
public void encode(String content, StringBuilder buffer)
{
encode(content, false, buffer);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Document.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Document.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Document.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Document.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.dom;
-import java.io.PrintWriter;
-
import org.apache.tapestry.ioc.internal.util.Defense;
+import java.io.PrintWriter;
+
/**
* The root node of a DOM.
*/
@@ -42,9 +42,8 @@
/**
* Finds an element based on a path of element names.
- *
- * @param path
- * slash separated series of element names
+ *
+ * @param path slash separated series of element names
* @return the matching element, or null if not found
* @see Element#find(String)
*/
@@ -63,7 +62,9 @@
return slashx < 0 ? _rootElement : _rootElement.find(path.substring(slashx + 1));
}
- /** Builds with an instance of {@link DefaultMarkupModel}. */
+ /**
+ * Builds with an instance of {@link DefaultMarkupModel}.
+ */
public Document()
{
this(new DefaultMarkupModel());
@@ -74,7 +75,9 @@
return _model;
}
- /** Creates the root element for this document, replacing any previous root element. */
+ /**
+ * Creates the root element for this document, replacing any previous root element.
+ */
public Element newRootElement(String name)
{
_rootElement = new Element(this, name);
@@ -93,7 +96,7 @@
{
_dtd.toMarkup(writer);
}
-
+
_rootElement.toMarkup(writer);
}
@@ -112,9 +115,8 @@
/**
* Tries to find an element in this document whose id is specified.
- *
- * @param id
- * the value of the id attribute of the element being looked for
+ *
+ * @param id the value of the id attribute of the element being looked for
* @return the element if found. null if not found.
*/
public Element getElementById(String id)