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 2007/11/12 23:23:28 UTC
svn commit: r594319 [5/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/dom/Element.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Element.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Element.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Element.java Mon Nov 12 14:22:31 2007
@@ -14,25 +14,18 @@
package org.apache.tapestry.dom;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newLinkedList;
-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.*;
+import org.apache.tapestry.ioc.internal.util.Defense;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import java.io.PrintWriter;
-import java.util.Collections;
-import java.util.Formatter;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import java.util.*;
/**
* An element that will render with a begin tag and attributes, a body, and an end tag. Also acts as
* a factory for enclosed Element, Text and Comment nodes.
- * <p>
+ * <p/>
* TODO: Support for CDATA nodes. Do we need Entity nodes?
*/
public final class Element extends Node
@@ -79,12 +72,10 @@
/**
* Adds an attribute to the element, but only if the attribute name does not already exist.
- *
- * @param name
- * the name of the attribute to add
- * @param value
- * the value for the attribute. A value of null is allowed, and no attribute will be
- * added to the element.
+ *
+ * @param name the name of the attribute to add
+ * @param value the value for the attribute. A value of null is allowed, and no attribute will be
+ * added to the element.
*/
public void attribute(String name, String value)
{
@@ -99,9 +90,8 @@
/**
* Convenience for invoking {@link #attribute(String, String)} multiple times.
- *
- * @param namesAndValues
- * alternating attribute names and attribute values
+ *
+ * @param namesAndValues alternating attribute names and attribute values
*/
public void attributes(String... namesAndValues)
{
@@ -142,11 +132,9 @@
/**
* Creates and returns a new Element node as a child of this node.
- *
- * @param name
- * the name of the element to create
- * @param namesAndValues
- * alternating attribute names and attribute values
+ *
+ * @param name the name of the element to create
+ * @param namesAndValues alternating attribute names and attribute values
*/
public Element element(String name, String... namesAndValues)
{
@@ -171,7 +159,9 @@
return child;
}
- /** Adds the comment and returns this element for further construction. */
+ /**
+ * Adds the comment and returns this element for further construction.
+ */
public Element comment(String text)
{
newChild(new Comment(this, text));
@@ -179,7 +169,9 @@
return this;
}
- /** Adds the raw text and returns this element for further construction. */
+ /**
+ * Adds the raw text and returns this element for further construction.
+ */
public Element raw(String text)
{
newChild(new Raw(this, text));
@@ -190,9 +182,8 @@
/**
* Adds and returns a new text node (the text node is returned so that
* {@link Text#write(String)} or [@link {@link Text#writef(String, Object[])} may be invoked .
- *
- * @param text
- * initial text for the node
+ *
+ * @param text initial text for the node
* @return the new Text node
*/
public Text text(String text)
@@ -258,9 +249,8 @@
/**
* Tries to find an element under this element (including itself) whose id is specified.
* Performs a width-first search of the document tree.
- *
- * @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)
@@ -295,7 +285,7 @@
/**
* Searchs for a child element with a particular name below this element. The path parameter is
* a slash separated series of element names.
- *
+ *
* @param path
* @return
*/
@@ -339,7 +329,9 @@
return _name;
}
- /** All other implementations of Node return null except this one. */
+ /**
+ * All other implementations of Node return null except this one.
+ */
@Override
Element asElement()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/EndTagStyle.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/EndTagStyle.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/EndTagStyle.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/EndTagStyle.java Mon Nov 12 14:22:31 2007
@@ -18,11 +18,16 @@
* Part of a {@link MarkupModel}, used to define how end tags are handled when the {@link Document}
* in rendered out as a text stream.
*/
-public enum EndTagStyle {
+public enum EndTagStyle
+{
- /** Omit the end tag. Examples for HTML include the input, br and img elements. */
+ /**
+ * Omit the end tag. Examples for HTML include the input, br and img elements.
+ */
OMIT,
- /** Require an end tag always. This is the default for most elements in HTML. */
+ /**
+ * Require an end tag always. This is the default for most elements in HTML.
+ */
REQUIRE,
/**
* Require an end tag, but abbreviate it if the element has no children. This is the only value
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/MarkupModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/MarkupModel.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/MarkupModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/MarkupModel.java Mon Nov 12 14:22:31 2007
@@ -23,11 +23,9 @@
/**
* Encodes the characters into the buffer, converting control characters (such as '<') into
* corresponding entities (such as &lt;).
- *
- * @param content
- * to be filtered
- * @param buffer
- * to receive the filtered content
+ *
+ * @param content to be filtered
+ * @param buffer to receive the filtered content
*/
void encode(String content, StringBuilder buffer);
@@ -35,11 +33,9 @@
* Encodes the characters into the buffer for use in a quoted value (that is, an attribute
* value), converting control characters (such as '<') into corresponding entities (such as
* &lt;). In addition, double quotes must be quoted or otherwise escaped.
- *
- * @param content
- * to be filtered
- * @param buffer
- * to receive the filtered content
+ *
+ * @param content to be filtered
+ * @param buffer to receive the filtered content
*/
void encodeQuoted(String content, StringBuilder buffer);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Node.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Node.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Node.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Node.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,13 @@
package org.apache.tapestry.dom;
+import org.apache.tapestry.internal.util.PrintOutCollector;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import java.io.PrintWriter;
import java.util.Collections;
import java.util.List;
-import org.apache.tapestry.internal.util.PrintOutCollector;
-
/**
* A node within the DOM.
*/
@@ -34,7 +33,7 @@
/**
* Creates a new node, setting its container to the provided value. Container may also be null,
* but that is only used for Document nodes (the topmost node of a DOM).
- *
+ *
* @param container
*/
protected Node(Node container)
@@ -47,7 +46,9 @@
return _container;
}
- /** Returns the node as an {@link Element}, if it is an element. Returns null otherwise. */
+ /**
+ * Returns the node as an {@link Element}, if it is an element. Returns null otherwise.
+ */
Element asElement()
{
return null;
@@ -110,6 +111,8 @@
return _children == null ? Collections.EMPTY_LIST : _children;
}
- /** Writes the markup for this node to the writer. */
+ /**
+ * Writes the markup for this node to the writer.
+ */
public abstract void toMarkup(PrintWriter writer);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Raw.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Raw.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Raw.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Raw.java Mon Nov 12 14:22:31 2007
@@ -31,7 +31,9 @@
_text = text;
}
- /** Prints the text exactly as is, no translations, filtering, etc. */
+ /**
+ * Prints the text exactly as is, no translations, filtering, etc.
+ */
@Override
public void toMarkup(PrintWriter writer)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Text.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Text.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Text.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Text.java Mon Nov 12 14:22:31 2007
@@ -1,20 +1,20 @@
-// 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.dom;
-import java.io.PrintWriter;
+import java.io.PrintWriter;
/**
* A type of node that contains text.
@@ -36,7 +36,9 @@
write(text);
}
- /** Writes additional text into the node, appending it to any existing text. */
+ /**
+ * Writes additional text into the node, appending it to any existing text.
+ */
public void write(String text)
{
_document.getMarkupModel().encode(text, _buffer);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridDataSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridDataSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridDataSource.java Mon Nov 12 14:22:31 2007
@@ -23,39 +23,39 @@
* Defines how a {@link Grid} components (and its sub-components) gain access to the row data that
* is displayed on the page. In many cases, this is just a wrapper around a simple List, but the
* abstractions exist to support access to a large data set that is accessible in sections.
- * <p>
+ * <p/>
* This interface is still under development, as we work out the best approach to handling a
* {@link Grid} inside a {@link Form} using a large dataset.
*/
public interface GridDataSource
{
- /** Returns the number of rows available in the data source. */
+ /**
+ * Returns the number of rows available in the data source.
+ */
int getAvailableRows();
/**
* Invoked to allow the source to prepare to present values. This gives the source a chance to
* pre-fetch data (when appropriate) and informs the source of the desired sort order.
- *
- * @param startIndex
- * the starting index to be retrieved
- * @param endIndex
- * the ending index to be retrieved
- * @param sortModel
- * the property model that defines what data will be used for sorting, or null if no
- * sorting is required (in which case, whatever natural order is provided by the
- * underlying data source will be used)
- * @param ascending
- * if true, then sort ascending, else descending
+ *
+ * @param startIndex the starting index to be retrieved
+ * @param endIndex the ending index to be retrieved
+ * @param sortModel the property model that defines what data will be used for sorting, or null if no
+ * sorting is required (in which case, whatever natural order is provided by the
+ * underlying data source will be used)
+ * @param ascending if true, then sort ascending, else descending
*/
void prepare(int startIndex, int endIndex, PropertyModel sortModel, boolean ascending);
- /** Returns the row value at the provided index. This method will be invoked in sequential order. */
+ /**
+ * Returns the row value at the provided index. This method will be invoked in sequential order.
+ */
Object getRowValue(int index);
/**
* Returns the type of value in the rows, or null if not known. This value is used to create a
* default {@link BeanModel} when no such model is explicitly provided.
- *
+ *
* @return the row type, or null
*/
Class getRowType();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridModelProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridModelProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridModelProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/grid/GridModelProvider.java Mon Nov 12 14:22:31 2007
@@ -29,6 +29,8 @@
*/
BeanModel getDataModel();
- /** Returns the source for the data to be presented in the Grid. */
+ /**
+ * Returns the source for the data to be presented in the Grid.
+ */
GridDataSource getDataSource();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/DefaultValidationDecorator.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,7 @@
package org.apache.tapestry.internal;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.BaseValidationDecorator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationTracker;
+import org.apache.tapestry.*;
import org.apache.tapestry.dom.Element;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.services.Environment;
@@ -36,17 +32,14 @@
private Messages _validationMessages;
/**
- * @param environment
- * used to locate objects and services during the render
- * @param validationMessages
- * obtained from {@link ValidationMessagesSource}, used to obtain the label for the
- * icon
- * @param iconAsset
- * asset for an icon that will be displayed after each field (marked with the
- * "t-invisible" CSS class, if the field is not in error)
+ * @param environment used to locate objects and services during the render
+ * @param validationMessages obtained from {@link ValidationMessagesSource}, used to obtain the label for the
+ * icon
+ * @param iconAsset asset for an icon that will be displayed after each field (marked with the
+ * "t-invisible" CSS class, if the field is not in error)
*/
public DefaultValidationDecorator(final Environment environment, Messages validationMessages,
- Asset iconAsset)
+ Asset iconAsset)
{
_environment = environment;
_validationMessages = validationMessages;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java Mon Nov 12 14:22:31 2007
@@ -24,16 +24,14 @@
* any need for this interface (we'll see as we go).
*/
public interface InternalComponentResources extends ComponentResources,
- InternalComponentResourcesCommon
+ InternalComponentResourcesCommon
{
/**
* Reads the value of a parameter, via the parameter's {@link org.apache.tapestry.Binding}.
- *
+ *
* @param <T>
- * @param parameterName
- * the name of the parameter to read
- * @param expectedType
- * the expected type of parameter
+ * @param parameterName the name of the parameter to read
+ * @param expectedType the expected type of parameter
* @return the value for the parameter, or null if the parameter is not bound.
*/
<T> T readParameter(String parameterName, Class<T> expectedType);
@@ -41,12 +39,10 @@
/**
* Updates a parameter. It is an error to update a parameter which is not bound. The parameter
* {@link org.apache.tapestry.Binding binding} may also not support updates.
- *
+ *
* @param <T>
- * @param parameterName
- * of parameter to update
- * @param parameterValue
- * new value (which may be null)
+ * @param parameterName of parameter to update
+ * @param parameterValue new value (which may be null)
*/
<T> void writeParameter(String parameterName, T parameterValue);
@@ -54,9 +50,8 @@
* Returns true if the named parameter's {@link org.apache.tapestry.Binding} is invariant, false
* if otherwise, or if the parameter is not bound. Invariant bindings are cached more
* aggressively than variant bindings.
- *
- * @param parameterName
- * the name of parameter to check for invariance
+ *
+ * @param parameterName the name of parameter to check for invariance
* @return
*/
boolean isInvariant(String parameterName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResourcesCommon.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResourcesCommon.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResourcesCommon.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResourcesCommon.java Mon Nov 12 14:22:31 2007
@@ -28,38 +28,40 @@
{
/**
* Get the current persisted value of the field.
- *
- * @param fieldName
- * the name of the field to access
+ *
+ * @param fieldName the name of the field to access
* @return the value stored for the field, or null if no value is currently stored
*/
Object getFieldChange(String fieldName);
- /** Checks to see if there is a value stored for the indicated field. */
+ /**
+ * Checks to see if there is a value stored for the indicated field.
+ */
boolean hasFieldChange(String fieldName);
/**
* Returns true if the component has finished loading. Initially, this value will be false.
- *
+ *
* @see org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidLoad()
*/
boolean isLoaded();
/**
* Used during construction of the page to identify the binding for a particular parameter.
- * <p>
+ * <p/>
*/
void bindParameter(String parameterName, Binding binding);
/**
* Returns the mixin instance for the fully qualfied mixin class name.
- *
- * @param mixinClassName
- * fully qualified class name
+ *
+ * @param mixinClassName fully qualified class name
* @return IllegalArgumentException if no such mixin is associated with the core component
*/
Component getMixinByClassName(String mixinClassName);
- /** Invoked to make the receiver queue itself to be rendered. */
+ /**
+ * Invoked to make the receiver queue itself to be rendered.
+ */
void queueRender(RenderQueue queue);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalConstants.java Mon Nov 12 14:22:31 2007
@@ -42,7 +42,9 @@
*/
public static final String TEMPLATE_EXTENSION = "tml";
- /** All purpose CSS class name for anything related to Tapestry errors. */
+ /**
+ * All purpose CSS class name for anything related to Tapestry errors.
+ */
public static final String TAPESTRY_ERROR_CLASS = "t-error";
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/KeyValue.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/KeyValue.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/KeyValue.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/KeyValue.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
package org.apache.tapestry.internal;
-/** A key/value pair. */
+/**
+ * A key/value pair.
+ */
public class KeyValue
{
private final String _key;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionGroupModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionGroupModelImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionGroupModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionGroupModelImpl.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.internal;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.OptionGroupModel;
import org.apache.tapestry.OptionModel;
+import java.util.List;
+import java.util.Map;
+
public final class OptionGroupModelImpl implements OptionGroupModel
{
private final String _label;
@@ -31,14 +31,14 @@
private final Map<String, String> _attributes;
public OptionGroupModelImpl(String label, boolean disabled, List<OptionModel> options,
- String... attributeKeysAndValues)
+ String... attributeKeysAndValues)
{
this(label, disabled, options, attributeKeysAndValues.length == 0 ? null : TapestryInternalUtils
.mapFromKeysAndValues(attributeKeysAndValues));
}
public OptionGroupModelImpl(String label, boolean disabled, List<OptionModel> options,
- Map<String, String> attributes)
+ Map<String, String> attributes)
{
_label = label;
_disabled = disabled;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionModelImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/OptionModelImpl.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.internal;
-import java.util.Map;
-
import org.apache.tapestry.OptionModel;
+import java.util.Map;
+
public final class OptionModelImpl implements OptionModel
{
private final String _label;
@@ -35,7 +35,7 @@
}
public OptionModelImpl(String label, boolean disabled, Object value,
- Map<String, String> attributes)
+ Map<String, String> attributes)
{
_label = label;
_disabled = disabled;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SelectModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SelectModelImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SelectModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SelectModelImpl.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.OptionGroupModel;
import org.apache.tapestry.OptionModel;
import org.apache.tapestry.util.AbstractSelectModel;
+import java.util.Arrays;
+import java.util.List;
+
public final class SelectModelImpl extends AbstractSelectModel
{
private final List<OptionGroupModel> _optionGroups;
@@ -28,7 +28,7 @@
private final List<OptionModel> _optionModels;
public SelectModelImpl(final List<OptionGroupModel> optionGroups,
- final List<OptionModel> optionModels)
+ final List<OptionModel> optionModels)
{
_optionGroups = optionGroups;
_optionModels = optionModels;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/ServletContextSymbolProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/ServletContextSymbolProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/ServletContextSymbolProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/ServletContextSymbolProvider.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,12 @@
package org.apache.tapestry.internal;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.SymbolProvider;
+
+import javax.servlet.ServletContext;
+import java.util.Map;
/**
* A wrapper around {@link ServletContext} that makes init-parameters accessible as symbols.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticModuleDef.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,15 @@
package org.apache.tapestry.internal;
-import java.util.Collections;
-import java.util.Set;
-
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.def.DecoratorDef;
import org.apache.tapestry.ioc.def.ModuleDef;
import org.apache.tapestry.ioc.def.ServiceDef;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import java.util.Collections;
+import java.util.Set;
+
/**
* A synthetic module definition, used to mix in some additional "pre-built" service configuration
* contributions.
@@ -36,37 +36,49 @@
_contributionDefs = CollectionFactory.newSet(contributionDefs);
}
- /** Returns null. */
+ /**
+ * Returns null.
+ */
public Class getBuilderClass()
{
return null;
}
- /** Returns the configured set. */
+ /**
+ * Returns the configured set.
+ */
public Set<ContributionDef> getContributionDefs()
{
return _contributionDefs;
}
- /** Returns an empty set. */
+ /**
+ * Returns an empty set.
+ */
public Set<DecoratorDef> getDecoratorDefs()
{
return Collections.emptySet();
}
- /** Returns "SyntheticModule". */
+ /**
+ * Returns "SyntheticModule".
+ */
public String getLoggerName()
{
return "SyntheticModule";
}
- /** Returns null. */
+ /**
+ * Returns null.
+ */
public ServiceDef getServiceDef(String serviceId)
{
return null;
}
- /** Returns an empty set. */
+ /**
+ * Returns an empty set.
+ */
public Set<String> getServiceIds()
{
return Collections.emptySet();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticSymbolSourceContributionDef.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticSymbolSourceContributionDef.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticSymbolSourceContributionDef.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/SyntheticSymbolSourceContributionDef.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,13 @@
package org.apache.tapestry.internal;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.ModuleBuilderSource;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.OrderedConfiguration;
+import org.apache.tapestry.ioc.*;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.services.SymbolProvider;
-/** Makes a contribution to the SymbolSource service configuration. */
+/**
+ * Makes a contribution to the SymbolSource service configuration.
+ */
public class SyntheticSymbolSourceContributionDef implements ContributionDef
{
private final String _contributionName;
@@ -32,7 +30,7 @@
private final String[] _constraints;
public SyntheticSymbolSourceContributionDef(String contributionName, SymbolProvider provider,
- String... constraints)
+ String... constraints)
{
_contributionName = contributionName;
_provider = provider;
@@ -40,23 +38,25 @@
}
public void contribute(ModuleBuilderSource moduleBuilderSource, ObjectLocator locator,
- Configuration configuration)
+ Configuration configuration)
{
}
@SuppressWarnings("unchecked")
public void contribute(ModuleBuilderSource moduleBuilderSource, ObjectLocator locator,
- OrderedConfiguration configuration)
+ OrderedConfiguration configuration)
{
configuration.add(_contributionName, _provider, _constraints);
}
public void contribute(ModuleBuilderSource moduleBuilderSource, ObjectLocator locator,
- MappedConfiguration configuration)
+ MappedConfiguration configuration)
{
}
- /** Returns "SymbolSource". */
+ /**
+ * Returns "SymbolSource".
+ */
public String getServiceId()
{
return "SymbolSource";
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java Mon Nov 12 14:22:31 2007
@@ -29,9 +29,9 @@
* This class is used to build the {@link Registry}. The Registry contains
* {@link org.apache.tapestry.ioc.services.TapestryIOCModule} and {@link TapestryModule}, any
* modules identified by {@link #addModules(RegistryBuilder)}, plus the application module.
- * <p>
+ * <p/>
* The application module is optional.
- * <p>
+ * <p/>
* The application module is identified as <em>package</em>.services.<em>appName</em>Module,
* where <em>package</em> and the <em>appName</em> are specified by the caller.
*/
@@ -54,21 +54,16 @@
public TapestryAppInitializer(String appPackage, String appName, String aliasMode)
{
this(new SingleKeySymbolProvider(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage),
- appName, aliasMode);
+ appName, aliasMode);
}
/**
- * @param appProvider
- * provides symbols for the application (normally, from the ServletContext init
- * parameters)
- * @param appName
- * the name of the application (i.e., the name of the application servlet)
- * @param aliasMode
- * the mode, used by the {@link Alias} service, normally "servlet"
- * @param serviceOverrides
- * specific service overrides (used by {@link PageTester}
- * @param moduleDefs
- * additional module definitions to be mixed in to those automatically located
+ * @param appProvider provides symbols for the application (normally, from the ServletContext init
+ * parameters)
+ * @param appName the name of the application (i.e., the name of the application servlet)
+ * @param aliasMode the mode, used by the {@link Alias} service, normally "servlet"
+ * @param serviceOverrides specific service overrides (used by {@link PageTester}
+ * @param moduleDefs additional module definitions to be mixed in to those automatically located
*/
public TapestryAppInitializer(SymbolProvider appProvider, String appName, String aliasMode)
{
@@ -113,7 +108,7 @@
/**
* Adds additional modules.
- *
+ *
* @param moduleDefs
*/
public void addModules(ModuleDef... moduleDefs)
@@ -134,15 +129,17 @@
ContributionDef aliasModeContribution = new SyntheticSymbolSourceContributionDef(
"AliasMode", new SingleKeySymbolProvider(
- InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL, _aliasMode),
+ InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL, _aliasMode),
"before:ServletContext");
ContributionDef appNameContribution = new SyntheticSymbolSourceContributionDef("AppName",
- new SingleKeySymbolProvider(InternalConstants.TAPESTRY_APP_NAME_SYMBOL, _appName),
- "before:ServletContext");
+ new SingleKeySymbolProvider(
+ InternalConstants.TAPESTRY_APP_NAME_SYMBOL,
+ _appName),
+ "before:ServletContext");
_builder.add(new SyntheticModuleDef(symbolSourceContribution, aliasModeContribution,
- appNameContribution));
+ appNameContribution));
}
public Registry getRegistry()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,6 @@
package org.apache.tapestry.internal;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.net.URLCodec;
@@ -34,14 +24,25 @@
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.ioc.internal.util.Defense;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.internal.util.Orderer;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry.ioc.services.PropertyAdapter;
import org.slf4j.Logger;
-/** Shared utility methods used by various implementation classes. */
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Shared utility methods used by various implementation classes.
+ */
public class TapestryInternalUtils
{
private static final URLCodec CODEC = new URLCodec();
@@ -126,7 +127,7 @@
/**
* Converts a string to an {@link OptionModel}. The string is of the form "value=label". If the
* equals sign is omitted, then the same value is used for both value and label.
- *
+ *
* @param input
* @return
*/
@@ -147,9 +148,8 @@
/**
* Parses a string input into a series of value=label pairs compatible with
* {@link #toOptionModel(String)}. Splits on commas. Ignores whitespace around commas.
- *
- * @param input
- * comma seperated list of terms
+ *
+ * @param input comma seperated list of terms
* @return list of option models
*/
public static List<OptionModel> toOptionModels(String input)
@@ -167,7 +167,7 @@
/**
* Wraps the result of {@link #toOptionModels(String)} as a {@link SelectModel} (with no option
* groups).
- *
+ *
* @param input
* @return
*/
@@ -180,7 +180,7 @@
/**
* Converts a map entry to an {@link OptionModel}.
- *
+ *
* @param input
* @return
*/
@@ -196,9 +196,8 @@
/**
* Processes a map input into a series of map entries compatible with
* {@link #toOptionModel(Map.Entry)}.
- *
- * @param input
- * map of elements
+ *
+ * @param input map of elements
* @return list of option models
*/
public static <K, V> List<OptionModel> toOptionModels(Map<K, V> input)
@@ -216,7 +215,7 @@
/**
* Wraps the result of {@link #toOptionModels(Map)} as a {@link SelectModel} (with no option
* groups).
- *
+ *
* @param input
* @return
*/
@@ -229,7 +228,7 @@
/**
* Converts an object to an {@link OptionModel}.
- *
+ *
* @param input
* @return
*/
@@ -243,9 +242,8 @@
/**
* Processes a list input into a series of objects compatible with
* {@link #toOptionModel(Object)}.
- *
- * @param input
- * list of elements
+ *
+ * @param input list of elements
* @return list of option models
*/
public static <E> List<OptionModel> toOptionModels(List<E> input)
@@ -263,7 +261,7 @@
/**
* Wraps the result of {@link #toOptionModels(List)} as a {@link SelectModel} (with no option
* groups).
- *
+ *
* @param input
* @return
*/
@@ -277,7 +275,7 @@
/**
* Parses a key/value pair where the key and the value are seperated by an equals sign. The key
* and value are trimmed of leading and trailing whitespace, and returned as a {@link KeyValue}.
- *
+ *
* @param input
* @return
*/
@@ -297,7 +295,7 @@
* Used to convert a property expression into a key that can be used to locate various resources
* (Blocks, messages, etc.). Strips out any punctuation characters, leaving just words
* characters (letters, number and the underscore).
- *
+ *
* @param expression
* @return
*/
@@ -362,17 +360,14 @@
* explicit {@link OrderBefore}, leaving the remainder. Estimates each propertie's position
* based on the relative position of the property's getter. The code assumes that all methods
* are readable (have a getter method).
- *
- * @param classAdapter
- * defines the bean that contains the properties
- * @param classFactory
- * used to access method line number information
- * @param propertyNames
- * the initial set of property names
+ *
+ * @param classAdapter defines the bean that contains the properties
+ * @param classFactory used to access method line number information
+ * @param propertyNames the initial set of property names
* @return propertyNames filtered and sorted
*/
public static List<String> orderProperties(Logger logger, ClassPropertyAdapter classAdapter,
- ClassFactory classFactory, List<String> propertyNames)
+ ClassFactory classFactory, List<String> propertyNames)
{
// Property name to a list of constraints.
@@ -458,11 +453,9 @@
}
/**
- * @param messages
- * the messages to search for the label
+ * @param messages the messages to search for the label
* @param prefix
- * @param value
- * to get a label for
+ * @param value to get a label for
* @return the label
*/
public static String getLabelForEnum(Messages messages, String prefix, Enum value)
@@ -512,7 +505,7 @@
/**
* Determines if the two values are equal. They are equal if they are the exact same value
* (including if they are both null). Otherwise standard equals() comparison is used.
- *
+ *
* @param <T>
* @param left
* @param right
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanEditorMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanEditorMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanEditorMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanEditorMessages.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.internal.beaneditor;
-import java.util.Collection;
-
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import java.util.Collection;
+
class BeanEditorMessages
{
private static final Messages MESSAGES = MessagesImpl.forClass(BeanEditorMessages.class);
@@ -30,7 +30,7 @@
}
static String unknownProperty(Class beanType, String propertyName,
- Collection<String> propertyNames)
+ Collection<String> propertyNames)
{
return MESSAGES.format("unknown-property", beanType.getName(), propertyName, InternalUtils
.joinSorted(propertyNames));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelImpl.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,6 @@
package org.apache.tapestry.internal.beaneditor;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.beaneditor.PropertyModel;
@@ -29,10 +21,17 @@
import org.apache.tapestry.internal.services.CoercingPropertyConduitWrapper;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.ioc.services.ClassFabUtils;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.services.PropertyConduitSource;
+import java.util.List;
+import java.util.Map;
+
public class BeanModelImpl implements BeanModel
{
private final Class _beanType;
@@ -50,7 +49,7 @@
private final List<String> _propertyNames = CollectionFactory.newList();
public BeanModelImpl(Class beanType, PropertyConduitSource propertyConduitSource,
- TypeCoercer typeCoercer, Messages messages)
+ TypeCoercer typeCoercer, Messages messages)
{
_beanType = beanType;
_propertyConduitSource = propertyConduitSource;
@@ -81,7 +80,7 @@
}
public PropertyModel add(RelativePosition position, String existingPropertyName,
- String propertyName, PropertyConduit conduit)
+ String propertyName, PropertyConduit conduit)
{
notNull(position, "position");
@@ -107,7 +106,7 @@
}
public PropertyModel add(RelativePosition position, String existingPropertyName,
- String propertyName)
+ String propertyName)
{
PropertyConduit conduit = createConduit(propertyName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelUtils.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/BeanModelUtils.java Mon Nov 12 14:22:31 2007
@@ -23,10 +23,9 @@
{
/**
* Removes properties from the bean model.
- *
+ *
* @param model
- * @param propertyNames
- * comma-separated list of property names
+ * @param propertyNames comma-separated list of property names
* @see BeanModel#remove(String...)
*/
public static void remove(BeanModel model, String propertyNames)
@@ -36,10 +35,9 @@
/**
* Reorders properties within the bean model.
- *
+ *
* @param model
- * @param propertyNames
- * comma-separated list of property names
+ * @param propertyNames comma-separated list of property names
* @see BeanModel#reorder(String...)
*/
public static void reorder(BeanModel model, String propertyNames)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PrimitiveFieldConstraintGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PrimitiveFieldConstraintGenerator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PrimitiveFieldConstraintGenerator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PrimitiveFieldConstraintGenerator.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.internal.beaneditor;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.services.ValidationConstraintGenerator;
+
+import java.util.Arrays;
+import java.util.List;
/**
* Adds a "required" constraint for any property of whose type is a primitive (not a wrapper or
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/PropertyModelImpl.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,12 @@
package org.apache.tapestry.internal.beaneditor;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.beaneditor.PropertyModel;
import org.apache.tapestry.internal.TapestryInternalUtils;
import org.apache.tapestry.ioc.Messages;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
import org.apache.tapestry.ioc.services.ClassFabUtils;
public class PropertyModelImpl implements PropertyModel
@@ -40,7 +39,7 @@
private boolean _sortable;
public PropertyModelImpl(BeanModel model, final String name, final PropertyConduit conduit,
- Messages messages)
+ Messages messages)
{
_model = model;
_name = name;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGenerator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGenerator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGenerator.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.internal.beaneditor;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.beaneditor.Validate;
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.services.ValidationConstraintGenerator;
+
+import java.util.Arrays;
+import java.util.List;
/**
* Checks for the {@link Validate} annotation, and extracts its value to form the result.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal.bindings;
-import java.lang.annotation.Annotation;
-
import org.apache.tapestry.Binding;
import org.apache.tapestry.ioc.BaseLocatable;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.TapestryException;
+import java.lang.annotation.Annotation;
+
/**
* Abstract base class for bindings. Assumes that the binding is read only and invariant. Subclasses
* must provide an implementation of {@link Binding#get()}.
@@ -38,8 +38,7 @@
}
/**
- * @throws TapestryException
- * always
+ * @throws TapestryException always
*/
public void set(Object value)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AssetBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -24,7 +24,7 @@
/**
* Binding factory where the expression is a reference to an asset.
- *
+ *
* @see AssetSource
*/
public class AssetBindingFactory implements BindingFactory
@@ -37,7 +37,7 @@
}
public Binding newBinding(String description, ComponentResources container,
- ComponentResources component, String expression, Location location)
+ ComponentResources component, String expression, Location location)
{
Resource baseResource = container.getBaseResource();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBinding.java Mon Nov 12 14:22:31 2007
@@ -26,7 +26,7 @@
private final String _blockId;
public BlockBinding(final String description, final ComponentResources component,
- final String blockId, Location location)
+ final String blockId, Location location)
{
super(location);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/BlockBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -19,11 +19,13 @@
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.services.BindingFactory;
-/** Accesses a named block from the container. The block must exist. */
+/**
+ * Accesses a named block from the container. The block must exist.
+ */
public class BlockBindingFactory implements BindingFactory
{
public Binding newBinding(String description, ComponentResources container,
- ComponentResources component, String expression, Location location)
+ ComponentResources component, String expression, Location location)
{
return new BlockBinding(description, container, expression, location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBinding.java Mon Nov 12 14:22:31 2007
@@ -26,7 +26,7 @@
private final String _componentId;
public ComponentBinding(String description, ComponentResources resources, String componentId,
- Location location)
+ Location location)
{
super(location);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ComponentBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -19,11 +19,13 @@
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.services.BindingFactory;
-/** The "component:" binding prefix, which allows access to a child component via its id. */
+/**
+ * The "component:" binding prefix, which allows access to a child component via its id.
+ */
public class ComponentBindingFactory implements BindingFactory
{
public Binding newBinding(String description, ComponentResources container, ComponentResources component,
- String expression, Location location)
+ String expression, Location location)
{
return new ComponentBinding(description, container, expression, location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -1,33 +1,33 @@
-// 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.internal.bindings;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry.Binding;
+import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.services.BindingFactory;
/**
* Binding factory that treats the expression as a literal string. The simplest form of binding.
- *
+ *
* @see org.apache.tapestry.internal.bindings.LiteralBinding
*/
public class LiteralBindingFactory implements BindingFactory
{
public Binding newBinding(String description, ComponentResources container, ComponentResources component,
- String expression, Location location)
+ String expression, Location location)
{
return new LiteralBinding(description, expression, location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/MessageBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/MessageBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/MessageBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/MessageBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -27,7 +27,7 @@
{
public Binding newBinding(String description, ComponentResources container, ComponentResources component,
- String expression, Location location)
+ String expression, Location location)
{
String messageValue = container.getMessages().get(expression);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBinding.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.internal.bindings;
-import java.lang.annotation.Annotation;
-
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.TapestryException;
+import java.lang.annotation.Annotation;
+
/**
* Base class for bindings created by the
* {@link org.apache.tapestry.internal.bindings.PropBindingFactory}. A subclass of this is created
@@ -34,7 +34,7 @@
private final String _toString;
public PropBinding(final Object root, final PropertyConduit conduit, final String toString,
- final Location location)
+ final Location location)
{
super(location);
@@ -78,7 +78,9 @@
return _toString;
}
- /** Returns false; these properties are always dynamic. */
+ /**
+ * Returns false; these properties are always dynamic.
+ */
@Override
public boolean isInvariant()
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -24,7 +24,7 @@
/**
* Binding factory for reading and updating JavaBean properties.
- * <p>
+ * <p/>
* Expression are evaluated via a {@link PropertyConduit}, which is generated by
* {@link PropertyConduitSource} (which therefore defines the expression language).
*/
@@ -38,7 +38,7 @@
}
public Binding newBinding(String description, ComponentResources container,
- ComponentResources component, String expression, Location location)
+ ComponentResources component, String expression, Location location)
{
Object target = container.getComponent();
Class targetClass = target.getClass();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/TranslateBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -35,7 +35,7 @@
}
public Binding newBinding(String description, ComponentResources container,
- ComponentResources component, String expression, Location location)
+ ComponentResources component, String expression, Location location)
{
Translator translator = _source.get(expression);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/ValidateBindingFactory.java Mon Nov 12 14:22:31 2007
@@ -37,13 +37,13 @@
}
public Binding newBinding(String description, ComponentResources container,
- ComponentResources component, String expression, Location location)
+ ComponentResources component, String expression, Location location)
{
Object fieldAsObject = component.getComponent();
if (!Field.class.isInstance(fieldAsObject))
throw new TapestryException(BindingsMessages.validateBindingForFieldsOnly(component),
- location, null);
+ location, null);
Field field = (Field) fieldAsObject;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHub.java Mon Nov 12 14:22:31 2007
@@ -19,7 +19,7 @@
/**
* An object which manages a list of
* {@link org.apache.tapestry.internal.events.InvalidationListener}s.
- * <p>
+ * <p/>
* TODO: This interface need to move to the public side (as it is extended by other public
* interfaces), or we need to come up with an alternate mechanism for propogating invalidation data.
*/
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/event/InvalidationEventHubImpl.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,11 @@
package org.apache.tapestry.internal.event;
+import org.apache.tapestry.internal.events.InvalidationListener;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeList;
import java.util.List;
-import org.apache.tapestry.internal.events.InvalidationListener;
-
/**
* Base implementation class for classes (especially services) that need to manage a list of
* {@link org.apache.tapestry.internal.events.InvalidationListener}s.
@@ -28,7 +27,9 @@
{
private final List<InvalidationListener> _listeners = newThreadSafeList();
- /** Notifies all {@link InvalidationListener listener}s. */
+ /**
+ * Notifies all {@link InvalidationListener listener}s.
+ */
protected final void fireInvalidationEvent()
{
for (InvalidationListener listener : _listeners)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/events/InvalidationListener.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,28 @@
-// 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.internal.events;
/**
* Interface for objects that may cache information that can be invalidated.
- *
- *
+ *
* @see org.apache.tapestry.internal.events.InvalidationEvent
*/
public interface InvalidationListener
{
- /** Invoked to indicate that some object is invalid. The receiver should clear its cache. */
+ /**
+ * Invoked to indicate that some object is invalid. The receiver should clear its cache.
+ */
void objectWasInvalidated();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/ListGridDataSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/ListGridDataSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/ListGridDataSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/grid/ListGridDataSource.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,9 @@
package org.apache.tapestry.internal.grid;
+import org.apache.tapestry.PropertyConduit;
+import org.apache.tapestry.beaneditor.PropertyModel;
+import org.apache.tapestry.grid.GridDataSource;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
@@ -21,10 +24,6 @@
import java.util.Comparator;
import java.util.List;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.grid.GridDataSource;
-
public class ListGridDataSource implements GridDataSource
{
private final List _list;
@@ -46,7 +45,7 @@
@SuppressWarnings("unchecked")
public void prepare(int startIndex, int endIndex, PropertyModel sortModel,
- final boolean ascending)
+ final boolean ascending)
{
if (sortModel == null)
return;
@@ -98,7 +97,9 @@
Collections.sort(_list, reverseComparator);
}
- /** Returns the type of the first element in the list, or null if the list is empty. */
+ /**
+ * Returns the type of the first element in the list, or null if the list is empty.
+ */
public Class getRowType()
{
return _list.isEmpty() ? null : _list.get(0).getClass();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ModelMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ModelMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ModelMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/ModelMessages.java Mon Nov 12 14:22:31 2007
@@ -1,21 +1,21 @@
-// 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.internal.model;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry.ioc.internal.util.MessagesImpl;
class ModelMessages
{
@@ -31,7 +31,7 @@
}
static String duplicateParameterValue(String parameterName, String componentId,
- String componentClassName)
+ String componentClassName)
{
return MESSAGES.format(
"duplicate-parameter-value",
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java Mon Nov 12 14:22:31 2007
@@ -14,26 +14,19 @@
package org.apache.tapestry.internal.model;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-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.Defense.notBlank;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
import org.apache.tapestry.ioc.internal.util.IdAllocator;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.EmbeddedComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.model.MutableEmbeddedComponentModel;
-import org.apache.tapestry.model.ParameterModel;
+import org.apache.tapestry.model.*;
import org.slf4j.Logger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
/**
* Internal implementation of {@link org.apache.tapestry.model.MutableComponentModel}.
*/
@@ -53,7 +46,9 @@
private Map<String, EmbeddedComponentModel> _embeddedComponents;
- /** Maps from field name to strategy. */
+ /**
+ * Maps from field name to strategy.
+ */
private Map<String, String> _persistentFields;
private List<String> _mixinClassNames;
@@ -65,7 +60,7 @@
private Map<String, String> _metaData;
public MutableComponentModelImpl(String componentClassName, Logger logger, Resource baseResource,
- ComponentModel parentModel)
+ ComponentModel parentModel)
{
_componentClassName = componentClassName;
_logger = logger;
@@ -153,7 +148,7 @@
}
public MutableEmbeddedComponentModel addEmbeddedComponent(String id, String type,
- String componentClassName, Location location)
+ String componentClassName, Location location)
{
// TODO: Parent compent model? Or would we simply override the parent?
@@ -165,7 +160,8 @@
_componentClassName));
MutableEmbeddedComponentModel embedded = new MutableEmbeddedComponentModelImpl(id, type,
- componentClassName, _componentClassName, location);
+ componentClassName,
+ _componentClassName, location);
_embeddedComponents.put(id, embedded);