tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r594319 [10/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/or...
Date Mon, 12 Nov 2007 22:23:28 GMT
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHub.java Mon Nov 12 14:22:31 2007
@@ -1,20 +1,20 @@
-// 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.services;
 
-import org.apache.tapestry.internal.events.UpdateListener;
+import org.apache.tapestry.internal.events.UpdateListener;
 
 /**
  * Manages a set of {@link org.apache.tapestry.internal.events.UpdateListener}s. Periodically (say, every
@@ -24,8 +24,7 @@
  * as classes or template files) can check to see if any file they've used has changed. If so, the
  * service can invalidate its internal cache, or notify other services (typically via
  * {@link org.apache.tapestry.internal.events.InvalidationListener} that they should do the same.
- * 
- * 
+ *
  * @see org.apache.tapestry.internal.util.URLChangeTracker
  */
 public interface UpdateListenerHub

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/UpdateListenerHubImpl.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,10 @@
 
 package org.apache.tapestry.internal.services;
 
+import org.apache.tapestry.internal.events.UpdateListener;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeList;
 
 import java.util.List;
-
-import org.apache.tapestry.internal.events.UpdateListener;
 
 public class UpdateListenerHubImpl implements UpdateListenerHub
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationConstraintGeneratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationConstraintGeneratorImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationConstraintGeneratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationConstraintGeneratorImpl.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,12 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.util.List;
-
 import org.apache.tapestry.ioc.AnnotationProvider;
 import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
 import org.apache.tapestry.services.ValidationConstraintGenerator;
+
+import java.util.List;
 
 public class ValidationConstraintGeneratorImpl implements ValidationConstraintGenerator
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,19 +14,18 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-
-import java.util.Collection;
-import java.util.Locale;
-import java.util.Map;
-
 import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.MessageFormatter;
 import org.apache.tapestry.ioc.Messages;
 import org.apache.tapestry.ioc.Resource;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
 import org.apache.tapestry.services.ValidationMessagesSource;
 
+import java.util.Collection;
+import java.util.Locale;
+import java.util.Map;
+
 public class ValidationMessagesSourceImpl implements ValidationMessagesSource, UpdateListener
 {
     private final MessagesSource _messagesSource;
@@ -62,7 +61,9 @@
             return _parent;
         }
 
-    };
+    }
+
+    ;
 
     /**
      * Delegates to a {@link Messages} instance obtained from the {@link MessagesSource}. This
@@ -115,7 +116,7 @@
     }
 
     ValidationMessagesSourceImpl(Collection<String> bundles, Resource classpathRoot,
-            URLChangeTracker tracker)
+                                 URLChangeTracker tracker)
     {
         _messagesSource = new MessagesSourceImpl(tracker);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidatorSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidatorSpecification.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidatorSpecification.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidatorSpecification.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
 
 package org.apache.tapestry.internal.services;
 
-/** Validator type and constraint values parsed from a validator specification. */
+/**
+ * Validator type and constraint values parsed from a validator specification.
+ */
 class ValidatorSpecification
 {
     private final String _validatorType;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValueEncoderSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValueEncoderSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValueEncoderSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValueEncoderSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,16 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.util.Map;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.ValueEncoder;
 import org.apache.tapestry.internal.events.InvalidationListener;
+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.util.StrategyRegistry;
 import org.apache.tapestry.services.ValueEncoderFactory;
 import org.apache.tapestry.services.ValueEncoderSource;
+
+import java.util.Map;
 
 public class ValueEncoderSourceImpl implements ValueEncoderSource, InvalidationListener
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/BlockImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/BlockImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/BlockImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/BlockImpl.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
 
 package org.apache.tapestry.internal.structure;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.util.List;
-
 import org.apache.tapestry.Block;
 import org.apache.tapestry.MarkupWriter;
 import org.apache.tapestry.ioc.BaseLocatable;
 import org.apache.tapestry.ioc.Location;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import org.apache.tapestry.runtime.RenderCommand;
 import org.apache.tapestry.runtime.RenderQueue;
+
+import java.util.List;
 
 public class BlockImpl extends BaseLocatable implements Block, BodyPageElement, RenderCommand
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/CommentPageElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/CommentPageElement.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/CommentPageElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/CommentPageElement.java Mon Nov 12 14:22:31 2007
@@ -21,7 +21,7 @@
 
 /**
  * Renders a text comment.
- * 
+ *
  * @see CommentToken
  * @see PageElementFactory#newCommentElement(CommentToken)
  */

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentCallback.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentCallback.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentCallback.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentCallback.java Mon Nov 12 14:22:31 2007
@@ -1,22 +1,24 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.structure;
 
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry.runtime.Component;
 
-/** Callback interface, used when invoking lifecycle methods on components. */
+/**
+ * Callback interface, used when invoking lifecycle methods on components.
+ */
 public interface ComponentCallback
 {
     /**

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElement.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElement.java Mon Nov 12 14:22:31 2007
@@ -1,37 +1,37 @@
-// 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.structure;
 
-import org.apache.tapestry.Block;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ComponentResourcesCommon;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.InternalComponentResourcesCommon;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.model.ParameterModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentEvent;
-import org.apache.tapestry.runtime.RenderQueue;
-import org.apache.tapestry.services.PersistentFieldManager;
+import org.apache.tapestry.Block;
+import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry.ComponentResourcesCommon;
+import org.apache.tapestry.internal.InternalComponentResources;
+import org.apache.tapestry.internal.InternalComponentResourcesCommon;
+import org.apache.tapestry.internal.services.Instantiator;
+import org.apache.tapestry.model.ParameterModel;
+import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry.runtime.ComponentEvent;
+import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry.services.PersistentFieldManager;
 
 /**
  * Extended version of {@link org.apache.tapestry.internal.structure.PageElement} for elements that
  * are, in fact, components (rather than just static markup).
  */
 public interface ComponentPageElement extends ComponentResourcesCommon,
-        InternalComponentResourcesCommon, PageElement, BodyPageElement
+                                              InternalComponentResourcesCommon, PageElement, BodyPageElement
 {
     /**
      * Returns the core component associated with this page element (as opposed to any mixins
@@ -39,10 +39,14 @@
      */
     Component getComponent();
 
-    /** Returns the resources associated with the core component. */
+    /**
+     * Returns the resources associated with the core component.
+     */
     InternalComponentResources getComponentResources();
 
-    /** Returns the page which contains this component. */
+    /**
+     * Returns the page which contains this component.
+     */
     Page getContainingPage();
 
     /**
@@ -61,7 +65,7 @@
 
     /**
      * Used during the contruction of a page to add a non-anonymous Block to the component.
-     * 
+     *
      * @see ComponentResourcesCommon#getBlock(String)
      */
     void addBlock(String blockId, Block block);
@@ -74,32 +78,30 @@
 
     /**
      * Adds a mixin.
-     * 
-     * @param instantiator
-     *            used to instantiate an instance of the mixin
+     *
+     * @param instantiator used to instantiate an instance of the mixin
      */
     void addMixin(Instantiator instantiator);
 
     /**
      * Retrieves a component page element by its id. The search is caseless.
-     * 
-     * @param id
-     *            used to locate the element
+     *
+     * @param id used to locate the element
      * @return the page element
-     * @throws IllegalArgumentException
-     *             if no component exists with the given id
+     * @throws IllegalArgumentException if no component exists with the given id
      */
     ComponentPageElement getEmbeddedElement(String id);
 
-    /** Invoked when the component should render its body. */
+    /**
+     * Invoked when the component should render its body.
+     */
     void enqueueBeforeRenderBody(RenderQueue queue);
 
     /**
      * Asks each mixin and component to {@link Component#handleComponentEvent(ComponentEvent)},
      * returning true if any handler was found.
-     * 
-     * @param event
-     *            to be handled
+     *
+     * @param event to be handled
      * @return true if a handler was found
      */
     boolean handleEvent(ComponentEvent event);
@@ -108,9 +110,8 @@
      * Searches the component (and its mixins) for a formal parameter matching the given name. If
      * found, the {@link ParameterModel#getDefaultBindingPrefix() default binding prefix} is
      * returned. Otherwise the parameter is an informal parameter, and null is returned.
-     * 
-     * @param parameterName
-     *            the name of the parameter, possibly qualified with the mixin class name
+     *
+     * @param parameterName the name of the parameter, possibly qualified with the mixin class name
      * @return the default binding prefix, or null
      */
     String getDefaultBindingPrefix(String parameterName);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java Mon Nov 12 14:22:31 2007
@@ -14,23 +14,7 @@
 
 package org.apache.tapestry.internal.structure;
 
-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 java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.BlockNotFoundException;
-import org.apache.tapestry.ComponentEventHandler;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.Renderable;
+import org.apache.tapestry.*;
 import org.apache.tapestry.dom.Element;
 import org.apache.tapestry.internal.InternalComponentResources;
 import org.apache.tapestry.internal.TapestryInternalUtils;
@@ -40,34 +24,37 @@
 import org.apache.tapestry.internal.util.NotificationEventHandler;
 import org.apache.tapestry.ioc.BaseLocatable;
 import org.apache.tapestry.ioc.Location;
+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 org.apache.tapestry.ioc.internal.util.InternalUtils;
 import org.apache.tapestry.ioc.internal.util.TapestryException;
 import org.apache.tapestry.ioc.services.TypeCoercer;
 import org.apache.tapestry.model.ComponentModel;
 import org.apache.tapestry.model.ParameterModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentEvent;
-import org.apache.tapestry.runtime.Event;
-import org.apache.tapestry.runtime.PageLifecycleListener;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry.runtime.*;
 import org.apache.tapestry.services.ComponentMessagesSource;
 import org.slf4j.Logger;
 
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * Implements {@link org.apache.tapestry.internal.structure.PageElement} and
  * {@link org.apache.tapestry.internal.InternalComponentResources}, and represents a component
  * within an overall page. Much of a component page element's behavior is delegated to user code,
  * via a {@link org.apache.tapestry.runtime.Component} instance.
- * <p>
+ * <p/>
  * Once instantiated, a ComponentPageElementImpl should be registered as a
  * {@link org.apache.tapestry.internal.structure.Page}. This could be done inside the constructors,
  * but that tends to complicate unit tests, so its done by
  * {@link org.apache.tapestry.internal.services.PageElementFactoryImpl}.
- * <p>
+ * <p/>
  */
 public class ComponentPageElementImpl extends BaseLocatable implements ComponentPageElement,
-        PageLifecycleListener
+                                                                       PageLifecycleListener
 {
     private static final ComponentCallback CONTAINING_PAGE_DID_ATTACH = new ComponentCallback()
     {
@@ -180,7 +167,9 @@
             for (RenderCommand command : _commands)
                 queue.push(command);
         }
-    };
+    }
+
+    ;
 
     private final RenderCommand _afterRender = new RenderCommand()
     {
@@ -399,7 +388,7 @@
 
                 if (current != _elementAtSetup)
                     throw new TapestryException(StructureMessages.unbalancedElements(_completeId),
-                            getLocation(), null);
+                                                getLocation(), null);
 
                 _elementAtSetup = null;
 
@@ -449,7 +438,9 @@
 
     private boolean _loaded;
 
-    /** Map from mixin name to resources for the mixin. Created when first mixin is added. */
+    /**
+     * Map from mixin name to resources for the mixin. Created when first mixin is added.
+     */
     private Map<String, InternalComponentResources> _mixinsByShortName;
 
     private final String _nestedId;
@@ -508,30 +499,22 @@
     /**
      * Constructor for other components embedded within the root component or at deeper levels of
      * the hierarchy.
-     * 
-     * @param page
-     *            ultimately containing this component
-     * @param container
-     *            component immediately containing this component (may be null for a root component)
-     * @param id
-     *            unique (within the container) id for this component (may be null for a root
-     *            component)
-     * @param elementName
-     *            the name of the element which represents this component in the template, or null
-     *            for &lt;comp&gt; element or a page component
-     * @param instantiator
-     *            used to create the new component instance and access the component's model
-     * @param typeCoercer
-     *            used when coercing parameter values
-     * @param messagesSource
-     *            Provides access to the component's message catalog
-     * @param location
-     *            location of the element (within a template), used as part of exception reporting
+     *
+     * @param page           ultimately containing this component
+     * @param container      component immediately containing this component (may be null for a root component)
+     * @param id             unique (within the container) id for this component (may be null for a root
+     *                       component)
+     * @param elementName    the name of the element which represents this component in the template, or null
+     *                       for &lt;comp&gt; element or a page component
+     * @param instantiator   used to create the new component instance and access the component's model
+     * @param typeCoercer    used when coercing parameter values
+     * @param messagesSource Provides access to the component's message catalog
+     * @param location       location of the element (within a template), used as part of exception reporting
      */
 
     public ComponentPageElementImpl(Page page, ComponentPageElement container, String id,
-            String elementName, Instantiator instantiator, TypeCoercer typeCoercer,
-            ComponentMessagesSource messagesSource, Location location)
+                                    String elementName, Instantiator instantiator, TypeCoercer typeCoercer,
+                                    ComponentMessagesSource messagesSource, Location location)
     {
         super(location);
 
@@ -546,7 +529,7 @@
                 .getComponentResources();
 
         _coreResources = new InternalComponentResourcesImpl(this, containerResources, instantiator,
-                _typeCoercer, _messagesSource);
+                                                            _typeCoercer, _messagesSource);
 
         _coreComponent = _coreResources.getComponent();
 
@@ -585,7 +568,7 @@
      * Constructor for the root component of a page.
      */
     public ComponentPageElementImpl(Page page, Instantiator instantiator, TypeCoercer typeCoercer,
-            ComponentMessagesSource messagesSource)
+                                    ComponentMessagesSource messagesSource)
     {
         this(page, null, null, null, instantiator, typeCoercer, messagesSource, null);
     }
@@ -599,7 +582,7 @@
         ComponentPageElement existing = _children.get(childId);
         if (existing != null)
             throw new TapestryException(StructureMessages.duplicateChildComponent(this, childId),
-                    child, null);
+                                        child, null);
 
         _children.put(childId, child);
     }
