tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject svn commit: r594319 [7/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...
Date Mon, 12 Nov 2007 22:23:28 GMT
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CommonResourcesInjectionProvider.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Locale;
-import java.util.Map;
-
 import org.apache.tapestry.ioc.Messages;
 import org.apache.tapestry.ioc.ObjectLocator;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
 import org.apache.tapestry.model.MutableComponentModel;
 import org.apache.tapestry.services.ClassTransformation;
 import org.apache.tapestry.services.InjectionProvider;
 import org.slf4j.Logger;
 
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * Allows for a number of anonymous injections based on the type of field that is to be injected.
  */
@@ -47,7 +46,7 @@
     }
 
     public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
-            ClassTransformation transformation, MutableComponentModel componentModel)
+                                    ClassTransformation transformation, MutableComponentModel componentModel)
     {
         String implementationMethodName = _configuration.get(fieldType);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionDispatcher.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionDispatcher.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,12 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.io.IOException;
-
 import org.apache.tapestry.TapestryConstants;
 import org.apache.tapestry.internal.InternalConstants;
 import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.services.ActionResponseGenerator;
-import org.apache.tapestry.services.ComponentActionRequestHandler;
-import org.apache.tapestry.services.Dispatcher;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry.services.*;
+
+import java.io.IOException;
 
 /**
  * Processes component action events sent as requests from the client. Action events include an
@@ -66,7 +62,7 @@
 
             if (slashx < 0)
             {
-                slashx = path.length() ;
+                slashx = path.length();
             }
             else
             {
@@ -106,12 +102,12 @@
             return false;
 
         String[] eventContext = contextStart > 0 ? decodeContext(path.substring(contextStart))
-                : _emptyString;
+                                : _emptyString;
 
         String activationContextValue = request.getParameter(InternalConstants.PAGE_CONTEXT_NAME);
 
         String[] activationContext = activationContextValue == null ? _emptyString
-                : decodeContext(activationContextValue);
+                                     : decodeContext(activationContextValue);
 
         ActionResponseGenerator responseGenerator = _componentActionRequestHandler.handle(
                 logicalPageName,

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionRequestHandlerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionRequestHandlerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionRequestHandlerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentActionRequestHandlerImpl.java Mon Nov 12 14:22:31 2007
@@ -34,7 +34,7 @@
     private final LinkFactory _linkFactory;
 
     public ComponentActionRequestHandlerImpl(ComponentEventResultProcessor resultProcessor,
-            RequestPageCache cache, LinkFactory linkFactory)
+                                             RequestPageCache cache, LinkFactory linkFactory)
     {
         _resultProcessor = resultProcessor;
         _cache = cache;
@@ -42,7 +42,7 @@
     }
 
     public ActionResponseGenerator handle(String logicalPageName, String nestedComponentId,
-            String eventType, String[] context, String[] activationContext)
+                                          String eventType, String[] context, String[] activationContext)
     {
         Page page = _cache.get(logicalPageName);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java Mon Nov 12 14:22:31 2007
@@ -14,25 +14,21 @@
 
 package org.apache.tapestry.internal.services;
 
-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.CollectionFactory.newSet;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.tapestry.internal.InternalConstants;
 import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.ioc.annotations.Inject;
 import org.apache.tapestry.ioc.annotations.Symbol;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
 import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
 import org.apache.tapestry.ioc.internal.util.Invokable;
 import org.apache.tapestry.services.ComponentClassResolver;
 import org.apache.tapestry.services.LibraryMapping;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 public class ComponentClassResolverImpl implements ComponentClassResolver, InvalidationListener
 {
     private static final String CORE_LIBRARY_PREFIX = "core/";
@@ -69,7 +65,9 @@
 
     private final Map<String, String> _mixinToClassName = newCaseInsensitiveMap();
 
-    /** This one is case sensitive, since class names do always have a particular case. */
+    /**
+     * This one is case sensitive, since class names do always have a particular case.
+     */
     private final Map<String, String> _pageClassNameToLogicalName = newMap();
 
     private final Map<String, String> _pageNameToCanonicalPageName = newCaseInsensitiveMap();
@@ -77,13 +75,13 @@
     private final ConcurrentBarrier _barrier = new ConcurrentBarrier();
 
     public ComponentClassResolverImpl(ComponentInstantiatorSource componentInstantiatorSource,
-            ClassNameLocator classNameLocator,
+                                      ClassNameLocator classNameLocator,
 
-            @Inject
-            @Symbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM)
-            String appRootPackage,
+                                      @Inject
+                                      @Symbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM)
+                                      String appRootPackage,
 
-            Collection<LibraryMapping> mappings)
+                                      Collection<LibraryMapping> mappings)
     {
         _componentInstantiatorSource = componentInstantiatorSource;
         _classNameLocator = classNameLocator;
@@ -127,7 +125,9 @@
         _componentInstantiatorSource.addPackage(rootPackage + ".base");
     }
 
-    /** When the class loader is invalidated, clear any cached page names or component types. */
+    /**
+     * When the class loader is invalidated, clear any cached page names or component types.
+     */
     public synchronized void objectWasInvalidated()
     {
         _barrier.withWrite(new Runnable()
@@ -183,7 +183,7 @@
     }
 
     private void fillNameToClassNameMap(String pathPrefix, String rootPackage, String subPackage,
-            Map<String, String> logicalNameToClassName)
+                                        Map<String, String> logicalNameToClassName)
     {
         String searchPackage = rootPackage + "." + subPackage;
         boolean isPage = subPackage.equals(PAGES_SUBPACKAGE);
@@ -208,15 +208,12 @@
 
     /**
      * Converts a fully qualified class name to a logical name
-     * 
-     * @param className
-     *            fully qualified class name
-     * @param pathPrefix
-     *            prefix to be placed on the logical name (to identify the library from in which the
-     *            class lives)
-     * @param startPos
-     *            start position within the class name to extract the logical name (i.e., after the
-     *            final '.' in "rootpackage.pages.").
+     *
+     * @param className  fully qualified class name
+     * @param pathPrefix prefix to be placed on the logical name (to identify the library from in which the
+     *                   class lives)
+     * @param startPos   start position within the class name to extract the logical name (i.e., after the
+     *                   final '.' in "rootpackage.pages.").
      * @return a short logical name in folder format ('.' replaced with '/')
      */
     private String toLogicalName(String className, String pathPrefix, int startPos)
@@ -317,8 +314,8 @@
                 if (result == null)
                     throw new IllegalArgumentException(ServicesMessages
                             .couldNotResolveComponentType(
-                                    componentType,
-                                    presentableNames(_componentToClassName)));
+                            componentType,
+                            presentableNames(_componentToClassName)));
 
                 return result;
             }
