You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/05/17 03:32:31 UTC
svn commit: r538786 - in
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry:
internal/services/ services/
Author: hlship
Date: Wed May 16 18:32:27 2007
New Revision: 538786
URL: http://svn.apache.org/viewvc?view=rev&rev=538786
Log:
Remove a number of unneccessary @InjectService annotations.
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PersistentLocaleImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetSourceImpl.java Wed May 16 18:32:27 2007
@@ -23,7 +23,6 @@
import org.apache.tapestry.Asset;
import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.apache.tapestry.ioc.util.StrategyRegistry;
import org.apache.tapestry.services.AssetFactory;
@@ -41,8 +40,7 @@
private final Map<Resource, Asset> _cache = newConcurrentMap();
- public AssetSourceImpl(@InjectService("ThreadLocale")
- ThreadLocale threadLocale,
+ public AssetSourceImpl(ThreadLocale threadLocale,
Map<String, AssetFactory> configuration)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentSourceImpl.java Wed May 16 18:32:27 2007
@@ -17,7 +17,6 @@
import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.services.ComponentSource;
@@ -25,8 +24,7 @@
{
private final RequestPageCache _pageCache;
- public ComponentSourceImpl(@InjectService("RequestPageCache")
- RequestPageCache pageCache)
+ public ComponentSourceImpl(RequestPageCache pageCache)
{
_pageCache = pageCache;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalModule.java Wed May 16 18:32:27 2007
@@ -166,32 +166,12 @@
private final RequestGlobals _requestGlobals;
- public InternalModule(@InjectService("ComponentInstantiatorSource")
- ComponentInstantiatorSource componentInstantiatorSource,
-
- @InjectService("UpdateListenerHub")
- UpdateListenerHub updateListenerHub,
-
- @InjectService("ThreadCleanupHub")
- ThreadCleanupHub threadCleanupHub,
-
- @InjectService("ComponentTemplateSource")
- ComponentTemplateSource componentTemplateSource,
-
- @InjectService("ComponentClassResolver")
- ComponentClassResolver componentClassResolver,
-
- @InjectService("ChainBuilder")
- ChainBuilder chainBuilder,
-
- Request request,
-
- Response response,
-
- @InjectService("ThreadLocale")
- ThreadLocale threadLocale,
-
- RequestGlobals requestGlobals)
+ public InternalModule(ComponentInstantiatorSource componentInstantiatorSource,
+ UpdateListenerHub updateListenerHub, ThreadCleanupHub threadCleanupHub,
+ ComponentTemplateSource componentTemplateSource,
+ ComponentClassResolver componentClassResolver, ChainBuilder chainBuilder,
+ Request request, Response response, ThreadLocale threadLocale,
+ RequestGlobals requestGlobals)
{
_componentInstantiatorSource = componentInstantiatorSource;
_updateListenerHub = updateListenerHub;
@@ -290,9 +270,7 @@
return service;
}
- public ComponentTemplateSource build(@InjectService("TemplateParser")
- TemplateParser parser, @InjectService("PageTemplateLocator")
- PageTemplateLocator locator)
+ public ComponentTemplateSource build(TemplateParser parser, PageTemplateLocator locator)
{
ComponentTemplateSourceImpl service = new ComponentTemplateSourceImpl(parser, locator);
@@ -301,8 +279,7 @@
return service;
}
- public AssetFactory buildClasspathAssetFactory(@InjectService("ResourceCache")
- ResourceCache resourceCache,
+ public AssetFactory buildClasspathAssetFactory(ResourceCache resourceCache,
ClasspathAssetAliasManager aliasManager)
{
@@ -545,14 +522,12 @@
* Adds a filter that checks for updates to classes and other resources. It is ordered before:*.
*/
public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration,
- @InjectService("RequestGlobals")
- final RequestGlobals requestGlobals,
+ RequestGlobals requestGlobals,
// @Inject not needed because its a long, not a String
@Symbol("tapestry.file-check-interval")
long checkInterval,
- @InjectService("LocalizationSetter")
LocalizationSetter localizationSetter)
{
configuration.add("CheckForUpdates", new CheckForUpdatesFilter(_updateListenerHub,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageMarkupRendererImpl.java Wed May 16 18:32:27 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -16,15 +16,13 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.services.PageRenderInitializer;
public class PageMarkupRendererImpl implements PageMarkupRenderer
{
private final PageRenderInitializer _pageRenderInitializer;
- public PageMarkupRendererImpl(@InjectService("PageRenderInitializer")
- PageRenderInitializer pageRenderInitializer)
+ public PageMarkupRendererImpl(PageRenderInitializer pageRenderInitializer)
{
_pageRenderInitializer = pageRenderInitializer;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageResponseRendererImpl.java Wed May 16 18:32:27 2007
@@ -19,7 +19,6 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.services.MarkupWriterFactory;
import org.apache.tapestry.services.Response;
@@ -29,11 +28,8 @@
private final MarkupWriterFactory _markupWriterFactory;
- public PageResponseRendererImpl(@InjectService("MarkupWriterFactory")
- MarkupWriterFactory markupWriterFactory,
-
- @InjectService("PageMarkupRenderer")
- PageMarkupRenderer markupRenderer)
+ public PageResponseRendererImpl(MarkupWriterFactory markupWriterFactory,
+ PageMarkupRenderer markupRenderer)
{
_markupWriterFactory = markupWriterFactory;
_markupRenderer = markupRenderer;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java Wed May 16 18:32:27 2007
@@ -16,7 +16,6 @@
import java.util.Locale;
-import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.services.Cookies;
import org.apache.tapestry.services.PersistentLocale;
@@ -29,8 +28,7 @@
private Cookies _cookieSource;
- public PersistentLocaleImpl(@InjectService("Cookies")
- Cookies cookieSource)
+ public PersistentLocaleImpl(Cookies cookieSource)
{
_cookieSource = cookieSource;
}
@@ -43,6 +41,7 @@
public Locale get()
{
String localeCookieValue = getCookieValue();
+
return localeCookieValue != null ? new Locale(localeCookieValue) : null;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PersistentLocaleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PersistentLocaleImpl.java?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PersistentLocaleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PersistentLocaleImpl.java Wed May 16 18:32:27 2007
@@ -16,9 +16,6 @@
import java.util.Locale;
-import org.apache.tapestry.ioc.annotations.InjectService;
-import org.apache.tapestry.services.Cookies;
-
public class PersistentLocaleImpl implements PersistentLocale
{
/**
@@ -28,8 +25,7 @@
private Cookies _cookieSource;
- public PersistentLocaleImpl(@InjectService("Cookies")
- Cookies cookieSource)
+ public PersistentLocaleImpl(Cookies cookieSource)
{
_cookieSource = cookieSource;
}
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?view=diff&rev=538786&r1=538785&r2=538786
==============================================================================
--- 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 Wed May 16 18:32:27 2007
@@ -611,10 +611,7 @@
* this filter.
*/
public static void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration,
- @InjectService("Context")
- Context context,
-
- final RequestExceptionHandler exceptionHandler)
+ Context context, final RequestExceptionHandler exceptionHandler)
{
RequestFilter staticFilesFilter = new StaticFilesFilter(context);
@@ -825,34 +822,26 @@
private final ClassFactory _componentClassFactory;
- public TapestryModule(@InjectService("PipelineBuilder")
- PipelineBuilder pipelineBuilder,
+ public TapestryModule(PipelineBuilder pipelineBuilder,
- @InjectService("PropertyShadowBuilder")
PropertyShadowBuilder shadowBuilder,
RequestGlobals requestGlobals,
ApplicationGlobals applicationGlobals,
- @InjectService("ChainBuilder")
ChainBuilder chainBuilder,
- @InjectService("RequestPageCache")
RequestPageCache requestPageCache,
- @InjectService("PageResponseRenderer")
PageResponseRenderer pageResponseRenderer,
Environment environment,
- @InjectService("StrategyBuilder")
StrategyBuilder strategyBuilder,
- @InjectService("ComponentInstantiatorSource")
ComponentInstantiatorSource componentInstantiatorSource,
- @InjectService("LinkFactory")
LinkFactory linkFactory,
PropertyAccess propertyAccess,
@@ -875,8 +864,7 @@
_componentClassFactory = componentClassFactory;
}
- public Context build(@InjectService("ApplicationGlobals")
- ApplicationGlobals globals)
+ public Context build(ApplicationGlobals globals)
{
return _shadowBuilder.build(globals, "context", Context.class);
}
@@ -898,7 +886,6 @@
* "org/apache/tapestry/internal/ValidationMessages".
*/
public ValidationMessagesSource build(Collection<String> configuration,
- @InjectService("UpdateListenerHub")
UpdateListenerHub updateListenerHub,
@InjectService("ClasspathAssetFactory")
@@ -1113,8 +1100,8 @@
return service;
}
- public ObjectRenderer build(@InjectService("StrategyBuilder")
- StrategyBuilder strategyBuilder, Map<Class, ObjectRenderer> configuration)
+ public ObjectRenderer build(StrategyBuilder strategyBuilder,
+ Map<Class, ObjectRenderer> configuration)
{
StrategyRegistry<ObjectRenderer> registry = StrategyRegistry.newInstance(
ObjectRenderer.class,