@@ -616,7 +599,8 @@
         String mixinName = TapestryInternalUtils.lastTerm(mixinClassName);
 
         InternalComponentResourcesImpl resources = new InternalComponentResourcesImpl(this,
-                _coreResources, instantiator, _typeCoercer, _messagesSource);
+                                                                                      _coreResources, instantiator,
+                                                                                      _typeCoercer, _messagesSource);
 
         // TODO: Check for name collision?
 
@@ -700,7 +684,7 @@
     }
 
     private void addUnboundParameterNames(String prefix, List<String> unbound,
-            InternalComponentResources resource)
+                                          InternalComponentResources resource)
     {
         ComponentModel model = resource.getComponentModel();
 
@@ -829,7 +813,7 @@
 
         if (embeddedElement == null)
             throw new TapestryException(StructureMessages.noSuchComponent(this, embeddedId), this,
-                    null);
+                                        null);
 
         return embeddedElement;
     }
@@ -905,12 +889,10 @@
 
     /**
      * Invokes a callback on the component instances (the core component plus any mixins).
-     * 
-     * @param reverse
-     *            if true, the callbacks are in the reverse of the normal order (this is associated
-     *            with AfterXXX phases)
-     * @param callback
-     *            the object to receive each component instance
+     *
+     * @param reverse  if true, the callbacks are in the reverse of the normal order (this is associated
+     *                 with AfterXXX phases)
+     * @param callback the object to receive each component instance
      */
     private void invoke(boolean reverse, ComponentCallback callback)
     {
@@ -925,7 +907,7 @@
             }
 
             Iterator<Component> i = reverse ? InternalUtils.reverseIterator(_components)