@@ -365,11 +362,9 @@
     /**
      * Locates a class name within the provided map, given its logical name. If not found naturally,
      * a search inside the "core" library is included.
-     * 
-     * @param logicalName
-     *            name to search for
-     * @param logicalNameToClassName
-     *            mapping from logical name to class name
+     *
+     * @param logicalName            name to search for
+     * @param logicalNameToClassName mapping from logical name to class name
      * @return the located class name or null
      */
     private String locate(String logicalName, Map<String, String> logicalNameToClassName)
@@ -416,8 +411,8 @@
                 if (result == null)
                     throw new IllegalArgumentException(ServicesMessages
                             .couldNotCanonicalizePageName(
-                                    pageName,
-                                    presentableNames(_pageNameToCanonicalPageName)));
+                            pageName,
+                            presentableNames(_pageNameToCanonicalPageName)));
 
                 return result;
             }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformer.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.internal.services;
 
-import javassist.CtClass;
+import javassist.CtClass;
 
 /**
  * Encapsulates all the work performed by the
@@ -25,15 +25,15 @@
 {
     /**
      * Performs a transformation on the class, accessing the class from the class pool.
-     * 
-     * @param ctClass
-     *            compile time class to be transformed
-     * @param classLoader
-     *            class loader used to resolve references to other classes (both transformed and
-     *            not)
+     *
+     * @param ctClass     compile time class to be transformed
+     * @param classLoader class loader used to resolve references to other classes (both transformed and
+     *                    not)
      */
     void transformComponentClass(CtClass ctClass, ClassLoader classLoader);
 
-    /** Creates a new instantiator instance. */
+    /**
+     * Creates a new instantiator instance.
+     */
     Instantiator createInstantiator(Class componentClass);
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassTransformerImpl.java Mon Nov 12 14:22:31 2007
@@ -14,32 +14,32 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-
-import java.lang.reflect.Modifier;
-import java.util.Map;
-
 import javassist.CtClass;
 import javassist.CtConstructor;
 import javassist.NotFoundException;
-
 import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.model.MutableComponentModelImpl;
 import org.apache.tapestry.ioc.LoggerSource;
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.ioc.internal.util.ClasspathResource;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
 import org.apache.tapestry.model.ComponentModel;
 import org.apache.tapestry.model.MutableComponentModel;
 import org.apache.tapestry.services.ComponentClassTransformWorker;
 import org.slf4j.Logger;
 
+import java.lang.reflect.Modifier;
+import java.util.Map;
+
 /**
  * Implementation of {@link org.apache.tapestry.internal.services.ComponentClassTransformer}.
  */
 public class ComponentClassTransformerImpl implements ComponentClassTransformer,
-        InvalidationListener
+                                                      InvalidationListener
 {
-    /** Map from class name to class transformation. */
+    /**
+     * Map from class name to class transformation.
+     */
     private final Map<String, InternalClassTransformation> _nameToClassTransformation = newConcurrentMap();
 
     private final Map<String, ComponentModel> _nameToComponentModel = newConcurrentMap();
@@ -49,11 +49,10 @@
     private final LoggerSource _logSource;
 
     /**
-     * @param workerChain
-     *            the ordered list of class transform works as a chain of command instance
+     * @param workerChain the ordered list of class transform works as a chain of command instance
      */
     public ComponentClassTransformerImpl(ComponentClassTransformWorker workerChain,
-            LoggerSource logSource)
+                                         LoggerSource logSource)
     {
         _workerChain = workerChain;
         _logSource = logSource;
@@ -119,12 +118,14 @@
         ComponentModel parentModel = _nameToComponentModel.get(parentClassname);
 
         MutableComponentModel model = new MutableComponentModelImpl(classname, logger,
-                baseResource, parentModel);
+                                                                    baseResource, parentModel);
 
         InternalClassTransformation transformation = parentTransformation == null ? new InternalClassTransformationImpl(
                 ctClass, classLoader, logger, model)
