Return-Path: Delivered-To: apmail-tapestry-commits-archive@locus.apache.org Received: (qmail 86194 invoked from network); 12 Nov 2007 22:29:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Nov 2007 22:29:15 -0000 Received: (qmail 13803 invoked by uid 500); 12 Nov 2007 22:28:59 -0000 Delivered-To: apmail-tapestry-commits-archive@tapestry.apache.org Received: (qmail 13778 invoked by uid 500); 12 Nov 2007 22:28:59 -0000 Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tapestry.apache.org Delivered-To: mailing list commits@tapestry.apache.org Received: (qmail 13749 invoked by uid 99); 12 Nov 2007 22:28:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2007 14:28:58 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Nov 2007 22:28:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 607A81A9866; Mon, 12 Nov 2007 14:28:01 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r594319 [14/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 -0000 To: commits@tapestry.apache.org From: hlship@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071112222801.607A81A9866@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Mon Nov 12 14:22:31 2007 @@ -14,51 +14,9 @@ package org.apache.tapestry.services; -import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE; -import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap; - -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.servlet.ServletContext; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; -import org.apache.tapestry.Asset; -import org.apache.tapestry.Binding; -import org.apache.tapestry.ComponentResources; -import org.apache.tapestry.Link; -import org.apache.tapestry.MarkupWriter; -import org.apache.tapestry.PageRenderSupport; -import org.apache.tapestry.SelectModel; -import org.apache.tapestry.StreamResponse; -import org.apache.tapestry.TapestryConstants; -import org.apache.tapestry.Translator; -import org.apache.tapestry.Validator; -import org.apache.tapestry.annotations.AfterRender; -import org.apache.tapestry.annotations.AfterRenderBody; -import org.apache.tapestry.annotations.AfterRenderTemplate; -import org.apache.tapestry.annotations.BeforeRenderBody; -import org.apache.tapestry.annotations.BeforeRenderTemplate; -import org.apache.tapestry.annotations.BeginRender; -import org.apache.tapestry.annotations.CleanupRender; -import org.apache.tapestry.annotations.InjectPage; -import org.apache.tapestry.annotations.PageAttached; -import org.apache.tapestry.annotations.PageDetached; -import org.apache.tapestry.annotations.PageLoaded; -import org.apache.tapestry.annotations.Path; -import org.apache.tapestry.annotations.Service; -import org.apache.tapestry.annotations.SetupRender; +import org.apache.tapestry.*; +import org.apache.tapestry.annotations.*; import org.apache.tapestry.beaneditor.Validate; import org.apache.tapestry.corelib.data.GridPagerPosition; import org.apache.tapestry.dom.Document; @@ -67,51 +25,18 @@ import org.apache.tapestry.internal.TapestryInternalUtils; import org.apache.tapestry.internal.beaneditor.PrimitiveFieldConstraintGenerator; import org.apache.tapestry.internal.beaneditor.ValidateAnnotationConstraintGenerator; -import org.apache.tapestry.internal.bindings.AssetBindingFactory; -import org.apache.tapestry.internal.bindings.BlockBindingFactory; -import org.apache.tapestry.internal.bindings.ComponentBindingFactory; -import org.apache.tapestry.internal.bindings.LiteralBinding; -import org.apache.tapestry.internal.bindings.LiteralBindingFactory; -import org.apache.tapestry.internal.bindings.MessageBindingFactory; -import org.apache.tapestry.internal.bindings.PropBindingFactory; -import org.apache.tapestry.internal.bindings.TranslateBindingFactory; -import org.apache.tapestry.internal.bindings.ValidateBindingFactory; +import org.apache.tapestry.internal.bindings.*; import org.apache.tapestry.internal.events.InvalidationListener; import org.apache.tapestry.internal.grid.ListGridDataSource; import org.apache.tapestry.internal.grid.NullDataSource; import org.apache.tapestry.internal.services.*; import org.apache.tapestry.internal.util.IntegerRange; -import org.apache.tapestry.ioc.AnnotationProvider; -import org.apache.tapestry.ioc.Configuration; -import org.apache.tapestry.ioc.Location; -import org.apache.tapestry.ioc.MappedConfiguration; -import org.apache.tapestry.ioc.Messages; -import org.apache.tapestry.ioc.ObjectLocator; -import org.apache.tapestry.ioc.ObjectProvider; -import org.apache.tapestry.ioc.OrderedConfiguration; -import org.apache.tapestry.ioc.ServiceBinder; -import org.apache.tapestry.ioc.ServiceResources; -import org.apache.tapestry.ioc.annotations.Inject; -import org.apache.tapestry.ioc.annotations.InjectService; -import org.apache.tapestry.ioc.annotations.Marker; -import org.apache.tapestry.ioc.annotations.Primary; -import org.apache.tapestry.ioc.annotations.Scope; -import org.apache.tapestry.ioc.annotations.Symbol; -import org.apache.tapestry.ioc.annotations.Value; +import org.apache.tapestry.ioc.*; +import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE; +import org.apache.tapestry.ioc.annotations.*; +import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap; import org.apache.tapestry.ioc.internal.util.InternalUtils; -import org.apache.tapestry.ioc.services.Builtin; -import org.apache.tapestry.ioc.services.ChainBuilder; -import org.apache.tapestry.ioc.services.ClassFactory; -import org.apache.tapestry.ioc.services.Coercion; -import org.apache.tapestry.ioc.services.CoercionTuple; -import org.apache.tapestry.ioc.services.PipelineBuilder; -import org.apache.tapestry.ioc.services.PropertyAccess; -import org.apache.tapestry.ioc.services.PropertyShadowBuilder; -import org.apache.tapestry.ioc.services.StrategyBuilder; -import org.apache.tapestry.ioc.services.SymbolSource; -import org.apache.tapestry.ioc.services.ThreadCleanupHub; -import org.apache.tapestry.ioc.services.ThreadLocale; -import org.apache.tapestry.ioc.services.TypeCoercer; +import org.apache.tapestry.ioc.services.*; import org.apache.tapestry.ioc.util.StrategyRegistry; import org.apache.tapestry.runtime.Component; import org.apache.tapestry.runtime.ComponentResourcesAware; @@ -121,14 +46,20 @@ import org.apache.tapestry.translator.LongTranslator; import org.apache.tapestry.translator.StringTranslator; import org.apache.tapestry.util.StringToEnumCoercion; -import org.apache.tapestry.validator.Max; -import org.apache.tapestry.validator.MaxLength; -import org.apache.tapestry.validator.Min; -import org.apache.tapestry.validator.MinLength; -import org.apache.tapestry.validator.Regexp; -import org.apache.tapestry.validator.Required; +import org.apache.tapestry.validator.*; import org.slf4j.Logger; +import javax.servlet.ServletContext; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * The root module for Tapestry. */ @@ -182,14 +113,14 @@ public static Alias build(Logger logger, - @Inject - @Symbol(InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL) - String mode, + @Inject + @Symbol(InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL) + String mode, - @InjectService("AliasOverrides") - AliasManager overridesManager, + @InjectService("AliasOverrides") + AliasManager overridesManager, - Collection configuration) + Collection configuration) { AliasManager manager = new AliasManagerImpl(logger, configuration); @@ -215,13 +146,13 @@ * */ public static void contributeAlias(Configuration configuration, - ObjectLocator locator, + ObjectLocator locator, - @ComponentLayer - ClassFactory componentClassFactory, + @ComponentLayer + ClassFactory componentClassFactory, - @InjectService("DefaultDataTypeAnalyzer") - DataTypeAnalyzer dataTypeAnalyzer) + @InjectService("DefaultDataTypeAnalyzer") + DataTypeAnalyzer dataTypeAnalyzer) { add(configuration, locator, ComponentEventResultProcessor.class, ObjectRenderer.class); @@ -231,7 +162,7 @@ @SuppressWarnings("unchecked") private static void add(Configuration configuration, ObjectLocator locator, - Class... serviceInterfaces) + Class... serviceInterfaces) { for (Class serviceInterface : serviceInterfaces) { @@ -250,7 +181,7 @@ * whose configuration contribution define spot overrides to specific services. */ public static AliasManager buildAliasOverrides(Logger logger, - Collection configuration) + Collection configuration) { return new AliasManagerImpl(logger, configuration); } @@ -488,16 +419,16 @@ } private static void addEditBlock(Configuration configuration, - String dataType, String blockId) + String dataType, String blockId) { configuration.add(new BeanBlockContribution(dataType, "PropertyEditBlocks", blockId, true)); } private static void addDisplayBlock(Configuration configuration, - String dataType, String blockId) + String dataType, String blockId) { configuration.add(new BeanBlockContribution(dataType, "PropertyDisplayBlocks", blockId, - false)); + false)); } /** @@ -595,7 +526,7 @@ ObjectProvider wrapper = new ObjectProvider() { public T provide(Class objectType, AnnotationProvider annotationProvider, - ObjectLocator locator) + ObjectLocator locator) { return alias.getObjectProvider().provide(objectType, annotationProvider, locator); } @@ -614,7 +545,7 @@ * this filter. */ public static void contributeRequestHandler(OrderedConfiguration configuration, - Context context, final RequestExceptionHandler exceptionHandler) + Context context, final RequestExceptionHandler exceptionHandler) { RequestFilter staticFilesFilter = new StaticFilesFilter(context); @@ -791,7 +722,7 @@ } private static void add(Configuration configuration, Class sourceType, - Class targetType, Coercion coercion) + Class targetType, Coercion coercion) { CoercionTuple tuple = new CoercionTuple(sourceType, targetType, coercion); @@ -799,11 +730,11 @@ } private static void add(OrderedConfiguration configuration, - Class annotationClass, - TransformMethodSignature lifecycleMethodSignature, String methodAlias) + Class annotationClass, + TransformMethodSignature lifecycleMethodSignature, String methodAlias) { ComponentClassTransformWorker worker = new PageLifecycleAnnotationWorker(annotationClass, - lifecycleMethodSignature, methodAlias); + lifecycleMethodSignature, methodAlias); String name = TapestryInternalUtils.lastTerm(annotationClass.getName()); @@ -811,15 +742,15 @@ } private static void add(OrderedConfiguration configuration, - TransformMethodSignature signature, Class annotationClass, - boolean reverse) + TransformMethodSignature signature, Class annotationClass, + boolean reverse) { // make the name match the annotation class name. String name = TapestryInternalUtils.lastTerm(annotationClass.getName()); configuration.add(name, new ComponentLifecycleMethodWorker(signature, annotationClass, - reverse)); + reverse)); } private final PipelineBuilder _pipelineBuilder; @@ -858,36 +789,36 @@ public TapestryModule(PipelineBuilder pipelineBuilder, - PropertyShadowBuilder shadowBuilder, + PropertyShadowBuilder shadowBuilder, - RequestGlobals requestGlobals, + RequestGlobals requestGlobals, - ApplicationGlobals applicationGlobals, + ApplicationGlobals applicationGlobals, - ChainBuilder chainBuilder, + ChainBuilder chainBuilder, - RequestPageCache requestPageCache, + RequestPageCache requestPageCache, - Environment environment, + Environment environment, - StrategyBuilder strategyBuilder, + StrategyBuilder strategyBuilder, - ComponentInstantiatorSource componentInstantiatorSource, + ComponentInstantiatorSource componentInstantiatorSource, - LinkFactory linkFactory, + LinkFactory linkFactory, - PropertyAccess propertyAccess, + PropertyAccess propertyAccess, - @ComponentLayer - ClassFactory componentClassFactory, + @ComponentLayer + ClassFactory componentClassFactory, - UpdateListenerHub updateListenerHub, ThreadCleanupHub threadCleanupHub, + UpdateListenerHub updateListenerHub, ThreadCleanupHub threadCleanupHub, - ComponentTemplateSource componentTemplateSource, + ComponentTemplateSource componentTemplateSource, - Request request, + Request request, - ThreadLocale threadLocale) + ThreadLocale threadLocale) { _pipelineBuilder = pipelineBuilder; _shadowBuilder = shadowBuilder; @@ -931,13 +862,13 @@ * "org/apache/tapestry/internal/ValidationMessages". */ public ValidationMessagesSource build(Collection configuration, - UpdateListenerHub updateListenerHub, + UpdateListenerHub updateListenerHub, - @ClasspathProvider - AssetFactory classpathAssetFactory) + @ClasspathProvider + AssetFactory classpathAssetFactory) { ValidationMessagesSourceImpl service = new ValidationMessagesSourceImpl(configuration, - classpathAssetFactory.getRootResource()); + classpathAssetFactory.getRootResource()); updateListenerHub.addUpdateListener(service); @@ -1016,9 +947,11 @@ }; } - /** Initializes the application. */ + /** + * Initializes the application. + */ public ApplicationInitializer build(Logger logger, - List configuration) + List configuration) { ApplicationInitializer terminator = new ApplicationInitializer() { @@ -1037,10 +970,10 @@ } public HttpServletRequestHandler build(Logger logger, - List configuration, + List configuration, - @InjectService("RequestHandler") - final RequestHandler handler) + @InjectService("RequestHandler") + final RequestHandler handler) { HttpServletRequestHandler terminator = new HttpServletRequestHandler() { @@ -1062,8 +995,8 @@ } public RequestHandler build(Logger logger, List configuration, - @InjectService("MasterDispatcher") - final Dispatcher masterDispatcher) + @InjectService("MasterDispatcher") + final Dispatcher masterDispatcher) { RequestHandler terminator = new RequestHandler() { @@ -1084,9 +1017,9 @@ } public ServletApplicationInitializer build(Logger logger, - List configuration, - @InjectService("ApplicationInitializer") - final ApplicationInitializer initializer) + List configuration, + @InjectService("ApplicationInitializer") + final ApplicationInitializer initializer) { ServletApplicationInitializer terminator = new ServletApplicationInitializer() { @@ -1149,7 +1082,7 @@ } public ObjectRenderer build(StrategyBuilder strategyBuilder, - Map configuration) + Map configuration) { StrategyRegistry registry = StrategyRegistry.newInstance( ObjectRenderer.class, @@ -1160,12 +1093,12 @@ public static ComponentMessagesSource build(UpdateListenerHub updateListenerHub, - @ContextProvider - AssetFactory contextAssetFactory, + @ContextProvider + AssetFactory contextAssetFactory, - @Inject - @Value("WEB-INF/${tapestry.app-name}.properties") - String appCatalog) + @Inject + @Value("WEB-INF/${tapestry.app-name}.properties") + String appCatalog) { ComponentMessagesSourceImpl service = new ComponentMessagesSourceImpl(contextAssetFactory .getRootResource(), appCatalog); @@ -1209,7 +1142,7 @@ public PropertyConduitSource buildPropertyConduitSource() { PropertyConduitSourceImpl service = new PropertyConduitSourceImpl(_propertyAccess, - _componentClassFactory); + _componentClassFactory); _componentInstantiatorSource.addInvalidationListener(service); @@ -1234,7 +1167,9 @@ return _shadowBuilder.build(_requestGlobals, "response", Response.class); } - /** Contributes the default "session" strategy. */ + /** + * Contributes the default "session" strategy. + */ public void contributeApplicationStatePersistenceStrategySource( MappedConfiguration configuration, @@ -1244,11 +1179,11 @@ } public void contributeAssetSource(MappedConfiguration configuration, - @ContextProvider - AssetFactory contextAssetFactory, + @ContextProvider + AssetFactory contextAssetFactory, - @ClasspathProvider - AssetFactory classpathAssetFactory) + @ClasspathProvider + AssetFactory classpathAssetFactory) { configuration.add("context", contextAssetFactory); configuration.add("classpath", classpathAssetFactory); @@ -1271,12 +1206,12 @@ */ public void contributeComponentEventResultProcessor( - @InjectService("ComponentInstanceResultProcessor") - ComponentEventResultProcessor componentInstanceProcessor, + @InjectService("ComponentInstanceResultProcessor") + ComponentEventResultProcessor componentInstanceProcessor, - ComponentClassResolver componentClassResolver, + ComponentClassResolver componentClassResolver, - MappedConfiguration configuration) + MappedConfiguration configuration) { configuration.add( ActionResponseGenerator.class, @@ -1294,7 +1229,7 @@ { public ActionResponseGenerator processComponentEvent(Link value, Component component, - String methodDescripion) + String methodDescripion) { return new LinkActionResponseGenerator(value); } @@ -1303,7 +1238,7 @@ configuration.add(String.class, new StringResultProcessor(_requestPageCache, _linkFactory)); configuration.add(Class.class, new ClassResultProcessor(componentClassResolver, - _requestPageCache, _linkFactory)); + _requestPageCache, _linkFactory)); configuration.add(Component.class, componentInstanceProcessor); @@ -1312,25 +1247,25 @@ public void contributeMasterDispatcher(OrderedConfiguration configuration, - ClasspathAssetAliasManager aliasManager, + ClasspathAssetAliasManager aliasManager, - ResourceCache resourceCache, + ResourceCache resourceCache, - ResourceStreamer streamer, + ResourceStreamer streamer, - PageRenderRequestHandler pageRenderRequestHandler, + PageRenderRequestHandler pageRenderRequestHandler, - ComponentActionRequestHandler componentActionRequestHandler, + ComponentActionRequestHandler componentActionRequestHandler, - ComponentClassResolver componentClassResolver, + ComponentClassResolver componentClassResolver, - @Symbol("tapestry.start-page-name") - String startPageName) + @Symbol("tapestry.start-page-name") + String startPageName) { // Looks for the root path and renders the start page configuration.add("RootPath", new RootPathDispatcher(componentClassResolver, - pageRenderRequestHandler, startPageName), "before:Asset"); + pageRenderRequestHandler, startPageName), "before:Asset"); // This goes first because an asset to be streamed may have an file extension, such as // ".html", that will confuse the later dispatchers. @@ -1341,7 +1276,7 @@ "before:PageRender"); configuration.add("PageRender", new PageRenderDispatcher(componentClassResolver, - pageRenderRequestHandler)); + pageRenderRequestHandler)); configuration.add("ComponentAction", new ComponentActionDispatcher( componentActionRequestHandler), "after:PageRender"); @@ -1357,7 +1292,7 @@ *
{@link TapestryConstants#RESPONSE_ENCODING} *
UTF-8 * - * + * * @param configuration */ public void contributeMetaDataLocator(MappedConfiguration configuration) @@ -1376,10 +1311,10 @@ */ public void contributeObjectRenderer(MappedConfiguration configuration, - @InjectService("LocationRenderer") - ObjectRenderer locationRenderer, + @InjectService("LocationRenderer") + ObjectRenderer locationRenderer, - final TypeCoercer typeCoercer) + final TypeCoercer typeCoercer) { configuration.add(Object.class, new ObjectRenderer() { @@ -1443,14 +1378,14 @@ environment.push(DocumentHeadBuilder.class, builder); PageRenderSupportImpl support = new PageRenderSupportImpl(builder, - symbolSource, - assetSource, + symbolSource, + assetSource, - // Core scripts added to any page that uses scripting + // Core scripts added to any page that uses scripting - "${tapestry.scriptaculous}/prototype.js", - "${tapestry.scriptaculous}/scriptaculous.js", - "org/apache/tapestry/tapestry.js"); + "${tapestry.scriptaculous}/prototype.js", + "${tapestry.scriptaculous}/scriptaculous.js", + "org/apache/tapestry/tapestry.js"); support.addStylesheetLink(stylesheetAsset, null); @@ -1523,7 +1458,7 @@ *
  • String *
  • Enum * - * + * * @param configuration */ @SuppressWarnings("unchecked") @@ -1561,13 +1496,12 @@ * Configures the extensions that will require a digest to be downloaded via the asset * dispatcher. Most resources are "safe", they don't require a digest. For unsafe resources, the * digest is incorporated into the URL to ensure that the client side isn't just "fishing". - *

    + *

    * The extensions must be all lower case. - *

    + *

    * This contributes "class" and "tml" (the template extension). - * - * @param configuration - * collection of extensions + * + * @param configuration collection of extensions */ public static void contributeResourceDigestGenerator(Configuration configuration) { @@ -1599,7 +1533,7 @@ /** * Contributes factory defaults that map be overridden. - * + * * @see TapestryModule#contributeClasspathAssetAliasManager(MappedConfiguration, String, String) */ public static void contributeFactoryDefaults(MappedConfiguration configuration) @@ -1635,18 +1569,18 @@ public PageTemplateLocator build(@ContextProvider AssetFactory contextAssetFactory, - ComponentClassResolver componentClassResolver) + ComponentClassResolver componentClassResolver) { return new PageTemplateLocatorImpl(contextAssetFactory.getRootResource(), - componentClassResolver); + componentClassResolver); } public ComponentInstantiatorSource build(@Builtin ClassFactory classFactory, - ComponentClassTransformer transformer, + ComponentClassTransformer transformer, - Logger logger) + Logger logger) { ComponentInstantiatorSourceImpl source = new ComponentInstantiatorSourceImpl(classFactory .getClassLoader(), transformer, logger); @@ -1667,7 +1601,7 @@ } public PagePool build(Logger logger, PageLoader pageLoader, - ComponentMessagesSource componentMessagesSource, ComponentClassResolver resolver) + ComponentMessagesSource componentMessagesSource, ComponentClassResolver resolver) { PagePoolImpl service = new PagePoolImpl(logger, pageLoader, _threadLocale, resolver); @@ -1729,7 +1663,7 @@ @Marker(ClasspathProvider.class) public AssetFactory buildClasspathAssetFactory(ResourceCache resourceCache, - ClasspathAssetAliasManager aliasManager) + ClasspathAssetAliasManager aliasManager) { ClasspathAssetFactory factory = new ClasspathAssetFactory(resourceCache, aliasManager); @@ -1774,13 +1708,12 @@ * Builds the PropBindingFactory as a chain of command. The terminator of the chain is * responsible for ordinary property names (and property paths). Contributions to the service * cover additional special cases, such as simple literal values. - * - * @param configuration - * contributions of special factories for some constants, each contributed factory - * may return a binding if applicable, or null otherwise + * + * @param configuration contributions of special factories for some constants, each contributed factory + * may return a binding if applicable, or null otherwise */ public BindingFactory buildPropBindingFactory(List configuration, - PropertyConduitSource propertyConduitSource) + PropertyConduitSource propertyConduitSource) { PropBindingFactory service = new PropBindingFactory(propertyConduitSource); @@ -1845,7 +1778,7 @@ } public Binding newBinding(String description, ComponentResources container, - ComponentResources component, String expression, Location location) + ComponentResources component, String expression, Location location) { String key = expression.trim(); @@ -1860,7 +1793,7 @@ { public Binding newBinding(String description, ComponentResources container, - ComponentResources component, String expression, Location location) + ComponentResources component, String expression, Location location) { if ("this".equalsIgnoreCase(expression.trim())) return new LiteralBinding(description, container.getComponent(), location); @@ -1874,7 +1807,7 @@ private final Pattern _pattern = Pattern.compile("^\\s*(-?\\d+)\\s*$"); public Binding newBinding(String description, ComponentResources container, - ComponentResources component, String expression, Location location) + ComponentResources component, String expression, Location location) { Matcher matcher = _pattern.matcher(expression); @@ -1895,7 +1828,7 @@ .compile("^\\s*(-?\\d+)\\s*\\.\\.\\s*(-?\\d+)\\s*$"); public Binding newBinding(String description, ComponentResources container, - ComponentResources component, String expression, Location location) + ComponentResources component, String expression, Location location) { Matcher matcher = _pattern.matcher(expression); @@ -1920,7 +1853,7 @@ .compile("^\\s*(\\-?((\\d+\\.)|(\\d*\\.\\d+)))\\s*$"); public Binding newBinding(String description, ComponentResources container, - ComponentResources component, String expression, Location location) + ComponentResources component, String expression, Location location) { Matcher matcher = _pattern.matcher(expression); @@ -1942,7 +1875,7 @@ private final Pattern _pattern = Pattern.compile("^\\s*'(.*)'\\s*$"); public Binding newBinding(String description, ComponentResources container, - ComponentResources component, String expression, Location location) + ComponentResources component, String expression, Location location) { Matcher matcher = _pattern.matcher(expression); @@ -1971,25 +1904,25 @@ * Adds a filter that checks for updates to classes and other resources. It is ordered before:*. */ public void contributeRequestHandler(OrderedConfiguration configuration, - RequestGlobals requestGlobals, + RequestGlobals requestGlobals, - // @Inject not needed because its a long, not a String - @Symbol("tapestry.file-check-interval") - long checkInterval, + // @Inject not needed because its a long, not a String + @Symbol("tapestry.file-check-interval") + long checkInterval, - @Symbol("tapestry.file-check-update-timeout") - long updateTimeout, + @Symbol("tapestry.file-check-update-timeout") + long updateTimeout, - LocalizationSetter localizationSetter) + LocalizationSetter localizationSetter) { configuration.add("CheckForUpdates", new CheckForUpdatesFilter(_updateListenerHub, - checkInterval, updateTimeout), "before:*"); + checkInterval, updateTimeout), "before:*"); configuration.add("Localization", new LocalizationFilter(localizationSetter)); } public PersistentFieldStrategy buildClientPersistentFieldStrategy(LinkFactory linkFactory, - ServiceResources resources) + ServiceResources resources) { ClientPersistentFieldStrategy service = resources .autobuild(ClientPersistentFieldStrategy.class); @@ -2006,8 +1939,8 @@ ComponentActionRequestFilter filter = new ComponentActionRequestFilter() { public ActionResponseGenerator handle(String logicalPageName, String nestedComponentId, - String eventType, String[] context, String[] activationContext, - ComponentActionRequestHandler handler) + String eventType, String[] context, String[] activationContext, + ComponentActionRequestHandler handler) { encodingInitializer.initializeRequestEncoding(logicalPageName); Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java Mon Nov 12 14:22:31 2007 @@ -14,12 +14,12 @@ package org.apache.tapestry.services; -import java.lang.reflect.Modifier; - import org.apache.tapestry.MarkupWriter; import org.apache.tapestry.runtime.ComponentEvent; import org.apache.tapestry.runtime.Event; +import java.lang.reflect.Modifier; + /** * Constants used by implementations of * {@link org.apache.tapestry.services.ComponentClassTransformWorker}. @@ -29,16 +29,16 @@ // Shared parameters of a whole bunch of lifecycle methods, representing the different // component render states. private static final String[] RENDER_PHASE_METHOD_PARAMETERS = - { MarkupWriter.class.getName(), Event.class.getName() }; + {MarkupWriter.class.getName(), Event.class.getName()}; /** * Signature for {@link org.apache.tapestry.runtime.Component#handleEvent(Event event) - * + * * @see org.apache.tapestry.annotations.OnEvent */ public static final TransformMethodSignature HANDLE_COMPONENT_EVENT = new TransformMethodSignature( Modifier.PUBLIC, "boolean", "handleComponentEvent", new String[] - { ComponentEvent.class.getName() }, null); + {ComponentEvent.class.getName()}, null); /** * Signature for @@ -47,7 +47,9 @@ public static final TransformMethodSignature CONTAINING_PAGE_DID_LOAD_SIGNATURE = new TransformMethodSignature( "containingPageDidLoad"); - /** Signature for {@link org.apache.tapestry.runtime.Component#postRenderCleanup()}. */ + /** + * Signature for {@link org.apache.tapestry.runtime.Component#postRenderCleanup()}. + */ public static final TransformMethodSignature POST_RENDER_CLEANUP_SIGNATURE = new TransformMethodSignature( "postRenderCleanup"); @@ -67,14 +69,14 @@ /** * Signature for {@link org.apache.tapestry.runtime.Component#setupRender(MarkupWriter, Event)}. - * + * * @see org.apache.tapestry.annotations.SetupRender */ public static final TransformMethodSignature SETUP_RENDER_SIGNATURE = renderPhaseSignature("setupRender"); /** * Signature for {@link org.apache.tapestry.runtime.Component#beginRender(MarkupWriter, Event)}. - * + * * @see org.apache.tapestry.annotations.BeginRender */ public static final TransformMethodSignature BEGIN_RENDER_SIGNATURE = renderPhaseSignature("beginRender"); @@ -82,38 +84,41 @@ /** * Signature for * {@link org.apache.tapestry.runtime.Component#beforeRenderTemplate(MarkupWriter, Event)}. - * + * * @see org.apache.tapestry.annotations.BeforeRenderTemplate */ - public static TransformMethodSignature BEFORE_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature("beforeRenderTemplate"); + public static TransformMethodSignature BEFORE_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature( + "beforeRenderTemplate"); /** * Signature for * {@link org.apache.tapestry.runtime.Component#afterRenderTemplate(MarkupWriter, Event)}. - * + * * @see org.apache.tapestry.annotations.BeforeRenderTemplate */ - public static TransformMethodSignature AFTER_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature("afterRenderTemplate"); + public static TransformMethodSignature AFTER_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature( + "afterRenderTemplate"); /** * Signature for * {@link org.apache.tapestry.runtime.Component#beforeRenderBody(MarkupWriter, Event)}. - * + * * @see org.apache.tapestry.annotations.BeforeRenderBody */ - public static final TransformMethodSignature BEFORE_RENDER_BODY_SIGNATURE = renderPhaseSignature("beforeRenderBody"); + public static final TransformMethodSignature BEFORE_RENDER_BODY_SIGNATURE = renderPhaseSignature( + "beforeRenderBody"); /** * Signature for * {@link org.apache.tapestry.runtime.Component#afterRenderBody(MarkupWriter, Event)}. - * + * * @see org.apache.tapestry.annotations.AfterRenderBody */ public static final TransformMethodSignature AFTER_RENDER_BODY_SIGNATURE = renderPhaseSignature("afterRenderBody"); /** * Signature for {@link org.apache.tapestry.runtime.Component#afterRender(MarkupWriter, Event)} - * + * * @see org.apache.tapestry.annotations.AfterRender */ public static final TransformMethodSignature AFTER_RENDER_SIGNATURE = renderPhaseSignature("afterRender"); @@ -121,7 +126,7 @@ /** * Signature for * {@link org.apache.tapestry.runtime.Component#cleanupRender(MarkupWriter, Event)}. - * + * * @see org.apache.tapestry.annotations.CleanupRender */ public static final TransformMethodSignature CLEANUP_RENDER_SIGNATURE = renderPhaseSignature("cleanupRender"); @@ -133,6 +138,6 @@ private static TransformMethodSignature renderPhaseSignature(String name) { return new TransformMethodSignature(Modifier.PUBLIC, "void", name, RENDER_PHASE_METHOD_PARAMETERS, - null); + null); } } Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java Mon Nov 12 14:22:31 2007 @@ -21,7 +21,7 @@ /** * A representation of a method signature, which consists of its name, modifiers (primarily, * visibility), return type, parameter types, and declared exception types. - *

    + *

    * Types are stored as class names (or primitive names) because the signature is used with * {@link ClassTransformation} (which operates on as-yet unloaded classes). */ @@ -41,7 +41,9 @@ private static final String[] EMPTY_STRINGS = new String[0]; - /** Convenience for adding a public void method with no parameters or exception types. */ + /** + * Convenience for adding a public void method with no parameters or exception types. + */ public TransformMethodSignature(String name) { @@ -49,7 +51,7 @@ } public TransformMethodSignature(int modifiers, String type, String name, - String[] parameterTypes, String[] exceptionTypes) + String[] parameterTypes, String[] exceptionTypes) { _modifiers = modifiers; @@ -77,7 +79,9 @@ return _exceptionTypes; } - /** Returns the name of the method. */ + /** + * Returns the name of the method. + */ public String getMethodName() { return _methodName; @@ -85,7 +89,7 @@ /** * Returns the set of modifier flags for this method. - * + * * @see java.lang.reflect.Modifier */ public int getModifiers() @@ -102,7 +106,9 @@ return _parameterTypes; } - /** Return the type name of the return type of the method. */ + /** + * Return the type name of the return type of the method. + */ public String getReturnType() { return _returnType; @@ -225,7 +231,7 @@ * Returns a shortened form of the string representation of the method. It lists just the name * of the method and the types of any parameters, omitting return type, exceptions and * modifiers. - * + * * @return */ public String getMediumDescription() Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformUtils.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformUtils.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformUtils.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformUtils.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.services; -import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap; - -import java.util.Map; +import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap; + +import java.util.Map; /** * Support code for generating code (used when transforming component classes). @@ -75,10 +75,10 @@ } private static void add(Class primitiveType, Class wrapperType, String unwrapperMethodName, - String defaultValue) + String defaultValue) { PrimitiveTypeInfo info = new PrimitiveTypeInfo(wrapperType, unwrapperMethodName, - defaultValue); + defaultValue); _classToInfo.put(primitiveType, info); _nameToInfo.put(primitiveType.getName(), info); @@ -95,9 +95,8 @@ /** * Returns the name of wrapper type for a given input type. For primitive types, returns the * wrapper type. For other types, returns the input type name. - * - * @param type - * primitive type name, or fully qualified class name + * + * @param type primitive type name, or fully qualified class name */ public static String getWrapperTypeName(String type) { @@ -109,9 +108,8 @@ /** * For primitive types, returns the method on the wrapper type that converts back to * the primitive. - * - * @param type - * the primitive type + * + * @param type the primitive type * @return the method of the corresponding wrapper type, or null if type is not a primitive type */ public static String getUnwrapperMethodName(String type) @@ -124,9 +122,8 @@ /** * Returns the wrapper type for a given input type. For primitive types, returns the wrapper * type. For other types, returns the type itself. - * - * @param type - * primitive or object type + * + * @param type primitive or object type */ public static Class getWrapperType(Class type) { Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorDefaultSource.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorDefaultSource.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorDefaultSource.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorDefaultSource.java Mon Nov 12 14:22:31 2007 @@ -27,12 +27,10 @@ * Finds a {@link Translator} that is appropriate to the given type, which is usually obtained * via {@link Binding#getBindingType()}. Performs an inheritanced-based search for the best * match. - * - * @param valueType - * the type of value for which a default translator is needed + * + * @param valueType the type of value for which a default translator is needed * @return the matching translator - * @throws IllegalArgumentException - * if no translator may be found + * @throws IllegalArgumentException if no translator may be found */ Translator find(Class valueType); } Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorSource.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorSource.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorSource.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TranslatorSource.java Mon Nov 12 14:22:31 2007 @@ -23,12 +23,10 @@ { /** * Returns the translator with the given logical name. - * - * @param name - * name of translator (as configured) + * + * @param name name of translator (as configured) * @return the shared translator instance - * @throws RuntimeException - * if no translator is configured for the provided name + * @throws RuntimeException if no translator is configured for the provided name */ Translator get(String name); } Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationConstraintGenerator.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationConstraintGenerator.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationConstraintGenerator.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationConstraintGenerator.java Mon Nov 12 14:22:31 2007 @@ -14,11 +14,11 @@ package org.apache.tapestry.services; -import java.util.List; - import org.apache.tapestry.FieldValidator; import org.apache.tapestry.ioc.AnnotationProvider; +import java.util.List; + /** * Invoked to generate a list of validation constraint strings for a property. This typically * involves scanning the property for annotations or naming conventions that confer the desired @@ -34,12 +34,10 @@ * {@link FieldValidatorSource#createValidators(org.apache.tapestry.Field, String) validate specification}. * These will ultimately be used to create {@link FieldValidator}s for the field that edits the * property. - * - * @param propertyType - * the type of the property for which constraints are needed - * @param annotationProvider - * provides access to any annotations concerning the property (for implementations - * that are based on analysis of property annotations) + * + * @param propertyType the type of the property for which constraints are needed + * @param annotationProvider provides access to any annotations concerning the property (for implementations + * that are based on analysis of property annotations) * @return a list of constraints * @see FieldValidatorSource */ Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationMessagesSource.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationMessagesSource.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationMessagesSource.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValidationMessagesSource.java Mon Nov 12 14:22:31 2007 @@ -14,9 +14,9 @@ package org.apache.tapestry.services; -import java.util.Locale; - import org.apache.tapestry.ioc.Messages; + +import java.util.Locale; /** * Source for validation messages, within a particular locale. Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValueEncoderSource.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValueEncoderSource.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValueEncoderSource.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ValueEncoderSource.java Mon Nov 12 14:22:31 2007 @@ -24,11 +24,9 @@ { /** * Creates a value encoder based on the type of the named parameter. - * - * @param parameterName - * the name of the parameter whose type is used to locate a PKE factory - * @param resources - * the resources of the component, from which parameter and its type are extracted + * + * @param parameterName the name of the parameter whose type is used to locate a PKE factory + * @param resources the resources of the component, from which parameter and its type are extracted * @return the value encoder */ ValueEncoder createEncoder(String parameterName, ComponentResources resources); Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java Mon Nov 12 14:22:31 2007 @@ -14,34 +14,24 @@ package org.apache.tapestry.test; -import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap; -import static org.apache.tapestry.ioc.internal.util.Defense.notNull; - -import java.util.Locale; -import java.util.Map; - import org.apache.tapestry.dom.Document; import org.apache.tapestry.dom.Element; import org.apache.tapestry.dom.Node; import org.apache.tapestry.internal.InternalConstants; import org.apache.tapestry.internal.SingleKeySymbolProvider; import org.apache.tapestry.internal.TapestryAppInitializer; -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.LocalizationSetter; -import org.apache.tapestry.internal.services.PageLinkTarget; -import org.apache.tapestry.internal.test.ActionLinkInvoker; -import org.apache.tapestry.internal.test.ComponentInvoker; -import org.apache.tapestry.internal.test.PageLinkInvoker; -import org.apache.tapestry.internal.test.PageTesterContext; -import org.apache.tapestry.internal.test.PageTesterModule; -import org.apache.tapestry.internal.test.TestableRequest; +import org.apache.tapestry.internal.services.*; +import org.apache.tapestry.internal.test.*; import org.apache.tapestry.ioc.Registry; +import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap; +import static org.apache.tapestry.ioc.internal.util.Defense.notNull; import org.apache.tapestry.ioc.services.SymbolProvider; import org.apache.tapestry.ioc.util.StrategyRegistry; import org.apache.tapestry.services.ApplicationGlobals; +import java.util.Locale; +import java.util.Map; + /** * This class is used to run a Tapestry app in an in-process testing environment. You can ask it to * render a certain page and check the DOM object created. You can also ask it to click on a link @@ -71,7 +61,7 @@ /** * Initializes a PageTester without overriding any services and assuming that the context root * is in src/main/webapp. - * + * * @see #PageTester(String, String, String, Map) */ public PageTester(String appPackage, String appName) @@ -82,19 +72,15 @@ /** * Initializes a PageTester that acts as a browser and a servlet container to test drive your * Tapestry pages. - * - * @param appPackage - * The same value you would specify using the tapestry.app-package context parameter. - * As this testing environment is not run in a servlet container, you need to specify - * it. - * @param appName - * The same value you would specify as the filter name. It is used to form the name - * of the module builder for your app. If you don't have one, pass an empty string. - * @param contextPath - * The path to the context root so that Tapestry can find the templates (if they're - * put there). - * @param modulesClasses - * Classes of additional modules to load + * + * @param appPackage The same value you would specify using the tapestry.app-package context parameter. + * As this testing environment is not run in a servlet container, you need to specify + * it. + * @param appName The same value you would specify as the filter name. It is used to form the name + * of the module builder for your app. If you don't have one, pass an empty string. + * @param contextPath The path to the context root so that Tapestry can find the templates (if they're + * put there). + * @param modulesClasses Classes of additional modules to load */ public PageTester(String appPackage, String appName, String contextPath, Class... moduleClasses) { @@ -105,11 +91,11 @@ InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage); TapestryAppInitializer initializer = new TapestryAppInitializer(provider, appName, - PageTesterModule.TEST_MODE); + PageTesterModule.TEST_MODE); initializer.addModules(PageTesterModule.class); initializer.addModules(moduleClasses); - + _registry = initializer.getRegistry(); _request = _registry.getObject(TestableRequest.class, null); @@ -129,7 +115,9 @@ _invokerRegistry = new StrategyRegistry(ComponentInvoker.class, map); } - /** You should call it after use */ + /** + * You should call it after use + */ public void shutdown() { _registry.shutdown(); @@ -137,9 +125,8 @@ /** * Renders a page specified by its name. - * - * @param pageName - * The name of the page to be rendered. + * + * @param pageName The name of the page to be rendered. * @return The DOM created. Typically you will assert against it. */ public Document renderPage(String pageName) @@ -149,9 +136,8 @@ /** * Simulates a click on a link. - * - * @param link - * The Link object to be "clicked" on. + * + * @param link The Link object to be "clicked" on. * @return The DOM created. Typically you will assert against it. */ public Document clickLink(Element link) @@ -195,11 +181,9 @@ /** * Simulates a submission of the form specified. The caller can specify values for the form * fields. - * - * @param form - * the form to be submitted. - * @param parameters - * the query parameter name/value pairs + * + * @param form the form to be submitted. + * @param parameters the query parameter name/value pairs * @return The DOM created. Typically you will assert against it. */ public Document submitForm(Element form, Map parameters) @@ -220,11 +204,9 @@ /** * Simulates a submission of the form by clicking the specified submit button. The caller can * specify values for the form fields. - * - * @param submitButton - * the submit button to be clicked. - * @param fieldValues - * the field values keyed on field names. + * + * @param submitButton the submit button to be clicked. + * @param fieldValues the field values keyed on field names. * @return The DOM created. Typically you will assert against it. */ public Document clickSubmit(Element submitButton, Map fieldValues) Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java Mon Nov 12 14:22:31 2007 @@ -14,43 +14,7 @@ package org.apache.tapestry.test; -import static java.lang.Thread.sleep; -import static org.apache.tapestry.internal.test.CodeEq.codeEq; -import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList; -import static org.easymock.EasyMock.eq; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.annotation.Annotation; -import java.net.URL; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; - -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.apache.tapestry.Asset; -import org.apache.tapestry.Binding; -import org.apache.tapestry.Block; -import org.apache.tapestry.ComponentEventHandler; -import org.apache.tapestry.ComponentResources; -import org.apache.tapestry.ComponentResourcesCommon; -import org.apache.tapestry.Field; -import org.apache.tapestry.FieldValidator; -import org.apache.tapestry.Link; -import org.apache.tapestry.MarkupWriter; -import org.apache.tapestry.PropertyConduit; -import org.apache.tapestry.Translator; -import org.apache.tapestry.ValidationTracker; -import org.apache.tapestry.Validator; +import org.apache.tapestry.*; import org.apache.tapestry.annotations.Id; import org.apache.tapestry.annotations.Parameter; import org.apache.tapestry.annotations.Path; @@ -59,49 +23,31 @@ import org.apache.tapestry.internal.TapestryInternalUtils; import org.apache.tapestry.internal.services.MapMessages; import org.apache.tapestry.internal.services.MarkupWriterImpl; -import org.apache.tapestry.ioc.AnnotationProvider; -import org.apache.tapestry.ioc.Locatable; -import org.apache.tapestry.ioc.Location; -import org.apache.tapestry.ioc.Messages; -import org.apache.tapestry.ioc.ObjectLocator; -import org.apache.tapestry.ioc.Resource; +import static org.apache.tapestry.internal.test.CodeEq.codeEq; +import org.apache.tapestry.ioc.*; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.ioc.internal.util.CollectionFactory; +import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList; import org.apache.tapestry.ioc.test.IOCTestCase; import org.apache.tapestry.model.ComponentModel; import org.apache.tapestry.model.MutableComponentModel; import org.apache.tapestry.model.ParameterModel; import org.apache.tapestry.runtime.Component; -import org.apache.tapestry.services.AliasManager; -import org.apache.tapestry.services.ApplicationStateCreator; -import org.apache.tapestry.services.ApplicationStatePersistenceStrategy; -import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource; -import org.apache.tapestry.services.AssetFactory; -import org.apache.tapestry.services.AssetSource; -import org.apache.tapestry.services.BeanModelSource; -import org.apache.tapestry.services.BindingFactory; -import org.apache.tapestry.services.BindingSource; -import org.apache.tapestry.services.ClassTransformation; -import org.apache.tapestry.services.ClasspathAssetAliasManager; -import org.apache.tapestry.services.ComponentClassResolver; -import org.apache.tapestry.services.Context; -import org.apache.tapestry.services.Environment; -import org.apache.tapestry.services.FieldValidatorSource; -import org.apache.tapestry.services.FormSupport; -import org.apache.tapestry.services.Heartbeat; -import org.apache.tapestry.services.InjectionProvider; -import org.apache.tapestry.services.MethodFilter; -import org.apache.tapestry.services.Request; -import org.apache.tapestry.services.RequestHandler; -import org.apache.tapestry.services.ResourceDigestGenerator; -import org.apache.tapestry.services.Response; -import org.apache.tapestry.services.Session; -import org.apache.tapestry.services.TransformMethodSignature; -import org.apache.tapestry.services.ValidationConstraintGenerator; -import org.apache.tapestry.services.ValidationMessagesSource; +import org.apache.tapestry.services.*; import org.easymock.EasyMock; +import static org.easymock.EasyMock.eq; import org.easymock.IAnswer; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.*; +import static java.lang.Thread.sleep; +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.*; + /** * Base test case that adds a number of convienience factory and training methods for the public * interfaces of Tapestry. @@ -113,7 +59,7 @@ * Creates a new markup writer instance (not a markup writer mock). Output can be directed at * the writer, which uses the default (HTML) markup model. The writer's toString() value * represents all the collected markup in the writer. - * + * * @return */ protected final MarkupWriter createMarkupWriter() @@ -122,7 +68,7 @@ } protected final void train_getAliasesForMode(AliasManager manager, String mode, - Map configuration) + Map configuration) { expect(manager.getAliasesForMode(mode)).andReturn(configuration); } @@ -356,7 +302,9 @@ return newMock(Validator.class); } - /** Writes a change to a file. */ + /** + * Writes a change to a file. + */ protected final void touch(File f) throws Exception { long startModified = f.lastModified(); @@ -378,25 +326,25 @@ } protected final void train_addField(ClassTransformation transformation, int modifiers, - String type, String suggestedName, String actualName) + String type, String suggestedName, String actualName) { expect(transformation.addField(modifiers, type, suggestedName)).andReturn(actualName); } protected final void train_addInjectedField(ClassTransformation ct, Class type, - String suggestedName, Object value, String fieldName) + String suggestedName, Object value, String fieldName) { expect(ct.addInjectedField(type, suggestedName, value)).andReturn(fieldName); } protected final void train_addMethod(ClassTransformation transformation, - TransformMethodSignature signature, String... body) + TransformMethodSignature signature, String... body) { transformation.addMethod(eq(signature), codeEq(join(body))); } protected final void train_buildConstraints(ValidationConstraintGenerator generator, - Class propertyType, AnnotationProvider provider, String... constraints) + Class propertyType, AnnotationProvider provider, String... constraints) { expect(generator.buildConstraints(propertyType, provider)).andReturn( Arrays.asList(constraints)); @@ -413,8 +361,8 @@ } protected final void train_createValidator(FieldValidatorSource source, Field field, - String validatorType, String constraintValue, String overrideId, - Messages overrideMessages, Locale locale, FieldValidator result) + String validatorType, String constraintValue, String overrideId, + Messages overrideMessages, Locale locale, FieldValidator result) { expect( source.createValidator( @@ -437,7 +385,7 @@ } protected final void train_exists(ApplicationStatePersistenceStrategy strategy, - Class asoClass, boolean exists) + Class asoClass, boolean exists) { expect(strategy.exists(asoClass)).andReturn(exists); } @@ -448,31 +396,33 @@ } protected final void train_extendMethod(ClassTransformation transformation, - TransformMethodSignature signature, String... body) + TransformMethodSignature signature, String... body) { transformation.extendMethod(eq(signature), codeEq(join(body))); } protected final void train_findAsset(AssetSource source, Resource root, String path, - Locale locale, Asset asset) + Locale locale, Asset asset) { expect(source.findAsset(root, path, locale)).andReturn(asset); } protected final void train_findFieldsWithAnnotation(ClassTransformation transformation, - Class annotationClass, List fieldNames) + Class annotationClass, + List fieldNames) { expect(transformation.findFieldsWithAnnotation(annotationClass)).andReturn(fieldNames); } protected final void train_findFieldsWithAnnotation(ClassTransformation transformation, - Class annotationClass, String... fieldNames) + Class annotationClass, + String... fieldNames) { train_findFieldsWithAnnotation(transformation, annotationClass, Arrays.asList(fieldNames)); } protected final void train_findMethods(ClassTransformation transformation, - final TransformMethodSignature... signatures) + final TransformMethodSignature... signatures) { IAnswer> answer = new IAnswer>() { @@ -501,31 +451,32 @@ } protected final void train_findMethodsWithAnnotation(ClassTransformation tf, - Class annotationType, List sigs) + Class annotationType, + List sigs) { expect(tf.findMethodsWithAnnotation(annotationType)).andReturn(sigs); } protected final void train_findUnclaimedFields(ClassTransformation transformation, - String... fieldNames) + String... fieldNames) { expect(transformation.findUnclaimedFields()).andReturn(Arrays.asList(fieldNames)); } protected final void train_generateChecksum(ResourceDigestGenerator generator, URL url, - String digest) + String digest) { expect(generator.generateDigest(url)).andReturn(digest); } protected final void train_get(ApplicationStatePersistenceStrategy strategy, - Class asoClass, ApplicationStateCreator creator, T aso) + Class asoClass, ApplicationStateCreator creator, T aso) { expect(strategy.get(asoClass, creator)).andReturn(aso); } protected final void train_get(ApplicationStatePersistenceStrategySource source, - String strategyName, ApplicationStatePersistenceStrategy strategy) + String strategyName, ApplicationStatePersistenceStrategy strategy) { expect(source.get(strategyName)).andReturn(strategy).atLeastOnce(); } @@ -566,7 +517,7 @@ } protected final void train_getClasspathAsset(AssetSource source, String path, Locale locale, - Asset asset) + Asset asset) { expect(source.getClasspathAsset(path, locale)).andReturn(asset); } @@ -587,7 +538,7 @@ } protected final void train_getComponentResources(Component component, - ComponentResources resources) + ComponentResources resources) { expect(component.getComponentResources()).andReturn(resources).atLeastOnce(); } @@ -608,13 +559,13 @@ } protected final void train_getContainerMessages(ComponentResources resources, - Messages containerMessages) + Messages containerMessages) { expect(resources.getContainerMessages()).andReturn(containerMessages).atLeastOnce(); } protected final void train_getContainerResources(ComponentResources resources, - ComponentResources containerResources) + ComponentResources containerResources) { expect(resources.getContainerResources()).andReturn(containerResources).atLeastOnce(); } @@ -632,13 +583,13 @@ } protected final void train_getFieldPersistenceStrategy(ComponentModel model, String fieldName, - String fieldStrategy) + String fieldStrategy) { expect(model.getFieldPersistenceStrategy(fieldName)).andReturn(fieldStrategy).atLeastOnce(); } protected final void train_getFieldType(ClassTransformation transformation, String fieldName, - String type) + String type) { expect(transformation.getFieldType(fieldName)).andReturn(type).atLeastOnce(); @@ -680,20 +631,21 @@ } protected final void train_getMethodAnnotation(ClassTransformation ct, - TransformMethodSignature signature, Class annotationClass, T annotation) + TransformMethodSignature signature, + Class annotationClass, T annotation) { expect(ct.getMethodAnnotation(signature, annotationClass)).andReturn(annotation) .atLeastOnce(); } protected final void train_getMethodIdentifier(ClassTransformation transformation, - TransformMethodSignature signature, String id) + TransformMethodSignature signature, String id) { expect(transformation.getMethodIdentifier(signature)).andReturn(id); } protected final void train_getOutputStream(HttpServletResponse response, - ServletOutputStream stream) + ServletOutputStream stream) { try { @@ -711,7 +663,7 @@ } protected final void train_getParameterModel(ComponentModel model, String parameterName, - ParameterModel parameterModel) + ParameterModel parameterModel) { expect(model.getParameterModel(parameterName)).andReturn(parameterModel); } @@ -747,7 +699,7 @@ } protected final void train_getSession(HttpServletRequest request, boolean create, - HttpSession session) + HttpSession session) { expect(request.getSession(create)).andReturn(session); } @@ -763,7 +715,7 @@ } protected final void train_getValidationMessages(ValidationMessagesSource messagesSource, - Locale locale, Messages messages) + Locale locale, Messages messages) { expect(messagesSource.getValidationMessages(locale)).andReturn(messages).atLeastOnce(); } @@ -775,7 +727,7 @@ @SuppressWarnings("unchecked") protected final void train_handleResult(ComponentEventHandler handler, Object result, - Component component, String methodDescription, boolean abort) + Component component, String methodDescription, boolean abort) { expect(handler.handleResult(result, component, methodDescription)).andReturn(abort); } @@ -811,16 +763,17 @@ } protected final void train_newBinding(BindingFactory factory, String description, - ComponentResources container, ComponentResources component, String expression, - Location l, Binding binding) + ComponentResources container, ComponentResources component, String expression, + Location l, Binding binding) { expect(factory.newBinding(description, container, component, expression, l)).andReturn( binding); } protected void train_newBinding(BindingSource bindingSource, String description, - ComponentResources componentResources, String defaultBindingPrefix, String expression, - Binding binding) + ComponentResources componentResources, String defaultBindingPrefix, + String expression, + Binding binding) { expect( bindingSource.newBinding( @@ -831,13 +784,13 @@ } protected final void train_newMemberName(ClassTransformation transformation, String suggested, - String name) + String name) { expect(transformation.newMemberName(suggested)).andReturn(name); } protected final void train_newMemberName(ClassTransformation transformation, String prefix, - String baseName, String name) + String baseName, String name) { expect(transformation.newMemberName(prefix, baseName)).andReturn(name); } @@ -853,8 +806,9 @@ } protected final void train_provideInjection(InjectionProvider provider, String fieldName, - Class fieldType, ObjectLocator locator, ClassTransformation transformation, - MutableComponentModel model, boolean result) + Class fieldType, ObjectLocator locator, + ClassTransformation transformation, + MutableComponentModel model, boolean result) { expect(provider.provideInjection(fieldName, fieldType, locator, transformation, model)) .andReturn(result); @@ -862,7 +816,7 @@ @SuppressWarnings("unchecked") protected final void train_renderInformalParameters(ComponentResources resources, - final MarkupWriter writer, final Object... informals) + final MarkupWriter writer, final Object... informals) { resources.renderInformalParameters(writer); IAnswer answer = new IAnswer() @@ -879,13 +833,13 @@ } protected final void train_requiresDigest(ResourceDigestGenerator generator, String path, - boolean requiresDigest) + boolean requiresDigest) { expect(generator.requiresDigest(path)).andReturn(requiresDigest); } protected final void train_service(RequestHandler handler, Request request, Response response, - boolean result) throws IOException + boolean result) throws IOException { expect(handler.service(request, response)).andReturn(result); } @@ -901,13 +855,13 @@ } protected final void train_setDateHeader(HttpServletResponse response, String headerName, - long date) + long date) { response.setDateHeader(headerName, date); } protected final void train_toClass(ClassTransformation transformation, String type, - Class classForType) + Class classForType) { expect(transformation.toClass(type)).andReturn(classForType); } @@ -918,7 +872,7 @@ } protected final void train_toClientURL(ClasspathAssetAliasManager manager, String resourcePath, - String clientURL) + String clientURL) { expect(manager.toClientURL(resourcePath)).andReturn(clientURL); } @@ -929,7 +883,7 @@ } protected final void train_toResourcePath(ClasspathAssetAliasManager manager, String clientURL, - String resourcePath) + String resourcePath) { expect(manager.toResourcePath(clientURL)).andReturn(resourcePath).atLeastOnce(); } @@ -945,7 +899,7 @@ } protected final void train_create(BeanModelSource source, Class beanClass, - boolean filterReadOnly, ComponentResources containerResources, BeanModel model) + boolean filterReadOnly, ComponentResources containerResources, BeanModel model) { expect(source.create(beanClass, filterReadOnly, containerResources)).andReturn(model); } @@ -989,9 +943,8 @@ * Provides access to component messages, suitable for testing. Reads the associated .properties * file for the class (NOT any localization of it). Only the messages directly in the * .properties file is available. - * - * @param componentClass - * component class whose messages are needed * + * + * @param componentClass component class whose messages are needed * * @return the Messages instance */ protected final Messages messagesFor(Class componentClass) throws IOException Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/DoubleTranslator.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/DoubleTranslator.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/DoubleTranslator.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/DoubleTranslator.java Mon Nov 12 14:22:31 2007 @@ -23,9 +23,8 @@ { /** * Parses blank values to null, otherwise parses the client value to a double - * - * @throws ValidationException - * if the clientValue can not be parsed + * + * @throws ValidationException if the clientValue can not be parsed */ public Double parseClient(String clientValue, Messages messages) throws ValidationException { Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/IntegerTranslator.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/IntegerTranslator.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/IntegerTranslator.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/IntegerTranslator.java Mon Nov 12 14:22:31 2007 @@ -26,9 +26,8 @@ { /** * Parses blank values to null, otherwise parses the client value to an integer. - * - * @throws ValidationException - * if the clientValue can not be parsed as an integer + * + * @throws ValidationException if the clientValue can not be parsed as an integer */ public Integer parseClient(String clientValue, Messages messages) throws ValidationException { Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/LongTranslator.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/LongTranslator.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/LongTranslator.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/LongTranslator.java Mon Nov 12 14:22:31 2007 @@ -19,14 +19,15 @@ import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.internal.util.InternalUtils; -/** A translator for type long. */ +/** + * A translator for type long. + */ public class LongTranslator implements Translator { /** * Parses blank values to null, otherwise parses the client value to a long - * - * @throws ValidationException - * if the clientValue can not be parsed + * + * @throws ValidationException if the clientValue can not be parsed */ public Long parseClient(String clientValue, Messages messages) throws ValidationException { Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/StringTranslator.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/StringTranslator.java?rev=594319&r1=594318&r2=594319&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/StringTranslator.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/translator/StringTranslator.java Mon Nov 12 14:22:31 2007 @@ -21,13 +21,17 @@ public class StringTranslator implements Translator { - /** Returns the client value (or null, if the client value is blank). */ + /** + * Returns the client value (or null, if the client value is blank). + */ public String parseClient(String clientValue, Messages messages) throws ValidationException { return InternalUtils.isBlank(clientValue) ? null : clientValue; } - /** Returns the value, or the empty string if value is null. */ + /** + * Returns the value, or the empty string if value is null. + */ public String toClient(String value) { return value == null ? "" : value;