-                    : _components.iterator();
+                                    : _components.iterator();
 
             while (i.hasNext())
                 callback.run(i.next());
@@ -954,13 +936,17 @@
         if (_loaded) _page.persistFieldChange(resources, fieldName, newValue);
     }
 
-    /** Generate a toString() for the inner classes that represent render phases. */
+    /**
+     * Generate a toString() for the inner classes that represent render phases.
+     */
     private String phaseToString(String phaseName)
     {
         return String.format("%s[%s]", phaseName, _completeId);
     }
 
-    /** Pushes the SetupRender phase state onto the queue. */
+    /**
+     * Pushes the SetupRender phase state onto the queue.
+     */
     public final void render(MarkupWriter writer, RenderQueue queue)
     {
         // TODO: An error if the _render flag is already set (recursive rendering not
@@ -993,7 +979,7 @@
         while (component != null)
         {
             ComponentEvent event = new ComponentEventImpl(eventType, componentId, context, handler,
-                    _typeCoercer);
+                                                          _typeCoercer);
 
             result |= component.handleEvent(event);
 
@@ -1045,7 +1031,7 @@
 
         if (result == null)
             throw new BlockNotFoundException(StructureMessages.blockNotFound(_completeId, id),
-                    getLocation());
+                                             getLocation());
 
         return result;
     }