-                : new InternalClassTransformationImpl(ctClass, parentTransformation, classLoader,
-                        logger, model);
+                                                     : new InternalClassTransformationImpl(ctClass,
+                                                                                           parentTransformation,
+                                                                                           classLoader,
+                                                                                           logger, model);
 
         try
         {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,9 @@
 
 package org.apache.tapestry.internal.services;
 
+import org.apache.tapestry.ComponentEventHandler;
 import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
 import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import org.apache.tapestry.ComponentEventHandler;
 import org.apache.tapestry.ioc.services.TypeCoercer;
 import org.apache.tapestry.runtime.ComponentEvent;
 
@@ -32,21 +31,16 @@
     private final TypeCoercer _typeCoercer;
 
     /**
-     * @param eventType
-     *            non blank string used to identify the type of event that was triggered
-     * @param originatingComponentId
-     *            the id of the component that triggered the event (this will likely need to change
-     *            somewhat)
-     * @param context
-     *            an array of values that can be made available to handler methods via method
-     *            parameters
-     * @param handler
-     *            invoked when a non-null return value is obtained from an event handler method
-     * @param typeCoercer
-     *            used when coercing context values to parameter types
+     * @param eventType              non blank string used to identify the type of event that was triggered
+     * @param originatingComponentId the id of the component that triggered the event (this will likely need to change
+     *                               somewhat)
+     * @param context                an array of values that can be made available to handler methods via method
+     *                               parameters
+     * @param handler                invoked when a non-null return value is obtained from an event handler method
+     * @param typeCoercer            used when coercing context values to parameter types
      */
     public ComponentEventImpl(String eventType, String originatingComponentId, Object[] context,
-            ComponentEventHandler handler, TypeCoercer typeCoercer)
+                              ComponentEventHandler handler, TypeCoercer typeCoercer)
     {
         super(handler);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstanceResultProcessor.java Mon Nov 12 14:22:31 2007
@@ -31,7 +31,7 @@
     private final Logger _logger;
 
     public ComponentInstanceResultProcessor(final RequestPageCache requestPageCache,
-            LinkFactory linkFactory, Logger logger)
+                                            LinkFactory linkFactory, Logger logger)
     {
         _requestPageCache = requestPageCache;
         _linkFactory = linkFactory;
@@ -39,7 +39,7 @@
     }
 
     public ActionResponseGenerator processComponentEvent(Component value, Component component,
-            String methodDescription)
+                                                         String methodDescription)
     {
         ComponentResources resources = value.getComponentResources();
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSource.java Mon Nov 12 14:22:31 2007
@@ -20,11 +20,11 @@
 /**
  * Creates {@link org.apache.tapestry.internal.services.Instantiator}s for components, based on
  * component class name. This will involve transforming the component's class before it is loaded.
- * <p>
+ * <p/>
  * In addition, a source acts as an event hub for
  * {@link org.apache.tapestry.internal.events.InvalidationListener}s, so that any information derived from
  * loaded classes can be discarded and rebuilt when classes change.
- * <p>
+ * <p/>
  * The strategy used is that when <em>any</em> class (in a controlled package) changes, the entire
  * class loader is discarded, along with any instances derived from those classes. A new class
  * loader is created, and then invalidation events are fired to listeners.
@@ -37,9 +37,8 @@
      * Instantiators are cached, so repeated calls to this method with the same class name will
      * return the same instance; however, callers should also be aware that the instantiators may
      * lose validity after an invalidation (caused by changes to external Java class files).
-     * 
-     * @param classname
-     *            FQCN to find (and perhaps transform and load)
+     *
+     * @param classname FQCN to find (and perhaps transform and load)
      * @return an object which can instantiate an instance of the component
      */
     Instantiator findInstantiator(String classname);
@@ -47,17 +46,15 @@
     /**
      * Adds a controlled package. Only classes within controlled packages are subject to
      * transformation.
-     * 
-     * @param packageName
-     *            the package name to add (must not be blank)
+     *
+     * @param packageName the package name to add (must not be blank)
      */
     void addPackage(String packageName);
 
     /**
      * Checks to see if a fully qualfied class name exists.
-     * 
-     * @param className
-     *            name of class to check
+     *
+     * @param className name of class to check
      * @return true if the class exists (there's a ".class" file), false otherwise
      */
     boolean exists(String className);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,37 +14,28 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-
-import javassist.CannotCompileException;
-import javassist.ClassPath;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.Loader;
-import javassist.LoaderClassPath;
-import javassist.NotFoundException;
-import javassist.Translator;
-
+import javassist.*;
 import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
 import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.internal.services.ClassFactoryClassPool;
 import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
 import org.apache.tapestry.ioc.internal.util.Defense;
 import org.apache.tapestry.ioc.services.ClassFactory;
 import org.slf4j.Logger;
 
+import java.net.URL;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * A wrapper around a Javassist class loader that allows certain classes to be modified as they are
  * loaded.
  */
 public final class ComponentInstantiatorSourceImpl extends InvalidationEventHubImpl implements
-        Translator, ComponentInstantiatorSource, UpdateListener
+                                                                                    Translator, ComponentInstantiatorSource, UpdateListener
 {
     /**
      * Add -Djavassist-write-dir=target/transformed-classes to the command line to force output of
@@ -68,7 +59,9 @@
 
     private ClassFactory _classFactory;
 
-    /** Map from class name to Instantiator. */
+    /**
+     * Map from class name to Instantiator.
+     */
     private final Map<String, Instantiator> _instantiatorMap = newMap();
 
     private class PackageAwareLoader extends Loader
@@ -92,7 +85,7 @@
     }
 
     public ComponentInstantiatorSourceImpl(ClassLoader parent,
-            ComponentClassTransformer transformer, Logger logger)
+                                           ComponentClassTransformer transformer, Logger logger)
     {
         _parent = parent;
         _transformer = transformer;
@@ -148,7 +141,7 @@
 
     // This is called from well within a synchronized block.
     public void onLoad(ClassPool pool, String classname) throws NotFoundException,
-            CannotCompileException
+                                                                CannotCompileException
     {
         _logger.debug("BEGIN onLoad " + classname);
 
@@ -219,14 +212,16 @@
     }
 
     private void forceSuperclassTransform(CtClass ctClass) throws NotFoundException,
-            ClassNotFoundException
+                                                                  ClassNotFoundException
     {
         CtClass superClass = ctClass.getSuperclass();
 
         findClass(superClass.getName());
     }
 
-    /** Does nothing. */
+    /**
+     * Does nothing.
+     */
     public void start(ClassPool pool) throws NotFoundException, CannotCompileException
     {
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocation.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocation.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
+import org.apache.tapestry.internal.TapestryInternalUtils;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
 import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry.test.PageTester;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.test.PageTester;
-
 /**
  * Represents an invocation for a page or a component in the current application. This information
  * is extracted from incoming URLs for a running application (or created by the {@link PageTester}.
@@ -40,16 +39,13 @@
     private Map<String, String> _parameters;
 
     /**
-     * @param target
-     *            identifies the target of the event: a component with a page
-     * @param context
-     *            context information supplied by the component to be provided back when the event
-     *            on the component is triggered, or contains the activation context when the
-     *            invocation is for a page render request
-     * @param activationContext
-     *            page activation context for the page containing the component, supplied via a
-     *            passivate event to the page's root component (used when an action component
-     *            invocation is for a page with an activation context)
+     * @param target            identifies the target of the event: a component with a page
+     * @param context           context information supplied by the component to be provided back when the event
+     *                          on the component is triggered, or contains the activation context when the
+     *                          invocation is for a page render request
+     * @param activationContext page activation context for the page containing the component, supplied via a
+     *                          passivate event to the page's root component (used when an action component
+     *                          invocation is for a page with an activation context)
      */
     public ComponentInvocation(InvocationTarget target, String[] context, String[] activationContext)
     {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationMap.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationMap.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInvocationMap.java Mon Nov 12 14:22:31 2007
@@ -26,33 +26,35 @@
  * (simulated) requests. In this way, a unit test can have the
  * {@link PageTester#clickLink(Element) click a link} or
  * {@link PageTester#submitForm(Element, java.util.Map) submit a form}.
- * <p>
+ * <p/>
  * The information needed is generated in slightly disparate places, so the {@link LinkFactory}
  * tells the map about Links and ComponentInvocations, and the {@link MarkupWriter} will link
  * Elements to Link instance.
  */
 public interface ComponentInvocationMap
 {
-    /** Stores a connection between a particular link and an invocation of a component. */
+    /**
+     * Stores a connection between a particular link and an invocation of a component.
+     */
     void store(Link link, ComponentInvocation invocation);
 
-    /** Stores a connection between an element and the link associated with that element. */
+    /**
+     * Stores a connection between an element and the link associated with that element.
+     */
     void store(Element element, Link link);
 
     /**
      * Returns the invocation associated with a link.
-     * 
-     * @param link
-     *            previously create link
+     *
+     * @param link previously create link
      * @return associcated component invocation, or null
      */
     ComponentInvocation get(Link link);
 
     /**
      * Returns the invocation associated with a rendered element.
-     * 
-     * @param element
-     *            extracted from the rendered {@link Document}
+     *
+     * @param element extracted from the rendered {@link Document}
      * @return the corresponding invocation
      */
     ComponentInvocation get(Element element);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.lang.annotation.Annotation;
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.tapestry.MarkupWriter;
 import org.apache.tapestry.internal.util.MethodInvocationBuilder;
 import org.apache.tapestry.ioc.internal.util.InternalUtils;
@@ -28,6 +24,10 @@
 import org.apache.tapestry.services.MethodFilter;
 import org.apache.tapestry.services.TransformMethodSignature;
 
+import java.lang.annotation.Annotation;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * Converts one of the methods of {@link org.apache.tapestry.runtime.Component} into a chain of
  * command that, itself, invokes certain methods (render phase methods) marked with an annotation,
@@ -50,16 +50,13 @@
     /**
      * Normal method invocation: parent class, then methods in ascending alphabetical order. Reverse
      * order: method in descending alphabetical order, then parent class.
-     * 
-     * @param lifecycleMethodSignature
-     *            the signature of the method to be implemented in the component class
-     * @param methodAnnotation
-     *            the class of the corresponding annotation
-     * @param reverse
-     *            if true, the normal method invocation order is reversed
+     *
+     * @param lifecycleMethodSignature the signature of the method to be implemented in the component class
+     * @param methodAnnotation         the class of the corresponding annotation
+     * @param reverse                  if true, the normal method invocation order is reversed
      */
     public ComponentLifecycleMethodWorker(TransformMethodSignature lifecycleMethodSignature,
-            Class<? extends Annotation> methodAnnotation, boolean reverse)
+                                          Class<? extends Annotation> methodAnnotation, boolean reverse)
     {
         _lifecycleMethodSignature = lifecycleMethodSignature;
         _methodAnnotation = methodAnnotation;
@@ -138,7 +135,7 @@
     }
 
     private void addMethodCallToBody(BodyBuilder builder, TransformMethodSignature sig,
-            ClassTransformation transformation)
+                                     ClassTransformation transformation)
     {
         boolean isVoid = sig.getReturnType().equals("void");
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentMessagesSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Locale;
-
 import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.internal.events.UpdateListener;
 import org.apache.tapestry.internal.util.URLChangeTracker;
@@ -24,6 +22,8 @@
 import org.apache.tapestry.model.ComponentModel;
 import org.apache.tapestry.services.ComponentMessagesSource;
 
+import java.util.Locale;
+
 public class ComponentMessagesSourceImpl implements ComponentMessagesSource, UpdateListener
 {
     private final MessagesSource _messagesSource;
@@ -89,23 +89,23 @@
         // If the application catalog exists, set it up as the root, otherwise use null.
 
         MessagesBundle appCatalogBundle = appCatalogResource.toURL() == null ? null
-                : new MessagesBundle()
-                {
-                    public Resource getBaseResource()
-                    {
-                        return appCatalogResource;
-                    }
-
-                    public Object getId()
-                    {
-                        return _appCatalog;
-                    }
-
-                    public MessagesBundle getParent()
-                    {
-                        return null;
-                    }
-                };
+                                          : new MessagesBundle()
+        {
+            public Resource getBaseResource()
+            {
+                return appCatalogResource;
+            }
+
+            public Object getId()
+            {
+                return _appCatalog;
+            }
+
+            public MessagesBundle getParent()
+            {
+                return null;
+            }
+        };
 
         MessagesBundle bundle = new ComponentModelBundle(componentModel, appCatalogBundle);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResourcesInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResourcesInjectionProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResourcesInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentResourcesInjectionProvider.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,21 @@
 
 package org.apache.tapestry.internal.services;
 
-import static java.lang.String.format;
-
 import org.apache.tapestry.ComponentResources;
 import org.apache.tapestry.ioc.ObjectLocator;
 import org.apache.tapestry.model.MutableComponentModel;
 import org.apache.tapestry.services.ClassTransformation;
 import org.apache.tapestry.services.InjectionProvider;
 
+import static java.lang.String.format;
+
 /**
  * Allows for the injection of the component's {@link org.apache.tapestry.ComponentResources}.
  */
 public class ComponentResourcesInjectionProvider implements InjectionProvider
 {
     public boolean provideInjection(String fieldName, Class fieldType, ObjectLocator locator,
-            ClassTransformation transformation, MutableComponentModel componentModel)
+                                    ClassTransformation transformation, MutableComponentModel componentModel)
     {
         if (fieldType.equals(ComponentResources.class))
         {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSource.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,21 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Locale;
-
 import org.apache.tapestry.internal.event.InvalidationEventHub;
 import org.apache.tapestry.internal.parser.ComponentTemplate;
 import org.apache.tapestry.model.ComponentModel;
 
+import java.util.Locale;
+
 /**
  * Provides access to cached {@link org.apache.tapestry.internal.parser.ComponentTemplate}s. The
  * source acts as a invalidation event hub, and will broadcast invalidation events when any loaded
  * template resource changes. The listener for these invalidation events is the page source, which
  * stores cached page instances.
- * <p>
+ * <p/>
  * Any search for a template will end with success (a non-null template), but the template returned
  * may be the {@link ComponentTemplate#isMissing() missing template}.
- * <p>
+ * <p/>
  * TODO: A more sophisticated, finer grained dependency manager.
  */
 public interface ComponentTemplateSource extends InvalidationEventHub
@@ -38,13 +38,11 @@
      * the exact component is found, then the template for the component's parent is returned. In
      * this way, it is possible for a component to extend the behavior of its super-class without
      * duplicating the super-class component's template.
-     * <p>
+     * <p/>
      * In some cases, the empty template will be returned.
-     * 
-     * @param componentModel
-     *            model for the component whose template is to be accessed
-     * @param locale
-     *            the locale to find the template within
+     *
+     * @param componentModel model for the component whose template is to be accessed
+     * @param locale         the locale to find the template within
      * @return the cached template instance
      */
     ComponentTemplate getTemplate(ComponentModel componentModel, Locale locale);

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-
-import java.net.URL;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.tapestry.internal.InternalConstants;
 import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
 import org.apache.tapestry.internal.events.UpdateListener;
@@ -30,13 +22,20 @@
 import org.apache.tapestry.internal.util.MultiKey;
 import org.apache.tapestry.internal.util.URLChangeTracker;
 import org.apache.tapestry.ioc.Resource;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
 import org.apache.tapestry.model.ComponentModel;
 
+import java.net.URL;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Service implementation that manages a cache of parsed component templates.
  */
 public final class ComponentTemplateSourceImpl extends InvalidationEventHubImpl implements
-        ComponentTemplateSource, UpdateListener
+                                                                                ComponentTemplateSource, UpdateListener
 {
 
     private final TemplateParser _parser;
@@ -87,7 +86,7 @@
     }
 
     ComponentTemplateSourceImpl(TemplateParser parser, PageTemplateLocator locator,
-            URLChangeTracker tracker)
+                                URLChangeTracker tracker)
     {
         _parser = parser;
         _locator = locator;
@@ -98,7 +97,7 @@
      * Resolves the component name to a {@link Resource} and finds the localization of that resource
      * (the combination of component name and locale is resolved to a resource). The localized
      * resource is used as the key to a cache of {@link ComponentTemplate}s.
-     * <p>
+     * <p/>
      * If a template doesn't exist, then the missing ComponentTemplate is returned.
      */
     public ComponentTemplate getTemplate(ComponentModel componentModel, Locale locale)

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentWorker.java Mon Nov 12 14:22:31 2007
@@ -84,7 +84,7 @@
     }
 
     private void addMixinClasses(String fieldName, ClassTransformation transformation,
-            MutableEmbeddedComponentModel model)
+                                 MutableEmbeddedComponentModel model)
     {
         MixinClasses annotation = transformation.getFieldAnnotation(fieldName, MixinClasses.class);
 
@@ -95,7 +95,7 @@
     }
 
     private void addMixinTypes(String fieldName, ClassTransformation transformation,
-            MutableEmbeddedComponentModel model)
+                               MutableEmbeddedComponentModel model)
     {
         Mixins annotation = transformation.getFieldAnnotation(fieldName, Mixins.class);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CompositeFieldValidator.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.List;
-
 import org.apache.tapestry.FieldValidator;
 import org.apache.tapestry.MarkupWriter;
 import org.apache.tapestry.ValidationException;
 
-/** Aggregates together a number of field validator instances as a single unit. */
+import java.util.List;
+
+/**
+ * Aggregates together a number of field validator instances as a single unit.
+ */
 public final class CompositeFieldValidator implements FieldValidator
 {
     private final FieldValidator[] _validators;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.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.services;
 
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import javassist.CtClass;
+import javassist.CtClass;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
 
 /**
  * Stores transformation type data about one argument to a class constructor.
@@ -28,11 +28,9 @@
 
     /**
      * Constructs new instance.
-     * 
-     * @param type
-     *            type of the parameter to be created (may not be null)
-     * @param value
-     *            value to be injected via the constructor (may be null)
+     *
+     * @param type  type of the parameter to be created (may not be null)
+     * @param value value to be injected via the constructor (may be null)
      */
     ConstructorArg(CtClass type, Object value)
     {
@@ -45,7 +43,9 @@
         return _type;
     }
 
-    /** The value to be injected (may be null). */
+    /**
+     * The value to be injected (may be null).
+     */
     public Object getValue()
     {
         return _value;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextAssetFactory.java Mon Nov 12 14:22:31 2007
@@ -22,7 +22,7 @@
 
 /**
  * Implementation of {@link AssetFactory} for assets that are part of the web application context.
- * 
+ *
  * @see ContextResource
  */
 public class ContextAssetFactory implements AssetFactory
@@ -65,7 +65,9 @@
         };
     }
 
-    /** Returns the root {@link ContextResource}. */
+    /**
+     * Returns the root {@link ContextResource}.
+     */
     public Resource getRootResource()
     {
         return new ContextResource(_context, "/");

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java Mon Nov 12 14:22:31 2007
@@ -16,17 +16,15 @@
 
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newStack;
+import org.apache.tapestry.ioc.util.Stack;
+import org.apache.tapestry.services.Context;
 
+import javax.servlet.ServletContext;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-import org.apache.tapestry.ioc.util.Stack;
-import org.apache.tapestry.services.Context;
 
 public class ContextImpl implements Context
 {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.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.net.URL;
-
 import org.apache.tapestry.ioc.Resource;
 import org.apache.tapestry.ioc.internal.util.AbstractResource;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
 import org.apache.tapestry.services.Context;
+
+import java.net.URL;
 
 /**
  * A resource stored with in the web application context.

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry.internal.services;
 
-import javax.servlet.http.Cookie;
-
 import org.apache.tapestry.ioc.annotations.Symbol;
 import org.apache.tapestry.services.Cookies;
 import org.apache.tapestry.services.Request;
 
+import javax.servlet.http.Cookie;
+
 /**
  * Implementation of the {@link org.apache.tapestry.services.Cookies} service interface.
  */
@@ -35,12 +35,12 @@
 
     public CookiesImpl(Request request,
 
-    CookieSource cookieSource,
+                       CookieSource cookieSource,
 
-    CookieSink cookieSink,
+                       CookieSink cookieSink,
 
-    @Symbol("tapestry.default-cookie-max-age")
-    int defaultMaxAge)
+                       @Symbol("tapestry.default-cookie-max-age")
+                       int defaultMaxAge)
     {
         _request = request;
         _cookieSource = cookieSource;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultDataTypeAnalyzer.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.util.Map;
-
 import org.apache.tapestry.internal.events.InvalidationListener;
 import org.apache.tapestry.ioc.services.PropertyAdapter;
 import org.apache.tapestry.ioc.util.StrategyRegistry;
 import org.apache.tapestry.services.DataTypeAnalyzer;
+
+import java.util.Map;
 
 /**
  * The default data type analyzer, which is based entirely on the type of the property (and not on

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java Mon Nov 12 14:22:31 2007
@@ -47,7 +47,7 @@
 
     @SuppressWarnings("unchecked")
     private void inject(String fieldName, ClassTransformation transformation,
-            MutableComponentModel model)
+                        MutableComponentModel model)
     {
         String fieldType = transformation.getFieldType(fieldName);
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.lang.annotation.Annotation;
-
 import org.apache.tapestry.ioc.AnnotationProvider;
 import org.apache.tapestry.ioc.ObjectLocator;
 import org.apache.tapestry.model.MutableComponentModel;
@@ -23,12 +21,14 @@
 import org.apache.tapestry.services.InjectionProvider;
 import org.apache.tapestry.services.MasterObjectProvider;
 
+import java.lang.annotation.Annotation;
+
 /**
  * Worker for the {@link org.apache.tapestry.annotations.Inject} annotation that delegates out to
  * the master {@link MasterObjectProvier} to access the value. This worker must be scheduled after
  * certain other workers, such as {@link InjectBlockWorker} (which is keyed off a combination of
  * type and the Inject annotation).
- * 
+ *
  * @see MasterObjectProvier
  */
 public class DefaultInjectionProvider implements InjectionProvider
@@ -45,7 +45,7 @@
 
     @SuppressWarnings("unchecked")
     public boolean provideInjection(final String fieldName, Class fieldType, ObjectLocator locator,
-            final ClassTransformation transformation, MutableComponentModel componentModel)
+                                    final ClassTransformation transformation, MutableComponentModel componentModel)
     {
         AnnotationProvider annotationProvider = new AnnotationProvider()
         {

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultRequestExceptionHandler.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.io.IOException;
-
 import org.apache.tapestry.internal.structure.Page;
 import org.apache.tapestry.services.ExceptionReporter;
 import org.apache.tapestry.services.RequestExceptionHandler;
 import org.apache.tapestry.services.Response;
 import org.slf4j.Logger;
 
+import java.io.IOException;
+
 /**
  * Default implementation of {@link RequestExceptionHandler} that displays the standard
  * ExceptionReport page. The page must implement the {@link ExceptionReporter} interface.
@@ -37,7 +37,7 @@
     private final Logger _logger;
 
     public DefaultRequestExceptionHandler(RequestPageCache pageCache,
-            PageResponseRenderer renderer, Response response, Logger logger)
+                                          PageResponseRenderer renderer, Response response, Logger logger)
     {
         _pageCache = pageCache;
         _renderer = renderer;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultValidationDelegateCommand.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultValidationDelegateCommand.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultValidationDelegateCommand.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultValidationDelegateCommand.java Mon Nov 12 14:22:31 2007
@@ -36,7 +36,7 @@
     private final Asset _iconAsset;
 
     public DefaultValidationDelegateCommand(ThreadLocale threadLocale,
-            ValidationMessagesSource messagesSource, Asset iconAsset)
+                                            ValidationMessagesSource messagesSource, Asset iconAsset)
     {
         _threadLocale = threadLocale;
         _messagesSource = messagesSource;
@@ -53,7 +53,7 @@
         Messages messages = _messagesSource.getValidationMessages(_threadLocale.getLocale());
 
         ValidationDecorator decorator = new DefaultValidationDecorator(environment, messages,
-                _iconAsset);
+                                                                       _iconAsset);
 
         environment.push(ValidationDecorator.class, decorator);
     }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilder.java Mon Nov 12 14:22:31 2007
@@ -22,34 +22,32 @@
  */
 public interface DocumentHeadBuilder
 {
-    /** Adds a link to load a script. Scripts will be loaded only once. */
+    /**
+     * Adds a link to load a script. Scripts will be loaded only once.
+     */
     void addScriptLink(String scriptURL);
 
     /**
      * Adds a link to load a CSS stylesheet. Stylesheets are loaded only once.
-     * 
-     * @param styleURL
-     *            URL of stylesheet to load
-     * @param media
-     *            media value (or null to omit the media attribute)
+     *
+     * @param styleURL URL of stylesheet to load
+     * @param media    media value (or null to omit the media attribute)
      */
     void addStylesheetLink(String styleURL, String media);
 
     /**
      * Adds JavaScript code. The code is collected into a single block that is injected just before
      * the close body tag of the page.
-     * 
-     * @param script
-     *            statement to add to the block (a newline will be appended as well)
+     *
+     * @param script statement to add to the block (a newline will be appended as well)
      */
     void addScript(String script);
 
     /**
      * Updates the supplied Document, locating the html/body element and adding script links (to the
      * top) and a script block (to the end).
-     * 
-     * @param document
-     *            to be updated
+     *
+     * @param document to be updated
      */
     void updateDocument(Document document);
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DocumentHeadBuilderImpl.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
 
 package org.apache.tapestry.internal.services;
 
+import org.apache.tapestry.dom.Document;
+import org.apache.tapestry.dom.Element;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
 
 import java.util.List;
 import java.util.Set;
 
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-
 public class DocumentHeadBuilderImpl implements DocumentHeadBuilder
 {
     private final List<String> _scripts = newList();
@@ -50,13 +49,13 @@
         {
             head.elementAt(index, "link",
 
-            "href", _url,
+                           "href", _url,
 
-            "rel", "stylesheet",
+                           "rel", "stylesheet",
 
-            "type", "text/css",
+                           "type", "text/css",
 
-            "media", _media);
+                           "media", _media);
         }
     }
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnumValueEncoderFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnumValueEncoderFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnumValueEncoderFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnumValueEncoderFactory.java Mon Nov 12 14:22:31 2007
@@ -20,7 +20,7 @@
 
 /**
  * Factory that provides a configured instance of {@link EnumValueEncoder}.
- * 
+ *
  * @param <E>
  */
 public class EnumValueEncoderFactory<E extends Enum<E>> implements ValueEncoderFactory<E>

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentImpl.java Mon Nov 12 14:22:31 2007
@@ -15,16 +15,15 @@
 package org.apache.tapestry.internal.services;
 
 import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry.ioc.annotations.Scope;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newLinkedList;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.services.Environment;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-
-import org.apache.tapestry.ioc.annotations.Scope;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.Environment;
 
 /**
  * A non-threadsafe implementation (expects to use the "perthread" service lifecyle).

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalShadowBuilderImpl.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import static java.lang.String.format;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-
 import org.apache.tapestry.ioc.services.Builtin;
 import org.apache.tapestry.ioc.services.ClassFab;
 import org.apache.tapestry.ioc.services.ClassFactory;
@@ -26,17 +21,23 @@
 import org.apache.tapestry.services.Environment;
 import org.apache.tapestry.services.EnvironmentalShadowBuilder;
 
+import static java.lang.String.format;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+
 public class EnvironmentalShadowBuilderImpl implements EnvironmentalShadowBuilder
 {
     private final ClassFactory _classFactory;
 
     private final Environment _environment;
 
-    /** Construct using the default builtin factory, not the component layer version. */
+    /**
+     * Construct using the default builtin factory, not the component layer version.
+     */
     public EnvironmentalShadowBuilderImpl(@Builtin
     ClassFactory classFactory,
 
-    Environment environment)
+                                          Environment environment)
     {
         _classFactory = classFactory;
         _environment = environment;
@@ -70,10 +71,11 @@
         classFab.addField("_serviceType", Class.class);
 
         classFab.addConstructor(new Class[]
-        { Environment.class, Class.class }, null, "{ _environment = $1; _serviceType = $2; }");
+                {Environment.class, Class.class}, null, "{ _environment = $1; _serviceType = $2; }");
 
         classFab.addMethod(Modifier.PRIVATE, new MethodSignature(serviceType, "_delegate", null,
-                null), "return ($r) _environment.peekRequired(_serviceType); ");
+                                                                 null),
+                           "return ($r) _environment.peekRequired(_serviceType); ");
 
         classFab.proxyMethodsToDelegate(serviceType, "_delegate()", format(
                 "<EnvironmentalProxy for %s>",

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
 
 package org.apache.tapestry.internal.services;
 
-import java.lang.reflect.Modifier;
-import java.util.List;
-
 import org.apache.tapestry.annotations.Environmental;
 import org.apache.tapestry.model.MutableComponentModel;
 import org.apache.tapestry.services.ClassTransformation;
@@ -24,6 +21,9 @@
 import org.apache.tapestry.services.Environment;
 import org.apache.tapestry.services.TransformMethodSignature;
 
+import java.lang.reflect.Modifier;
+import java.util.List;
+
 /**
  * Obtains a value from the {@link Environment} service based on the field type. This is triggered
  * by the presence of the {@link Environmental} annotation.
@@ -66,7 +66,7 @@
             String methodName = transformation.newMemberName("environment_read", name);
 
             TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, type, methodName, null,
-                    null);
+                                                                        null);
 
             String body = String.format(
                     "return ($r) %s.%s($type);",

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EventImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EventImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EventImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EventImpl.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,8 @@
 
 package org.apache.tapestry.internal.services;
 
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
 import org.apache.tapestry.ComponentEventHandler;
+import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
 import org.apache.tapestry.runtime.Component;
 import org.apache.tapestry.runtime.Event;
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorDefaultSourceImpl.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.newList;
-
-import java.util.List;
-import java.util.Locale;
-
 import org.apache.tapestry.Field;
 import org.apache.tapestry.FieldValidator;
 import org.apache.tapestry.ioc.AnnotationProvider;
 import org.apache.tapestry.ioc.Messages;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import org.apache.tapestry.services.FieldValidatorDefaultSource;
 import org.apache.tapestry.services.FieldValidatorSource;
 import org.apache.tapestry.services.ValidationConstraintGenerator;
 
+import java.util.List;
+import java.util.Locale;
+
 public class FieldValidatorDefaultSourceImpl implements FieldValidatorDefaultSource
 {
     private final ValidationConstraintGenerator _validationConstraintGenerator;
@@ -42,8 +41,8 @@
     }
 
     public FieldValidator createDefaultValidator(Field field, String overrideId,
-            Messages overrideMessages, Locale locale, Class propertyType,
-            AnnotationProvider propertyAnnotations)
+                                                 Messages overrideMessages, Locale locale, Class propertyType,
+                                                 AnnotationProvider propertyAnnotations)
     {
         List<FieldValidator> validators = newList();
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorImpl.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,7 @@
 
 package org.apache.tapestry.internal.services;
 
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.Validator;
+import org.apache.tapestry.*;
 import org.apache.tapestry.ioc.MessageFormatter;
 
 public class FieldValidatorImpl implements FieldValidator
@@ -35,8 +30,8 @@
     private final PageRenderSupport _pageRenderSupport;
 
     public FieldValidatorImpl(Field field, Object constraintValue,
-            MessageFormatter messageFormatter, Validator validator,
-            PageRenderSupport pageRenderSupport)
+                              MessageFormatter messageFormatter, Validator validator,
+                              PageRenderSupport pageRenderSupport)
     {
         _field = field;
         _constraintValue = constraintValue;

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java Mon Nov 12 14:22:31 2007
@@ -14,27 +14,22 @@
 
 package org.apache.tapestry.internal.services;
 
+import org.apache.tapestry.*;
+import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry.ioc.Messages;
 import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
 import static org.apache.tapestry.ioc.internal.util.Defense.cast;
 import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.PageRenderSupport;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
 import org.apache.tapestry.ioc.internal.util.InternalUtils;
 import org.apache.tapestry.ioc.services.TypeCoercer;
 import org.apache.tapestry.runtime.Component;
 import org.apache.tapestry.services.FieldValidatorSource;
 import org.apache.tapestry.services.ValidationMessagesSource;
 
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
 public class FieldValidatorSourceImpl implements FieldValidatorSource
 {
     private final ValidationMessagesSource _messagesSource;
@@ -46,8 +41,8 @@
     private final PageRenderSupport _pageRenderSupport;
 
     public FieldValidatorSourceImpl(ValidationMessagesSource messagesSource,
-            TypeCoercer typeCoercer, PageRenderSupport pageRenderSupport,
-            Map<String, Validator> validators)
+                                    TypeCoercer typeCoercer, PageRenderSupport pageRenderSupport,
+                                    Map<String, Validator> validators)
     {
         _messagesSource = messagesSource;
         _typeCoercer = typeCoercer;
@@ -79,7 +74,8 @@
     }
 
     public FieldValidator createValidator(Field field, String validatorType,
-            String constraintValue, String overrideId, Messages overrideMessages, Locale locale)
+                                          String constraintValue, String overrideId, Messages overrideMessages,
+                                          Locale locale)
     {
         notBlank(validatorType, "validatorType");
 
@@ -121,11 +117,11 @@
                 validator);
 
         return new FieldValidatorImpl(field, coercedConstraintValue, formatter, validator,
-                _pageRenderSupport);
+                                      _pageRenderSupport);
     }
 
     private MessageFormatter findMessageFormatter(String overrideId, Messages overrideMessages,
-            Locale locale, String validatorType, Validator validator)
+                                                  Locale locale, String validatorType, Validator validator)
     {
 
         String overrideKey = overrideId + "-" + validatorType + "-message";
@@ -171,19 +167,33 @@
     enum State
     {
 
-        /** The start of a validator type. */
+        /**
+         * The start of a validator type.
+         */
         TYPE_START,
-        /** The end of a validator type. */
+        /**
+         * The end of a validator type.
+         */
         TYPE_END,
-        /** Equals sign after a validator type, or a comma. */
+        /**
+         * Equals sign after a validator type, or a comma.
+         */
         EQUALS_OR_COMMA,
-        /** The start of a constraint value. */
+        /**
+         * The start of a constraint value.
+         */
         VALUE_START,
-        /** The end of the constraint value. */
+        /**
+         * The end of the constraint value.
+         */
         VALUE_END,
-        /** The comma after a constraint value. */
+        /**
+         * The comma after a constraint value.
+         */
         COMMA
-    };
+    }
+
+    ;
 
     static List<ValidatorSpecification> parse(String specification)
     {
@@ -312,7 +322,7 @@
                 result.add(new ValidatorSpecification(type));
                 break;
 
-            // Case when the specification ends with an equals sign.
+                // Case when the specification ends with an equals sign.
 
             case VALUE_START:
                 result.add(new ValidatorSpecification(type, ""));
@@ -324,7 +334,7 @@
                 result.add(new ValidatorSpecification(type, value));
                 break;
 
-            // For better or worse, ending the string with a comma is valid.
+                // For better or worse, ending the string with a comma is valid.
 
             default:
 

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java Mon Nov 12 14:22:31 2007
@@ -20,7 +20,7 @@
 /**
  * An implementation of {@link ValueEncoderFactory} that returns a pre-wired instance of
  * {@link ValueEncoder}.
- * 
+ *
  * @param <V>
  */
 public class GenericValueEncoderFactory<V> implements ValueEncoderFactory<V>

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



Mime
View raw message