@@ -1063,7 +1049,7 @@
 
         if (_blocks.containsKey(blockId))
             throw new TapestryException(StructureMessages.duplicateBlock(this, blockId), block,
-                    null);
+                                        null);
 
         _blocks.put(blockId, block);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/DTDPageElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/DTDPageElement.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/DTDPageElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/DTDPageElement.java Mon Nov 12 14:22:31 2007
@@ -24,26 +24,27 @@
 
 public class DTDPageElement implements PageElement
 {
-    
+
     private final String _name;
     private final String _publicId;
     private final String _systemId;
-    
-    public DTDPageElement(String name, String publicId, String systemId) 
+
+    public DTDPageElement(String name, String publicId, String systemId)
     {
-        _name=name;
-        _publicId=publicId;
-        _systemId=systemId;
+        _name = name;
+        _publicId = publicId;
+        _systemId = systemId;
     }
 
     public void render(MarkupWriter writer, RenderQueue queue)
     {
         writer.getDocument().dtd(_name, _publicId, _systemId);
     }
-    
+
     @Override
-    public String toString() {
-        return String.format("DTD[name=%s; publicId=%s; systemId=%s]",_name,_publicId,_systemId);
+    public String toString()
+    {
+        return String.format("DTD[name=%s; publicId=%s; systemId=%s]", _name, _publicId, _systemId);
     }
 
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ExpansionPageElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ExpansionPageElement.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ExpansionPageElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ExpansionPageElement.java Mon Nov 12 14:22:31 2007
@@ -1,26 +1,26 @@
-// 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.structure;
 
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry.Binding;
+import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry.runtime.RenderQueue;
 
 /**
- * 
+ *
  */
 public class ExpansionPageElement implements PageElement
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java Mon Nov 12 14:22:31 2007
@@ -14,23 +14,14 @@
 
 package org.apache.tapestry.internal.structure;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.ComponentEventHandler;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.*;
 import org.apache.tapestry.internal.InternalComponentResources;
 import org.apache.tapestry.internal.services.Instantiator;
 import org.apache.tapestry.ioc.AnnotationProvider;
 import org.apache.tapestry.ioc.Location;
 import org.apache.tapestry.ioc.Messages;
 import org.apache.tapestry.ioc.Resource;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
 import org.apache.tapestry.ioc.internal.util.TapestryException;
 import org.apache.tapestry.ioc.services.TypeCoercer;
 import org.apache.tapestry.model.ComponentModel;
@@ -39,6 +30,9 @@
 import org.apache.tapestry.services.ComponentMessagesSource;
 import org.slf4j.Logger;
 
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * The bridge between a component and its {@link ComponentPageElement}, that supplies all kinds of
  * resources to the component, including access to its parameters, parameter bindings, and
@@ -64,8 +58,8 @@
     private Messages _messages;
 
     public InternalComponentResourcesImpl(ComponentPageElement element,
-            ComponentResources containerResources, Instantiator componentInstantiator,
-            TypeCoercer typeCoercer, ComponentMessagesSource messagesSource)
+                                          ComponentResources containerResources, Instantiator componentInstantiator,
+                                          TypeCoercer typeCoercer, ComponentMessagesSource messagesSource)
     {
         _element = element;
         _containerResources = containerResources;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/Page.java Mon Nov 12 14:22:31 2007
@@ -14,23 +14,23 @@
 
 package org.apache.tapestry.internal.structure;
 
-import java.util.Locale;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.Link;
 import org.apache.tapestry.runtime.Component;
 import org.apache.tapestry.runtime.PageLifecycleListener;
 import org.slf4j.Logger;
 
+import java.util.Locale;
+
 /**
  * Represents a unique page within the application. Pages are part of the <em>internal</em>
  * structure of a Tapestry application; end developers who refer to "page" are really referring to
  * the {@link #getRootComponent() root component} of the actual page.
- * <p>
+ * <p/>
  * One of the most important aspects of a Page is that it <em>does not</em> have to be coded in a
  * thread-safe manner. Pages are always accessed within a single thread, associated with a single
  * incoming request.
- * <p>
+ * <p/>
  * The Page object is never visible to end-user code. The page also exists to provide a kind of
  * service to components embedded (directly or indirectly) within the page.
  */
@@ -67,13 +67,13 @@
     /**
      * Invoked to inform the page that it is being detached from the current request. This occurs
      * just before the page is returned to the page pool.
-     * <p>
+     * <p/>
      * A page may be clean or dirty. A page is dirty if its dirty count is greater than zero
      * (meaning that, during the render of the page, some components did not fully render), or if
      * any of its listeners throw an exception from containingPageDidDetech().
-     * <p>
+     * <p/>
      * The page pool should discard pages that are dirty, rather than store them into the pool.
-     * 
+     *
      * @return true if the page is "dirty", false otherwise
      * @see org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidDetach()
      */
@@ -89,7 +89,7 @@
 
     /**
      * Inform the page that it is now completely loaded.
-     * 
+     *
      * @see org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidLoad()
      */
 
@@ -109,15 +109,14 @@
     /**
      * Retrieves a component element by its nested id (a sequence of simple ids, separated by dots).
      * A nested id of '' (the empty string) returns the root element of the page.
-     * 
-     * @throws IllegalArgumentException
-     *             if the nestedId does not correspond to a component
+     *
+     * @throws IllegalArgumentException if the nestedId does not correspond to a component
      */
     ComponentPageElement getComponentElementByNestedId(String nestedId);
 
     /**
      * Creates a link that will trigger behavior in a component within the page.
-     * 
+     *
      * @param element
      * @param action
      * @param forForm
@@ -125,41 +124,33 @@
      * @return
      */
     Link createActionLink(ComponentPageElement element, String action, boolean forForm,
-            Object... context);
+                          Object... context);
 
     /**
      * Creates a link to the named page.
-     * 
-     * @param pageName
-     *            the logical name of the page
-     * @param override
-     *            if true, the provided context is used even if empty
-     * @param context
-     *            optional activation context for the page (if not provided, it is generated from
-     *            the page itself)
+     *
+     * @param pageName the logical name of the page
+     * @param override if true, the provided context is used even if empty
+     * @param context  optional activation context for the page (if not provided, it is generated from
+     *                 the page itself)
      */
     Link createPageLink(String pageName, boolean override, Object... context);
 
     /**
      * Posts a change to a persistent field.
-     * 
-     * @param resources
-     *            the component resources for the component or mixin containing the field whose
-     *            value changed
-     * @param fieldName
-     *            the name of the field
-     * @param newValue
-     *            the new value for the field
+     *
+     * @param resources the component resources for the component or mixin containing the field whose
+     *                  value changed
+     * @param fieldName the name of the field
+     * @param newValue  the new value for the field
      */
     void persistFieldChange(ComponentResources resources, String fieldName, Object newValue);
 
     /**
      * Gets a change for a field within the component.
-     * 
-     * @param element
-     *            the element for which a persistent field value is required
-     * @param fieldName
-     *            the name of the persistent field
+     *
+     * @param element   the element for which a persistent field value is required
+     * @param fieldName the name of the persistent field
      * @return the value, or null if no value is stored
      */
     Object getFieldChange(ComponentPageElement element, String fieldName);
@@ -171,6 +162,8 @@
      */
     void incrementDirtyCount();
 
-    /** Called as a component finishes rendering itself. */
+    /**
+     * Called as a component finishes rendering itself.
+     */
     void decrementDirtyCount();
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,11 @@
 
 package org.apache.tapestry.internal.structure;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import java.util.List;
-import java.util.Locale;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.Link;
 import org.apache.tapestry.internal.services.LinkFactory;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
 import org.apache.tapestry.ioc.internal.util.InternalUtils;
 import org.apache.tapestry.runtime.Component;
 import org.apache.tapestry.runtime.PageLifecycleListener;
@@ -30,6 +26,9 @@
 import org.apache.tapestry.services.PersistentFieldManager;
 import org.slf4j.Logger;
 
+import java.util.List;
+import java.util.Locale;
+
 public class PageImpl implements Page
 {
     private final String _logicalPageName;
@@ -53,7 +52,7 @@
     private PersistentFieldBundle _fieldBundle;
 
     public PageImpl(String logicalPageName, Locale locale, LinkFactory linkFactory,
-            PersistentFieldManager persistentFieldManager)
+                    PersistentFieldManager persistentFieldManager)
     {
         _logicalPageName = logicalPageName;
         _locale = locale;
@@ -153,7 +152,7 @@
     }
 
     public Link createActionLink(ComponentPageElement element, String action, boolean forForm,
-            Object... context)
+                                 Object... context)
     {
         return _linkFactory.createActionLink(element, action, forForm, context);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StartElementPageElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StartElementPageElement.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StartElementPageElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StartElementPageElement.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,24 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.structure;
 
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.runtime.RenderQueue;
 
 /**
- * 
+ *
  */
 public class StartElementPageElement implements PageElement
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/StructureMessages.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry.internal.structure;
 
-import java.util.List;
-
 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.List;
+
 class StructureMessages
 {
     private static final Messages MESSAGES = MessagesImpl.forClass(StructureMessages.class);
@@ -50,7 +50,7 @@
     }
 
     static String missingMixinForParameter(String componentId, String mixinName,
-            String parameterName)
+                                           String parameterName)
     {
         return MESSAGES
                 .format("missing-mixin-for-parameter", componentId, mixinName, parameterName);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/TextPageElement.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,24 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.structure;
 
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.runtime.RenderQueue;
 
 /**
- * 
+ *
  */
 public class TextPageElement implements PageElement
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ActionLinkInvoker.java Mon Nov 12 14:22:31 2007
@@ -16,11 +16,7 @@
 
 import org.apache.tapestry.Link;
 import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.internal.services.ActionLinkTarget;
-import org.apache.tapestry.internal.services.ComponentInvocation;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.internal.services.InvocationTarget;
-import org.apache.tapestry.internal.services.LinkActionResponseGenerator;
+import org.apache.tapestry.internal.services.*;
 import org.apache.tapestry.ioc.Registry;
 import org.apache.tapestry.ioc.internal.util.Defense;
 import org.apache.tapestry.services.ActionResponseGenerator;
@@ -40,11 +36,12 @@
     private final ComponentInvocationMap _componentInvocationMap;
 
     public ActionLinkInvoker(Registry registry, ComponentInvoker followupInvoker,
-            ComponentInvocationMap componentInvocationMap)
+                             ComponentInvocationMap componentInvocationMap)
     {
         _registry = registry;
         _followupInvoker = followupInvoker;
-        _componentActionRequestHandler = _registry.getService("ComponentActionRequestHandler", ComponentActionRequestHandler.class);
+        _componentActionRequestHandler = _registry.getService("ComponentActionRequestHandler",
+                                                              ComponentActionRequestHandler.class);
         _componentInvocationMap = componentInvocationMap;
 
     }
@@ -52,9 +49,8 @@
     /**
      * Click on the action link and get another link in return. Then follow up the link with another
      * {@link ComponentInvoker}.
-     * 
-     * @param invocation
-     *            The ComponentInvocation object corresponding to the action link.
+     *
+     * @param invocation The ComponentInvocation object corresponding to the action link.
      * @return The DOM created. Typically you will assert against it.
      */
     public Document invoke(ComponentInvocation invocation)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/CodeEq.java Mon Nov 12 14:22:31 2007
@@ -1,30 +1,27 @@
-// 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.test;
 
-import static org.easymock.EasyMock.reportMatcher;
-
-import org.easymock.IArgumentMatcher;
+import static org.easymock.EasyMock.reportMatcher;
+import org.easymock.IArgumentMatcher;
 
 /**
  * Special version of string equality used to compare two snippets of code. This is somewhat
  * simpleminded (it certainly doesn't understand about literal strings in quotes). It works by
  * eliminating unecessary whitespace around curly braces, then reducing all whitespace to a single
  * space.
- * 
- * 
  */
 public class CodeEq implements IArgumentMatcher
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ComponentInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ComponentInvoker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ComponentInvoker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/ComponentInvoker.java Mon Nov 12 14:22:31 2007
@@ -23,8 +23,7 @@
 public interface ComponentInvoker
 {
     /**
-     * @param invocation
-     *            The ComponentInvocation object to be invoked.
+     * @param invocation The ComponentInvocation object to be invoked.
      * @return The DOM created. Typically you will assert against it.
      */
     Document invoke(ComponentInvocation invocation);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java Mon Nov 12 14:22:31 2007
@@ -14,59 +14,22 @@
 
 package org.apache.tapestry.internal.test;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.io.Reader;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.ComponentResourcesCommon;
 import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.SingleKeySymbolProvider;
-import org.apache.tapestry.internal.SyntheticModuleDef;
-import org.apache.tapestry.internal.SyntheticSymbolSourceContributionDef;
+import org.apache.tapestry.internal.*;
 import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.parser.ComponentTemplate;
 import org.apache.tapestry.internal.parser.TemplateToken;
-import org.apache.tapestry.internal.services.ComponentInstantiatorSource;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.internal.services.ComponentTemplateSource;
-import org.apache.tapestry.internal.services.DocumentHeadBuilder;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.internal.services.LinkFactory;
-import org.apache.tapestry.internal.services.LinkFactoryListener;
-import org.apache.tapestry.internal.services.PageElementFactory;
-import org.apache.tapestry.internal.services.PageLoader;
-import org.apache.tapestry.internal.services.PagePool;
-import org.apache.tapestry.internal.services.PageResponseRenderer;
-import org.apache.tapestry.internal.services.PageTemplateLocator;
-import org.apache.tapestry.internal.services.RequestPageCache;
-import org.apache.tapestry.internal.services.ResourceCache;
-import org.apache.tapestry.internal.services.ResourceStreamer;
-import org.apache.tapestry.internal.services.TemplateParser;
+import org.apache.tapestry.internal.services.*;
 import org.apache.tapestry.internal.structure.ComponentPageElement;
 import org.apache.tapestry.internal.structure.Page;
 import org.apache.tapestry.internal.structure.PageElement;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.RegistryBuilder;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry.ioc.*;
 import org.apache.tapestry.ioc.def.ContributionDef;
 import org.apache.tapestry.ioc.def.ModuleDef;
 import org.apache.tapestry.ioc.internal.InternalRegistry;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
 import org.apache.tapestry.ioc.internal.util.MessagesImpl;
 import org.apache.tapestry.ioc.services.SymbolProvider;
 import org.apache.tapestry.model.ComponentModel;
@@ -78,11 +41,18 @@
 import org.apache.tapestry.services.TapestryModule;
 import org.apache.tapestry.test.TapestryTestCase;
 import org.easymock.EasyMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.isA;
 import org.slf4j.Logger;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
 
+import java.io.*;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
 /**
  * Contains additional factory and training methods related to internal interfaces.
  */
@@ -104,7 +74,7 @@
         SymbolProvider provider = new SingleKeySymbolProvider(
                 InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL, "servlet");
         ContributionDef contribution = new SyntheticSymbolSourceContributionDef("AliasMode",
-                provider, "before:ApplicationDefaults");
+                                                                                provider, "before:ApplicationDefaults");
 
         ModuleDef module = new SyntheticModuleDef(contribution);
 
@@ -177,7 +147,7 @@
     }
 
     protected final <T> void train_getService(InternalRegistry registry, String serviceId,
-            Class<T> serviceInterface, T service)
+                                              Class<T> serviceInterface, T service)
     {
         expect(registry.getService(serviceId, serviceInterface)).andReturn(service);
 
@@ -214,7 +184,7 @@
     }
 
     protected final void train_parseTemplate(TemplateParser parser, Resource resource,
-            ComponentTemplate template)
+                                             ComponentTemplate template)
     {
         expect(parser.parseTemplate(resource)).andReturn(template);
     }
@@ -250,7 +220,7 @@
     }
 
     protected final void train_resolvePageClassNameToPageName(ComponentClassResolver resolver,
-            String pageClassName, String pageName)
+                                                              String pageClassName, String pageName)
     {
         expect(resolver.resolvePageClassNameToPageName(pageClassName)).andReturn(pageName);
     }
@@ -261,7 +231,7 @@
     }
 
     protected final void train_getComponentResources(ComponentPageElement element,
-            InternalComponentResources resources)
+                                                     InternalComponentResources resources)
     {
         expect(element.getComponentResources()).andReturn(resources).atLeastOnce();
     }
@@ -272,7 +242,7 @@
     }
 
     protected final void train_newRenderBodyElement(PageElementFactory elementFactory,
-            ComponentPageElement component, PageElement body)
+                                                    ComponentPageElement component, PageElement body)
     {
         expect(elementFactory.newRenderBodyElement(component)).andReturn(body);
     }
@@ -288,9 +258,10 @@
     }
 
     protected final void train_newComponentElement(PageElementFactory elementFactory,
-            ComponentPageElement container, String embeddedId, String embeddedType,
-            String componentClassName, String elementName, Location location,
-            ComponentPageElement embedded)
+                                                   ComponentPageElement container, String embeddedId,
+                                                   String embeddedType,
+                                                   String componentClassName, String elementName, Location location,
+                                                   ComponentPageElement embedded)
     {
         expect(
                 elementFactory.newComponentElement(
@@ -309,7 +280,7 @@
     }
 
     protected final void train_getEmbeddedComponentModel(ComponentModel model, String embeddedId,
-            EmbeddedComponentModel emodel)
+                                                         EmbeddedComponentModel emodel)
     {
         expect(model.getEmbeddedComponentModel(embeddedId)).andReturn(emodel).atLeastOnce();
     }
@@ -350,7 +321,7 @@
     }
 
     protected void train_getTemplate(ComponentTemplateSource templateSource, ComponentModel model,
-            Locale locale, ComponentTemplate template)
+                                     Locale locale, ComponentTemplate template)
     {
         expect(templateSource.getTemplate(model, locale)).andReturn(template);
     }
@@ -361,7 +332,7 @@
     }
 
     protected final void train_newRootComponentElement(PageElementFactory elementFactory,
-            String className, ComponentPageElement rootElement)
+                                                       String className, ComponentPageElement rootElement)
     {
         expect(elementFactory.newRootComponentElement(isA(Page.class), eq(className))).andReturn(
                 rootElement);
@@ -388,7 +359,7 @@
     }
 
     protected final void train_getComponentElementByNestedId(Page page, String nestedId,
-            ComponentPageElement element)
+                                                             ComponentPageElement element)
     {
         expect(page.getComponentElementByNestedId(nestedId)).andReturn(element).atLeastOnce();
     }
@@ -419,7 +390,7 @@
     }
 
     protected final void train_requiresDigest(ResourceCache cache, Resource resource,
-            boolean requiresChecksum)
+                                              boolean requiresChecksum)
     {
         expect(cache.requiresDigest(resource)).andReturn(requiresChecksum);
     }
@@ -430,7 +401,7 @@
     }
 
     protected final void train_getTimeModified(ResourceCache cache, Resource resource,
-            long timeModified)
+                                               long timeModified)
     {
         expect(cache.getTimeModified(resource)).andReturn(timeModified).atLeastOnce();
     }
@@ -446,7 +417,7 @@
     }
 
     protected final void train_findPageTemplateResource(PageTemplateLocator locator,
-            ComponentModel model, Locale locale, Resource resource)
+                                                        ComponentModel model, Locale locale, Resource resource)
     {
         expect(locator.findPageTemplateResource(model, locale)).andReturn(resource).atLeastOnce();
     }
@@ -456,7 +427,9 @@
         return newMock(PageTemplateLocator.class);
     }
 
-    /** Returns the default validator messages. */
+    /**
+     * Returns the default validator messages.
+     */
     protected final Messages validationMessages()
     {
         if (_validationMessages == null)
@@ -501,7 +474,7 @@
     }
 
     protected final void train_isPageName(ComponentClassResolver resolver, String pageName,
-            boolean result)
+                                          boolean result)
     {
         expect(resolver.isPageName(pageName)).andReturn(result);
     }
@@ -514,9 +487,8 @@
     /**
      * Reads the content of a file into a string. Each line is trimmed of line separators and
      * leading/trailing whitespace.
-     * 
-     * @param trim
-     *            trim each line of whitespace
+     *
+     * @param trim trim each line of whitespace
      */
     protected final String readFile(String file, boolean trim) throws Exception
     {
@@ -551,7 +523,7 @@
     }
 
     protected final void train_canonicalizePageName(ComponentClassResolver resolver,
-            String pageName, String canonicalized)
+                                                    String pageName, String canonicalized)
     {
         expect(resolver.canonicalizePageName(pageName)).andReturn(canonicalized);
     }
@@ -562,7 +534,7 @@
     }
 
     protected final void train_resolvePageNameToClassName(ComponentClassResolver resolver,
-            String pageName, String pageClassName)
+                                                          String pageName, String pageClassName)
     {
         expect(resolver.resolvePageNameToClassName(pageName)).andReturn(pageClassName)
                 .atLeastOnce();

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageLinkInvoker.java Mon Nov 12 14:22:31 2007
@@ -41,9 +41,8 @@
 
     /**
      * Click on the page link.
-     * 
-     * @param invocation
-     *            The ComponentInvocation object corresponding to the page link.
+     *
+     * @param invocation The ComponentInvocation object corresponding to the page link.
      * @return The DOM created. Typically you will assert against it.
      */
     public Document invoke(ComponentInvocation invocation)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterComponentInvocationMap.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
 
 package org.apache.tapestry.internal.test;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Map;
-
 import org.apache.tapestry.Link;
 import org.apache.tapestry.dom.Element;
 import org.apache.tapestry.internal.services.ComponentInvocation;
 import org.apache.tapestry.internal.services.ComponentInvocationMap;
 import org.apache.tapestry.internal.services.NoOpComponentInvocationMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
 import org.apache.tapestry.test.PageTester;
+
+import java.util.Map;
 
 /**
  * This is the real implementation, used by {@link PageTester}. The typical implementation,

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterContext.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
 
 package org.apache.tapestry.internal.test;
 
+import org.apache.tapestry.services.Context;
+
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 
-import org.apache.tapestry.services.Context;
-
 public class PageTesterContext implements Context
 {
     private final String _contextRoot;
@@ -39,7 +39,10 @@
     {
         File f = new File(_contextRoot + path);
 
-        if (!f.exists() || !f.isFile()) { return null; }
+        if (!f.exists() || !f.isFile())
+        {
+            return null;
+        }
         try
         {
             return f.toURL();

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterModule.java Mon Nov 12 14:22:31 2007
@@ -41,7 +41,7 @@
     }
 
     public static void contributeAlias(Configuration<AliasContribution> configuration,
-            ObjectLocator locator)
+                                       ObjectLocator locator)
     {
         add(configuration, ComponentInvocationMap.class, new PageTesterComponentInvocationMap());
         add(configuration, Response.class, new TestableResponseImpl());
@@ -56,7 +56,7 @@
     }
 
     private static <T> void add(Configuration<AliasContribution> configuration,
-            ObjectLocator locator, Class<T> serviceClass, String serviceId)
+                                ObjectLocator locator, Class<T> serviceClass, String serviceId)
     {
         T service = locator.getService(serviceId, serviceClass);
 
@@ -64,7 +64,7 @@
     }
 
     private static <T> void add(Configuration<AliasContribution> configuration,
-            Class<T> serviceClass, T service)
+                                Class<T> serviceClass, T service)
     {
         AliasContribution<T> contribution = AliasContribution.create(
                 serviceClass,

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/PageTesterSession.java Mon Nov 12 14:22:31 2007
@@ -16,12 +16,11 @@
 
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry.services.Session;
 
 import java.util.List;
 import java.util.Map;
-
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Session;
 
 public class PageTesterSession implements Session
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,12 @@
 
 package org.apache.tapestry.internal.test;
 
-import java.util.Map;
-
-import javax.servlet.http.Cookie;
-
 import org.apache.tapestry.internal.services.CookieSink;
 import org.apache.tapestry.internal.services.CookieSource;
 import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+
+import javax.servlet.http.Cookie;
+import java.util.Map;
 
 public class TestableCookieSinkSource implements CookieSource, CookieSink
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactory.java Mon Nov 12 14:22:31 2007
@@ -23,6 +23,8 @@
  */
 public interface TestableMarkupWriterFactory extends MarkupWriterFactory
 {
-    /** Returns the most recently created markup writer. */
+    /**
+     * Returns the most recently created markup writer.
+     */
     MarkupWriter getLatestMarkupWriter();
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableMarkupWriterFactoryImpl.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,8 @@
 
 package org.apache.tapestry.internal.test;
 
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-
 import org.apache.tapestry.MarkupWriter;
+import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
 import org.apache.tapestry.ioc.annotations.Scope;
 import org.apache.tapestry.services.Core;
 import org.apache.tapestry.services.MarkupWriterFactory;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequest.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
 
 package org.apache.tapestry.internal.test;
 
-import java.util.Map;
-
 import org.apache.tapestry.services.Request;
 import org.apache.tapestry.test.PageTester;
 
+import java.util.Map;
+
 /**
  * An extended version of {@link Request} that allows the {@link PageTester} to control and override
  * behavior, effectively simulating the portions of {@link Request} that are provided normally by a
@@ -26,12 +26,18 @@
  */
 public interface TestableRequest extends Request
 {
-    /** Clears the internal parameters map. */
+    /**
+     * Clears the internal parameters map.
+     */
     void clear();
 
-    /** Loads new parameter/value pairs into the map. */
+    /**
+     * Loads new parameter/value pairs into the map.
+     */
     void loadParameters(Map<String, String> parameterValues);
 
-    /** Loads a single parameter/value pair. */
+    /**
+     * Loads a single parameter/value pair.
+     */
     void loadParameter(String parameterName, String parameterValue);
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableRequestImpl.java Mon Nov 12 14:22:31 2007
@@ -15,14 +15,13 @@
 package org.apache.tapestry.internal.test;
 
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry.services.Session;
 
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Session;
-
 public class TestableRequestImpl implements TestableRequest
 {
     private final String _contextPath;
@@ -133,7 +132,9 @@
     {
     }
 
-    /** Always returns false. If you need to test Ajax functionality, you need to be using Selenium. */
+    /**
+     * Always returns false. If you need to test Ajax functionality, you need to be using Selenium.
+     */
     public boolean isXHR()
     {
         return false;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableResponseImpl.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry.internal.test;
 
+import org.apache.tapestry.services.Response;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
-
-import org.apache.tapestry.services.Response;
 
 public class TestableResponseImpl implements Response
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64InputStream.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64InputStream.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64InputStream.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64InputStream.java Mon Nov 12 14:22:31 2007
@@ -1,22 +1,22 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package org.apache.tapestry.internal.util;
 
-import java.io.ByteArrayInputStream;
-
-import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Base64;
+
+import java.io.ByteArrayInputStream;
 
 /**
  * An extension of {@link ByteArrayInputStream} that is initialized from a Base64 input stream



Mime
View raw message