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 2008/05/06 23:52:40 UTC
svn commit: r653936 [1/6] - in /tapestry/tapestry5/trunk/tapestry-ioc/src:
main/java/org/apache/tapestry/ioc/
main/java/org/apache/tapestry/ioc/internal/
main/java/org/apache/tapestry/ioc/internal/services/
main/java/org/apache/tapestry/ioc/internal/ut...
Author: hlship
Date: Tue May 6 14:52:36 2008
New Revision: 653936
URL: http://svn.apache.org/viewvc?rev=653936&view=rev
Log:
Remove leading underscores from field names
Added:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/idToDependencyNode.java
- copied, changed from r647587, tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
Modified:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/AbstractServiceCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ConstructorServiceCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/LifecycleWrappedServiceCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ObjectLocatorImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RecursiveServiceCreationCheckWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RegistryImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RegistryWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/SerializationSupport.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceActivityTrackerImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBinderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvoker.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceDefImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceProxyToken.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ValidatingConfigurationWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractFab.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AbstractInvocation.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AspectDecoratorImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/AspectInterceptorBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/BridgeBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFabImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFactoryClassPool.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ClassNameLocatorImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ClassPropertyAdapterImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/CompoundCoercion.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/CtClassSourceImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/DefaultImplementationBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalysisImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionInfoImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/FilterMethodAnalyzer.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/JustInTimeObjectCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/LoggingAdvice.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/MapSymbolProvider.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/MasterObjectProviderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/MethodLogger.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PerThreadServiceCreator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PerThreadServiceLifecycle.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PerthreadManagerImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyAdapterImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/PropertyShadowBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/RegistryStartup.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/StringLocation.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProvider.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/services/ValueObjectProvider.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/AbstractResource.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/ClasspathResource.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/CollectionFactory.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrier.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/DependencyNode.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/IdAllocator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/InheritanceSearch.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGenerator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/LocationImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/MessageFormatterImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/MessagesImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/OneShotLock.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/Orderer.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/util/TapestryException.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/ClassFabUtils.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodIterator.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/MockTester.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/test/TestBase.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/AbstractMessages.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/BodyBuilder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/CaseInsensitiveMap.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/Stack.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/TimeInterval.java
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/basics.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/patterns.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/servconf.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/overview.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/CountingGreeterImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntHolderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StaticModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolderImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorFixture.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ToUpperCaseStringHolder.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/AspectInterceptorBuilderImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/BridgeBuilderTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/DefaultImplementationBuilderImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/LoggingDecoratorImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryStartupTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/StartupModule.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TargetBean.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/BaseGenericBean.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InjectoBean.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/MessagesImplTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/NonGenericBean.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockSubject.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Pair.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/services/PropertyShadowBuilderImplTest.java
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/BaseLocatable.java Tue May 6 14:52:36 2008
@@ -1,17 +1,17 @@
-// 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.ioc;
/**
@@ -19,15 +19,15 @@
*/
public class BaseLocatable implements Locatable
{
- private final Location _location;
+ private final Location location;
protected BaseLocatable(Location location)
{
- _location = location;
+ this.location = location;
}
public final Location getLocation()
{
- return _location;
+ return location;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/Orderable.java Tue May 6 14:52:36 2008
@@ -1,62 +1,61 @@
-// 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.ioc;
import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
/**
- * A wrapper that allows objects of a target type to be ordered. Each Orderable object is given a
- * unique id and a set of pre-requisites (objects which should be ordered earlier) and
- * post-requisites (objects which should be ordered later).
+ * A wrapper that allows objects of a target type to be ordered. Each Orderable object is given a unique id and a set of
+ * pre-requisites (objects which should be ordered earlier) and post-requisites (objects which should be ordered
+ * later).
*
* @param <T>
*/
public class Orderable<T>
{
- private final String _id;
+ private final String id;
- private final T _target;
+ private final T target;
- private final String[] _constraints;
+ private final String[] constraints;
/**
* @param id unique identifier for the target object
- * @param target the object to be ordered; this may also be null (in which case the id represents a
- * placeholder)
+ * @param target the object to be ordered; this may also be null (in which case the id represents a placeholder)
*/
public Orderable(String id, T target, String... constraints)
{
- _id = notBlank(id, "id");
- _target = target;
- _constraints = constraints;
+ this.id = notBlank(id, "id");
+ this.target = target;
+ this.constraints = constraints;
}
public String getId()
{
- return _id;
+ return id;
}
public T getTarget()
{
- return _target;
+ return target;
}
public String[] getConstraints()
{
- return _constraints;
+ return constraints;
}
@Override
@@ -64,16 +63,16 @@
{
StringBuilder buffer = new StringBuilder("Orderable[");
- buffer.append(_id);
+ buffer.append(id);
- for (String c : _constraints)
+ for (String c : constraints)
{
buffer.append(" ");
buffer.append(c);
}
buffer.append(" ");
- buffer.append(_target.toString());
+ buffer.append(target.toString());
buffer.append("]");
return buffer.toString();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/RegistryBuilder.java Tue May 6 14:52:36 2008
@@ -39,22 +39,22 @@
*/
public final class RegistryBuilder
{
- private final OneShotLock _lock = new OneShotLock();
+ private final OneShotLock lock = new OneShotLock();
/**
* Module defs, keyed on module id.
*/
- final List<ModuleDef> _modules = newList();
+ final List<ModuleDef> modules = newList();
- private final ClassLoader _classLoader;
+ private final ClassLoader classLoader;
- private final Logger _logger;
+ private final Logger logger;
- private final LoggerSource _loggerSource;
+ private final LoggerSource loggerSource;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
- private final Set<Class> _addedModuleClasses = CollectionFactory.newSet();
+ private final Set<Class> addedModuleClasses = CollectionFactory.newSet();
public RegistryBuilder()
{
@@ -68,34 +68,34 @@
public RegistryBuilder(ClassLoader classLoader, LoggerSource loggerSource)
{
- _classLoader = classLoader;
- _loggerSource = loggerSource;
- _logger = loggerSource.getLogger(RegistryBuilder.class);
+ this.classLoader = classLoader;
+ this.loggerSource = loggerSource;
+ logger = loggerSource.getLogger(RegistryBuilder.class);
// Make the ClassFactory appear to be a service inside TapestryIOCModule, even before that
// module exists.
Logger classFactoryLogger = loggerSource.getLogger(TapestryIOCModule.class.getName() + ".ClassFactory");
- _classFactory = new ClassFactoryImpl(_classLoader, classFactoryLogger);
+ classFactory = new ClassFactoryImpl(this.classLoader, classFactoryLogger);
add(TapestryIOCModule.class);
}
public void add(ModuleDef moduleDef)
{
- _lock.check();
+ lock.check();
// TODO: Some way to ensure that duplicate modules are not being added.
// Part of TAPESTRY-2117 is in add(Class...) and that may be as much as we can
// do as there is no concept of ModuleDef identity.
- _modules.add(moduleDef);
+ modules.add(moduleDef);
}
public void add(Class... moduleBuilderClasses)
{
- _lock.check();
+ lock.check();
List<Class> queue = newList(Arrays.asList(moduleBuilderClasses));
@@ -105,11 +105,11 @@
// Quietly ignore previously added classes.
- if (_addedModuleClasses.contains(c)) continue;
+ if (addedModuleClasses.contains(c)) continue;
- _addedModuleClasses.add(c);
+ addedModuleClasses.add(c);
- ModuleDef def = new DefaultModuleDefImpl(c, _logger, _classFactory);
+ ModuleDef def = new DefaultModuleDefImpl(c, logger, classFactory);
add(def);
SubModule annotation = ((AnnotatedElement) c).getAnnotation(SubModule.class);
@@ -122,11 +122,11 @@
public void add(String classname)
{
- _lock.check();
+ lock.check();
try
{
- Class builderClass = Class.forName(classname, true, _classLoader);
+ Class builderClass = Class.forName(classname, true, classLoader);
add(builderClass);
}
@@ -138,24 +138,24 @@
public Registry build()
{
- _lock.lock();
+ lock.lock();
- RegistryImpl registry = new RegistryImpl(_modules, _classFactory, _loggerSource);
+ RegistryImpl registry = new RegistryImpl(modules, classFactory, loggerSource);
return new RegistryWrapper(registry);
}
public ClassLoader getClassLoader()
{
- _lock.check();
+ lock.check();
- return _classLoader;
+ return classLoader;
}
public Logger getLogger()
{
- _lock.check();
+ lock.check();
- return _logger;
+ return logger;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/AbstractServiceCreator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/AbstractServiceCreator.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/AbstractServiceCreator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/AbstractServiceCreator.java Tue May 6 14:52:36 2008
@@ -34,17 +34,17 @@
*/
public abstract class AbstractServiceCreator implements ObjectCreator
{
- protected final String _serviceId;
+ protected final String serviceId;
- private final Map<Class, Object> _parameterDefaults = newMap();
+ private final Map<Class, Object> parameterDefaults = newMap();
- protected final ServiceBuilderResources _resources;
+ protected final ServiceBuilderResources resources;
- protected final Logger _logger;
+ protected final Logger logger;
private final static Map<Class, ConfigurationType> PARAMETER_TYPE_TO_CONFIGURATION_TYPE = newMap();
- protected final String _creatorDescription;
+ protected final String creatorDescription;
static
{
@@ -55,16 +55,16 @@
public AbstractServiceCreator(ServiceBuilderResources resources, String creatorDescription)
{
- _serviceId = resources.getServiceId();
- _resources = resources;
- _creatorDescription = creatorDescription;
- _logger = resources.getLogger();
-
- _parameterDefaults.put(String.class, _serviceId);
- _parameterDefaults.put(ObjectLocator.class, resources);
- _parameterDefaults.put(ServiceResources.class, resources);
- _parameterDefaults.put(Logger.class, _logger);
- _parameterDefaults.put(Class.class, resources.getServiceInterface());
+ serviceId = resources.getServiceId();
+ this.resources = resources;
+ this.creatorDescription = creatorDescription;
+ logger = resources.getLogger();
+
+ parameterDefaults.put(String.class, serviceId);
+ parameterDefaults.put(ObjectLocator.class, resources);
+ parameterDefaults.put(ServiceResources.class, resources);
+ parameterDefaults.put(Logger.class, logger);
+ parameterDefaults.put(Class.class, resources.getServiceInterface());
}
/**
@@ -74,7 +74,7 @@
protected final Map<Class, Object> getParameterDefaultsWithConfiguration(Class[] parameterTypes,
Type[] genericParameterTypes)
{
- Map<Class, Object> result = newMap(_parameterDefaults);
+ Map<Class, Object> result = newMap(parameterDefaults);
ConfigurationType type = null;
for (int i = 0; i < parameterTypes.length; i++)
@@ -87,7 +87,7 @@
if (type != null)
{
- _logger.warn(IOCMessages.tooManyConfigurationParameters(_creatorDescription));
+ logger.warn(IOCMessages.tooManyConfigurationParameters(creatorDescription));
break;
}
@@ -128,7 +128,7 @@
private void addOrderedConfigurationParameter(Map<Class, Object> parameterDefaults, Type genericType)
{
Class valueType = findParameterizedTypeFromGenericType(genericType);
- List configuration = _resources.getOrderedConfiguration(valueType);
+ List configuration = resources.getOrderedConfiguration(valueType);
parameterDefaults.put(List.class, configuration);
}
@@ -137,7 +137,7 @@
private void addUnorderedConfigurationParameter(Map<Class, Object> parameterDefaults, Type genericType)
{
Class valueType = findParameterizedTypeFromGenericType(genericType);
- Collection configuration = _resources.getUnorderedConfiguration(valueType);
+ Collection configuration = resources.getUnorderedConfiguration(valueType);
parameterDefaults.put(Collection.class, configuration);
}
@@ -151,7 +151,7 @@
if (keyType == null || valueType == null)
throw new IllegalArgumentException(IOCMessages.genericTypeNotSupported(genericType));
- Map configuration = _resources.getMappedConfiguration(keyType, valueType);
+ Map configuration = resources.getMappedConfiguration(keyType, valueType);
parameterDefaults.put(Map.class, configuration);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ConstructorServiceCreator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ConstructorServiceCreator.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ConstructorServiceCreator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ConstructorServiceCreator.java Tue May 6 14:52:36 2008
@@ -22,19 +22,18 @@
import java.util.Map;
/**
- * A service creator based on an implementation class' constructor, rather than a service builder
- * method.
+ * A service creator based on an implementation class' constructor, rather than a service builder method.
*/
public class ConstructorServiceCreator extends AbstractServiceCreator
{
- private final Constructor _constructor;
+ private final Constructor constructor;
public ConstructorServiceCreator(ServiceBuilderResources resources, String creatorDescription,
Constructor constructor)
{
super(resources, creatorDescription);
- _constructor = constructor;
+ this.constructor = constructor;
}
public Object createObject()
@@ -43,12 +42,12 @@
try
{
- Object[] parameters = InternalUtils.calculateParametersForConstructor(_constructor, _resources,
+ Object[] parameters = InternalUtils.calculateParametersForConstructor(constructor, resources,
getParameterDefaultsWithConfigurations());
- if (_logger.isDebugEnabled()) _logger.debug(IOCMessages.invokingConstructor(_creatorDescription));
+ if (logger.isDebugEnabled()) logger.debug(IOCMessages.invokingConstructor(creatorDescription));
- return _constructor.newInstance(parameters);
+ return constructor.newInstance(parameters);
}
catch (InvocationTargetException ite)
{
@@ -59,16 +58,16 @@
failure = ex;
}
- throw new RuntimeException(IOCMessages.constructorError(_creatorDescription, _serviceId, failure), failure);
+ throw new RuntimeException(IOCMessages.constructorError(creatorDescription, serviceId, failure), failure);
}
/**
- * Returns a map that includes (possibly) an additional mapping containing the collected
- * configuration data. This involves scanning the constructor's parameters.
+ * Returns a map that includes (possibly) an additional mapping containing the collected configuration data. This
+ * involves scanning the constructor's parameters.
*/
private Map<Class, Object> getParameterDefaultsWithConfigurations()
{
- return getParameterDefaultsWithConfiguration(_constructor.getParameterTypes(), _constructor
+ return getParameterDefaultsWithConfiguration(constructor.getParameterTypes(), constructor
.getGenericParameterTypes());
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ContributionDefImpl.java Tue May 6 14:52:36 2008
@@ -26,28 +26,28 @@
public class ContributionDefImpl implements ContributionDef
{
- private final String _serviceId;
+ private final String serviceId;
- private final Method _contributorMethod;
+ private final Method contributorMethod;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
public ContributionDefImpl(String serviceId, Method contributorMethod, ClassFactory classFactory)
{
- _serviceId = serviceId;
- _contributorMethod = contributorMethod;
- _classFactory = classFactory;
+ this.serviceId = serviceId;
+ this.contributorMethod = contributorMethod;
+ this.classFactory = classFactory;
}
@Override
public String toString()
{
- return InternalUtils.asString(_contributorMethod, _classFactory);
+ return InternalUtils.asString(contributorMethod, classFactory);
}
public String getServiceId()
{
- return _serviceId;
+ return serviceId;
}
public void contribute(ModuleBuilderSource moduleBuilderSource, ObjectLocator locator,
@@ -82,17 +82,17 @@
Throwable fail = null;
- Object moduleBuilder = InternalUtils.isStatic(_contributorMethod) ? null : source
+ Object moduleBuilder = InternalUtils.isStatic(contributorMethod) ? null : source
.getModuleBuilder();
try
{
Object[] parameters = InternalUtils.calculateParametersForMethod(
- _contributorMethod,
+ contributorMethod,
locator,
parameterDefaults);
- _contributorMethod.invoke(moduleBuilder, parameters);
+ contributorMethod.invoke(moduleBuilder, parameters);
}
catch (InvocationTargetException ex)
{
@@ -105,6 +105,6 @@
if (fail != null)
throw new RuntimeException(IOCMessages
- .contributionMethodError(_contributorMethod, fail), fail);
+ .contributionMethodError(contributorMethod, fail), fail);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DecoratorDefImpl.java Tue May 6 14:52:36 2008
@@ -31,21 +31,21 @@
public class DecoratorDefImpl implements DecoratorDef
{
- private final String _decoratorId;
+ private final String decoratorId;
- private final Method _decoratorMethod;
+ private final Method decoratorMethod;
- private final IdMatcher _idMatcher;
+ private final IdMatcher idMatcher;
- private final String[] _constraints;
+ private final String[] constraints;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
public DecoratorDefImpl(String decoratorId, Method decoratorMethod, String[] patterns,
String[] constraints, ClassFactory classFactory)
{
- _decoratorId = notBlank(decoratorId, "decoratorId");
- _decoratorMethod = notNull(decoratorMethod, "decoratorMethod");
+ this.decoratorId = notBlank(decoratorId, "decoratorId");
+ this.decoratorMethod = notNull(decoratorMethod, "decoratorMethod");
List<IdMatcher> matchers = CollectionFactory.newList();
@@ -55,34 +55,34 @@
matchers.add(matcher);
}
- _idMatcher = new OrIdMatcher(matchers);
+ idMatcher = new OrIdMatcher(matchers);
- _constraints = constraints != null ? constraints : new String[0];
+ this.constraints = constraints != null ? constraints : new String[0];
- _classFactory = classFactory;
+ this.classFactory = classFactory;
}
@Override
public String toString()
{
- return InternalUtils.asString(_decoratorMethod, _classFactory);
+ return InternalUtils.asString(decoratorMethod, classFactory);
}
public String[] getConstraints()
{
- return _constraints;
+ return constraints;
}
public String getDecoratorId()
{
- return _decoratorId;
+ return decoratorId;
}
public ServiceDecorator createDecorator(ModuleBuilderSource moduleBuilderSource,
ServiceResources resources)
{
- return new ServiceDecoratorImpl(_decoratorMethod, moduleBuilderSource, resources,
- _classFactory);
+ return new ServiceDecoratorImpl(decoratorMethod, moduleBuilderSource, resources,
+ classFactory);
}
/**
@@ -92,7 +92,7 @@
{
String serviceId = serviceDef.getServiceId();
- return _idMatcher.matches(serviceId);
+ return idMatcher.matches(serviceId);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImpl.java Tue May 6 14:52:36 2008
@@ -34,9 +34,8 @@
import java.util.*;
/**
- * Starting from the Class for a module builder, identifies all the services (service builder
- * methods), decorators (service decorator methods) and (not yet implemented) contributions (service
- * contributor methods).
+ * Starting from the Class for a module builder, identifies all the services (service builder methods), decorators
+ * (service decorator methods) and (not yet implemented) contributions (service contributor methods).
*/
public class DefaultModuleDefImpl implements ModuleDef, ServiceDefAccumulator
{
@@ -55,27 +54,27 @@
*/
private static final String CONTRIBUTE_METHOD_NAME_PREFIX = "contribute";
- private final Class _builderClass;
+ private final static Map<Class, ConfigurationType> PARAMETER_TYPE_TO_CONFIGURATION_TYPE = newMap();
+
+ private final Class builderClass;
- private final Logger _logger;
+ private final Logger logger;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
/**
* Keyed on service id.
*/
- private final Map<String, ServiceDef> _serviceDefs = newCaseInsensitiveMap();
+ private final Map<String, ServiceDef> serviceDefs = newCaseInsensitiveMap();
/**
* Keyed on decorator id.
*/
- private final Map<String, DecoratorDef> _decoratorDefs = newCaseInsensitiveMap();
+ private final Map<String, DecoratorDef> decoratorDefs = newCaseInsensitiveMap();
- private final Set<ContributionDef> _contributionDefs = newSet();
-
- private final static Map<Class, ConfigurationType> PARAMETER_TYPE_TO_CONFIGURATION_TYPE = newMap();
+ private final Set<ContributionDef> contributionDefs = newSet();
- private final Set<Class> _defaultMarkers = newSet();
+ private final Set<Class> defaultMarkers = newSet();
static
{
@@ -87,20 +86,21 @@
/**
* @param builderClass the class that is responsible for building services, etc.
* @param logger based on the class name of the module
- * @param classFactory factory used to create new classes at runtime or locate method line numbers for error reporting
+ * @param classFactory factory used to create new classes at runtime or locate method line numbers for error
+ * reporting
*/
public DefaultModuleDefImpl(Class<?> builderClass, Logger logger, ClassFactory classFactory)
{
- _builderClass = builderClass;
- _logger = logger;
- _classFactory = classFactory;
+ this.builderClass = builderClass;
+ this.logger = logger;
+ this.classFactory = classFactory;
Marker annotation = builderClass.getAnnotation(Marker.class);
if (annotation != null)
{
InternalUtils.validateMarkerAnnotations(annotation.value());
- _defaultMarkers.addAll(Arrays.asList(annotation.value()));
+ defaultMarkers.addAll(Arrays.asList(annotation.value()));
}
grind();
@@ -113,28 +113,28 @@
@Override
public String toString()
{
- return String.format("ModuleDef[%s %s]", _builderClass.getName(), InternalUtils
- .joinSorted(_serviceDefs.keySet()));
+ return String.format("ModuleDef[%s %s]", builderClass.getName(), InternalUtils
+ .joinSorted(serviceDefs.keySet()));
}
public Class getBuilderClass()
{
- return _builderClass;
+ return builderClass;
}
public Set<String> getServiceIds()
{
- return _serviceDefs.keySet();
+ return serviceDefs.keySet();
}
public ServiceDef getServiceDef(String serviceId)
{
- return _serviceDefs.get(serviceId);
+ return serviceDefs.get(serviceId);
}
private void grind()
{
- Method[] methods = _builderClass.getMethods();
+ Method[] methods = builderClass.getMethods();
Comparator<Method> c = new Comparator<Method>()
{
@@ -183,7 +183,7 @@
String serviceId = stripMethodPrefix(method, CONTRIBUTE_METHOD_NAME_PREFIX);
Class returnType = method.getReturnType();
- if (!returnType.equals(void.class)) _logger.warn(IOCMessages.contributionWrongReturnType(method));
+ if (!returnType.equals(void.class)) logger.warn(IOCMessages.contributionWrongReturnType(method));
ConfigurationType type = null;
@@ -196,7 +196,7 @@
{
if (type != null)
{
- _logger.warn(IOCMessages.tooManyContributionParameters(method));
+ logger.warn(IOCMessages.tooManyContributionParameters(method));
return;
}
@@ -206,13 +206,13 @@
if (type == null)
{
- _logger.warn(IOCMessages.noContributionParameter(method));
+ logger.warn(IOCMessages.noContributionParameter(method));
return;
}
- ContributionDef def = new ContributionDefImpl(serviceId, method, _classFactory);
+ ContributionDef def = new ContributionDefImpl(serviceId, method, classFactory);
- _contributionDefs.add(def);
+ contributionDefs.add(def);
}
private void addDecoratorDef(Method method)
@@ -227,13 +227,13 @@
if (returnType.isPrimitive() || returnType.isArray())
{
- _logger.warn(decoratorMethodWrongReturnType(method));
+ logger.warn(decoratorMethodWrongReturnType(method));
return;
}
if (!methodContainsObjectParameter(method))
{
- _logger.warn(IOCMessages.decoratorMethodNeedsDelegateParameter(method));
+ logger.warn(IOCMessages.decoratorMethodNeedsDelegateParameter(method));
return;
}
@@ -247,11 +247,11 @@
// TODO: Validate constraints here?
- String[] patterns = match == null ? new String[]{decoratorId} : match.value();
+ String[] patterns = match == null ? new String[] { decoratorId } : match.value();
- DecoratorDef def = new DecoratorDefImpl(decoratorId, method, patterns, constraints, _classFactory);
+ DecoratorDef def = new DecoratorDefImpl(decoratorId, method, patterns, constraints, classFactory);
- _decoratorDefs.put(decoratorId, def);
+ decoratorDefs.put(decoratorId, def);
}
private boolean methodContainsObjectParameter(Method method)
@@ -292,7 +292,7 @@
if (returnType.isPrimitive() || returnType.isArray())
{
- _logger.warn(buildMethodWrongReturnType(method));
+ logger.warn(buildMethodWrongReturnType(method));
return;
}
@@ -308,11 +308,11 @@
public String getDescription()
{
- return InternalUtils.asString(method, _classFactory);
+ return InternalUtils.asString(method, classFactory);
}
};
- Set<Class> markers = newSet(_defaultMarkers);
+ Set<Class> markers = newSet(defaultMarkers);
markers.addAll(extractMarkers(method));
ServiceDefImpl serviceDef = new ServiceDefImpl(returnType, serviceId, markers, scope, eagerLoad, source);
@@ -333,15 +333,15 @@
{
String serviceId = serviceDef.getServiceId();
- ServiceDef existing = _serviceDefs.get(serviceId);
+ ServiceDef existing = serviceDefs.get(serviceId);
if (existing != null)
{
- _logger.warn(buildMethodConflict(serviceDef.toString(), existing.toString()));
+ logger.warn(buildMethodConflict(serviceDef.toString(), existing.toString()));
return;
}
- _serviceDefs.put(serviceId, serviceDef);
+ serviceDefs.put(serviceId, serviceDef);
}
private String extractServiceScope(Method method)
@@ -353,17 +353,17 @@
public Set<DecoratorDef> getDecoratorDefs()
{
- return newSet(_decoratorDefs.values());
+ return newSet(decoratorDefs.values());
}
public Set<ContributionDef> getContributionDefs()
{
- return _contributionDefs;
+ return contributionDefs;
}
public String getLoggerName()
{
- return _builderClass.getName();
+ return builderClass.getName();
}
/**
@@ -376,16 +376,16 @@
try
{
- bindMethod = _builderClass.getMethod("bind", ServiceBinder.class);
+ bindMethod = builderClass.getMethod("bind", ServiceBinder.class);
if (!Modifier.isStatic(bindMethod.getModifiers()))
{
- _logger.error(IOCMessages.bindMethodMustBeStatic(InternalUtils.asString(bindMethod, _classFactory)));
+ logger.error(IOCMessages.bindMethodMustBeStatic(InternalUtils.asString(bindMethod, classFactory)));
return;
}
- ServiceBinderImpl binder = new ServiceBinderImpl(this, _classFactory, _defaultMarkers);
+ ServiceBinderImpl binder = new ServiceBinderImpl(this, classFactory, defaultMarkers);
bindMethod.invoke(null, binder);
@@ -412,7 +412,7 @@
failure = ex.getTargetException();
}
- String methodId = InternalUtils.asString(bindMethod, _classFactory);
+ String methodId = InternalUtils.asString(bindMethod, classFactory);
throw new RuntimeException(IOCMessages.errorInBindMethod(methodId, failure), failure);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/GlobPatternMatcher.java Tue May 6 14:52:36 2008
@@ -18,9 +18,9 @@
public class GlobPatternMatcher
{
- private String _substring;
+ private String substring;
- private MatchType _type;
+ private MatchType type;
public GlobPatternMatcher(String pattern)
{
@@ -31,7 +31,7 @@
{
if (pattern.equals("*"))
{
- _type = ANY;
+ type = ANY;
return;
}
@@ -40,56 +40,56 @@
if (globPrefix && globSuffix)
{
- _substring = pattern.substring(1, pattern.length() - 1);
- _type = INFIX;
+ substring = pattern.substring(1, pattern.length() - 1);
+ type = INFIX;
return;
}
if (globPrefix)
{
- _substring = pattern.substring(1);
- _type = SUFFIX;
+ substring = pattern.substring(1);
+ type = SUFFIX;
return;
}
if (globSuffix)
{
- _substring = pattern.substring(0, pattern.length() - 1);
- _type = PREFIX;
+ substring = pattern.substring(0, pattern.length() - 1);
+ type = PREFIX;
return;
}
- _type = MatchType.EXACT;
- _substring = pattern;
+ type = MatchType.EXACT;
+ substring = pattern;
}
public boolean matches(String input)
{
- switch (_type)
+ switch (type)
{
case ANY:
return true;
case EXACT:
- return input.equalsIgnoreCase(_substring);
+ return input.equalsIgnoreCase(substring);
case INFIX:
- return input.toLowerCase().contains(_substring.toLowerCase());
+ return input.toLowerCase().contains(substring.toLowerCase());
case PREFIX:
- return input.regionMatches(true, 0, _substring, 0, _substring.length());
+ return input.regionMatches(true, 0, substring, 0, substring.length());
default:
return input.regionMatches(
true,
- input.length() - _substring.length(),
- _substring,
+ input.length() - substring.length(),
+ substring,
0,
- _substring.length());
+ substring.length());
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java Tue May 6 14:52:36 2008
@@ -28,49 +28,49 @@
public class IOCInternalTestCase extends IOCTestCase implements Registry
{
- private static Registry _registry;
+ private static Registry registry;
- private static ClassFactory _classFactory;
+ private static ClassFactory classFactory;
@AfterMethod
public final void cleanupThread()
{
- _registry.cleanupThread();
+ registry.cleanupThread();
}
public final ClassFactory getClassFactory()
{
- return _classFactory;
+ return classFactory;
}
public final <T> T getObject(Class<T> objectType, AnnotationProvider annotationProvider)
{
- return _registry.getObject(objectType, annotationProvider);
+ return registry.getObject(objectType, annotationProvider);
}
public final <T> T getService(Class<T> serviceInterface)
{
- return _registry.getService(serviceInterface);
+ return registry.getService(serviceInterface);
}
public final <T> T getService(String serviceId, Class<T> serviceInterface)
{
- return _registry.getService(serviceId, serviceInterface);
+ return registry.getService(serviceId, serviceInterface);
}
public final <T> T autobuild(Class<T> clazz)
{
- return _registry.autobuild(clazz);
+ return registry.autobuild(clazz);
}
public final void performRegistryStartup()
{
- _registry.performRegistryStartup();
+ registry.performRegistryStartup();
}
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass)
{
- return _registry.proxy(interfaceClass, implementationClass);
+ return registry.proxy(interfaceClass, implementationClass);
}
@@ -79,11 +79,11 @@
{
RegistryBuilder builder = new RegistryBuilder();
- _registry = builder.build();
+ registry = builder.build();
- _registry.performRegistryStartup();
+ registry.performRegistryStartup();
- _classFactory = _registry.getService(ClassFactory.class);
+ classFactory = registry.getService(ClassFactory.class);
}
public final void shutdown()
@@ -95,10 +95,10 @@
@AfterSuite
public final void shutdown_registry()
{
- _registry.shutdown();
+ registry.shutdown();
- _registry = null;
- _classFactory = null;
+ registry = null;
+ classFactory = null;
}
protected final InternalRegistry mockInternalRegistry()
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/IdMatcherImpl.java Tue May 6 14:52:36 2008
@@ -21,15 +21,15 @@
*/
public class IdMatcherImpl implements IdMatcher
{
- private final GlobPatternMatcher _globMatcher;
+ private final GlobPatternMatcher globMatcher;
public IdMatcherImpl(String pattern)
{
- _globMatcher = new GlobPatternMatcher(pattern);
+ globMatcher = new GlobPatternMatcher(pattern);
}
public boolean matches(String id)
{
- return _globMatcher.matches(id);
+ return globMatcher.matches(id);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilder.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilder.java Tue May 6 14:52:36 2008
@@ -21,17 +21,16 @@
import java.util.List;
/**
- * Responsible for constructing the interceptor stack, on demand, by invoking an ordered series of
- * decorators ({@link org.apache.tapestry.ioc.def.DecoratorDef} (which are converted into
- * {@link ServiceDecorator}s).
+ * Responsible for constructing the interceptor stack, on demand, by invoking an ordered series of decorators ({@link
+ * org.apache.tapestry.ioc.def.DecoratorDef} (which are converted into {@link ServiceDecorator}s).
*/
public class InterceptorStackBuilder implements ObjectCreator
{
- private final String _serviceId;
+ private final String serviceId;
- private final ObjectCreator _coreServiceCreator;
+ private final ObjectCreator coreServiceCreator;
- private final Module _module;
+ private final Module module;
/**
* @param module the module containing the decorator method
@@ -41,16 +40,16 @@
*/
public InterceptorStackBuilder(Module module, String serviceId, ObjectCreator coreServiceCreator)
{
- _module = module;
- _serviceId = serviceId;
- _coreServiceCreator = coreServiceCreator;
+ this.module = module;
+ this.serviceId = serviceId;
+ this.coreServiceCreator = coreServiceCreator;
}
public Object createObject()
{
- Object current = _coreServiceCreator.createObject();
+ Object current = coreServiceCreator.createObject();
- List<ServiceDecorator> decorators = _module.findDecoratorsForService(_serviceId);
+ List<ServiceDecorator> decorators = module.findDecoratorsForService(serviceId);
// We get the decorators ordered according to their dependencies. However, we want to
// process from the last interceptor to the first, so we reverse the list.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/LifecycleWrappedServiceCreator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/LifecycleWrappedServiceCreator.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/LifecycleWrappedServiceCreator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/LifecycleWrappedServiceCreator.java Tue May 6 14:52:36 2008
@@ -19,39 +19,37 @@
import org.apache.tapestry.ioc.ServiceResources;
/**
- * Wrapper around a lifecycle, a set of resources for a service, and an underlying
- * {@link ObjectCreator} for a service that allows the service lifecycle to alter the way that the
- * service is created (this is needed for the more advanced, non-singleton types of service
- * lifecycles).
+ * Wrapper around a lifecycle, a set of resources for a service, and an underlying {@link ObjectCreator} for a service
+ * that allows the service lifecycle to alter the way that the service is created (this is needed for the more advanced,
+ * non-singleton types of service lifecycles).
*/
public class LifecycleWrappedServiceCreator implements ObjectCreator
{
- private final InternalRegistry _registry;
+ private final InternalRegistry registry;
- private final String _serviceScope;
+ private final String serviceScope;
- private final ServiceResources _resources;
+ private final ServiceResources resources;
- private final ObjectCreator _creator;
+ private final ObjectCreator creator;
public LifecycleWrappedServiceCreator(InternalRegistry registry, String serviceScope,
ServiceResources resources, ObjectCreator creator)
{
- _registry = registry;
- _serviceScope = serviceScope;
- _resources = resources;
- _creator = creator;
+ this.registry = registry;
+ this.serviceScope = serviceScope;
+ this.resources = resources;
+ this.creator = creator;
}
/**
- * Passes the resources and the service creator through the
- * {@link org.apache.tapestry.ioc.ServiceLifecycle}.
+ * Passes the resources and the service creator through the {@link org.apache.tapestry.ioc.ServiceLifecycle}.
*/
public Object createObject()
{
- ServiceLifecycle lifecycle = _registry.getServiceLifecycle(_serviceScope);
+ ServiceLifecycle lifecycle = registry.getServiceLifecycle(serviceScope);
- return lifecycle.createService(_resources, _creator);
+ return lifecycle.createService(resources, creator);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ModuleImpl.java Tue May 6 14:52:36 2008
@@ -37,18 +37,18 @@
public class ModuleImpl implements Module
{
- private final InternalRegistry _registry;
+ private final InternalRegistry registry;
- private final ServiceActivityTracker _tracker;
+ private final ServiceActivityTracker tracker;
- private final ModuleDef _moduleDef;
+ private final ModuleDef moduleDef;
- private final ClassFactory _classFactory;
+ private final ClassFactory classFactory;
- private final Logger _logger;
+ private final Logger logger;
// Guarded by MUTEX
- private Object _moduleBuilder;
+ private Object moduleBuilder;
/**
* A single mutex, shared by all modules, that serializes creation of services across all threads. This is a bit
@@ -60,21 +60,21 @@
// Set to true when invoking the module constructor. Used to
// detect endless loops caused by irresponsible dependencies in
// the constructor. Guarded by MUTEX.
- private boolean _insideConstructor;
+ private boolean insideConstructor;
/**
* Keyed on fully qualified service id; values are instantiated services (proxies).
*/
- private final Map<String, Object> _services = newCaseInsensitiveMap();
+ private final Map<String, Object> services = newCaseInsensitiveMap();
public ModuleImpl(InternalRegistry registry, ServiceActivityTracker tracker, ModuleDef moduleDef,
ClassFactory classFactory, Logger logger)
{
- _registry = registry;
- _tracker = tracker;
- _moduleDef = moduleDef;
- _classFactory = classFactory;
- _logger = logger;
+ this.registry = registry;
+ this.tracker = tracker;
+ this.moduleDef = moduleDef;
+ this.classFactory = classFactory;
+ this.logger = logger;
}
public <T> T getService(String serviceId, Class<T> serviceInterface)
@@ -83,7 +83,7 @@
notNull(serviceInterface, "serviceInterface");
// module may be null.
- ServiceDef def = _moduleDef.getServiceDef(serviceId);
+ ServiceDef def = moduleDef.getServiceDef(serviceId);
// RegistryImpl should already have checked that the service exists.
assert def != null;
@@ -109,7 +109,7 @@
{
Set<DecoratorDef> result = newSet();
- for (DecoratorDef def : _moduleDef.getDecoratorDefs())
+ for (DecoratorDef def : moduleDef.getDecoratorDefs())
{
if (def.matches(serviceDef)) result.add(def);
}
@@ -119,9 +119,9 @@
public List<ServiceDecorator> findDecoratorsForService(String serviceId)
{
- ServiceDef sd = _moduleDef.getServiceDef(serviceId);
+ ServiceDef sd = moduleDef.getServiceDef(serviceId);
- return _registry.findDecoratorsForService(sd);
+ return registry.findDecoratorsForService(sd);
}
@SuppressWarnings("unchecked")
@@ -131,9 +131,9 @@
Collection<String> result = newList();
- for (String id : _moduleDef.getServiceIds())
+ for (String id : moduleDef.getServiceIds())
{
- ServiceDef def = _moduleDef.getServiceDef(id);
+ ServiceDef def = moduleDef.getServiceDef(id);
if (serviceInterface.isAssignableFrom(def.getServiceInterface())) result.add(id);
}
@@ -156,12 +156,12 @@
{
String key = def.getServiceId();
- Object result = _services.get(key);
+ Object result = services.get(key);
if (result == null)
{
result = create(def, eagerLoadProxies);
- _services.put(key, result);
+ services.put(key, result);
}
return result;
@@ -172,9 +172,9 @@
{
synchronized (MUTEX)
{
- for (String serviceId : _moduleDef.getServiceIds())
+ for (String serviceId : moduleDef.getServiceIds())
{
- ServiceDef def = _moduleDef.getServiceDef(serviceId);
+ ServiceDef def = moduleDef.getServiceDef(serviceId);
if (def.isEagerLoad()) findOrCreate(def, proxies);
}
@@ -190,13 +190,13 @@
{
String serviceId = def.getServiceId();
- Logger logger = _registry.getServiceLogger(serviceId);
+ Logger logger = registry.getServiceLogger(serviceId);
if (logger.isDebugEnabled()) logger.debug(IOCMessages.creatingService(serviceId));
try
{
- ServiceBuilderResources resources = new ServiceResourcesImpl(_registry, this, def, _classFactory, logger);
+ ServiceBuilderResources resources = new ServiceResourcesImpl(registry, this, def, classFactory, logger);
// Build up a stack of operations that will be needed to realize the service
// (by the proxy, at a later date).
@@ -211,22 +211,22 @@
if (!serviceInterface.isInterface()) return creator.createObject();
- creator = new LifecycleWrappedServiceCreator(_registry, def.getServiceScope(), resources, creator);
+ creator = new LifecycleWrappedServiceCreator(registry, def.getServiceScope(), resources, creator);
// Don't allow the core IOC services services to be decorated.
- if (!TapestryIOCModule.class.equals(_moduleDef.getBuilderClass()))
+ if (!TapestryIOCModule.class.equals(moduleDef.getBuilderClass()))
creator = new InterceptorStackBuilder(this, serviceId, creator);
// Add a wrapper that checks for recursion.
creator = new RecursiveServiceCreationCheckWrapper(def, creator, logger);
- JustInTimeObjectCreator delegate = new JustInTimeObjectCreator(_tracker, creator, serviceId);
+ JustInTimeObjectCreator delegate = new JustInTimeObjectCreator(tracker, creator, serviceId);
Object proxy = createProxy(resources, delegate);
- _registry.addRegistryShutdownListener(delegate);
+ registry.addRegistryShutdownListener(delegate);
// Occasionally service A may invoke service B from its service builder method; if
// service B
@@ -236,7 +236,7 @@
if (def.isEagerLoad() && eagerLoadProxies != null) eagerLoadProxies.add(delegate);
- _tracker.setStatus(serviceId, Status.VIRTUAL);
+ tracker.setStatus(serviceId, Status.VIRTUAL);
return proxy;
}
@@ -250,9 +250,9 @@
{
synchronized (MUTEX)
{
- if (_moduleBuilder == null) _moduleBuilder = instantiateModuleBuilder();
+ if (moduleBuilder == null) moduleBuilder = instantiateModuleBuilder();
- return _moduleBuilder;
+ return moduleBuilder;
}
}
@@ -261,7 +261,7 @@
*/
private Object instantiateModuleBuilder()
{
- Class builderClass = _moduleDef.getBuilderClass();
+ Class builderClass = moduleDef.getBuilderClass();
Constructor[] constructors = builderClass.getConstructors();
@@ -283,25 +283,25 @@
Arrays.sort(constructors, comparator);
- _logger.warn(IOCMessages.tooManyPublicConstructors(builderClass, constructors[0]));
+ logger.warn(IOCMessages.tooManyPublicConstructors(builderClass, constructors[0]));
}
Constructor constructor = constructors[0];
- if (_insideConstructor)
+ if (insideConstructor)
throw new RuntimeException(IOCMessages.recursiveModuleConstructor(builderClass, constructor));
- ObjectLocator locator = new ObjectLocatorImpl(_registry, this);
+ ObjectLocator locator = new ObjectLocatorImpl(registry, this);
Map<Class, Object> parameterDefaults = newMap();
- parameterDefaults.put(Logger.class, _logger);
+ parameterDefaults.put(Logger.class, logger);
parameterDefaults.put(ObjectLocator.class, locator);
Throwable fail = null;
try
{
- _insideConstructor = true;
+ insideConstructor = true;
Object[] parameterValues = InternalUtils.calculateParameters(locator, parameterDefaults,
constructor.getParameterTypes(),
@@ -319,7 +319,7 @@
}
finally
{
- _insideConstructor = false;
+ insideConstructor = false;
}
throw new RuntimeException(IOCMessages.instantiateBuilderError(builderClass, fail), fail);
@@ -340,7 +340,7 @@
{
ServiceProxyToken token = SerializationSupport.createToken(serviceId);
- ClassFab classFab = _registry.newClass(serviceInterface);
+ ClassFab classFab = registry.newClass(serviceInterface);
classFab.addField("_creator", Modifier.PRIVATE | Modifier.FINAL, ObjectCreator.class);
classFab.addField("_token", Modifier.PRIVATE | Modifier.FINAL, ServiceProxyToken.class);
@@ -387,7 +387,7 @@
{
Set<ContributionDef> result = newSet();
- for (ContributionDef def : _moduleDef.getContributionDefs())
+ for (ContributionDef def : moduleDef.getContributionDefs())
{
if (def.getServiceId().equals(serviceId)) result.add(def);
}
@@ -397,12 +397,12 @@
public ServiceDef getServiceDef(String serviceId)
{
- return _moduleDef.getServiceDef(serviceId);
+ return moduleDef.getServiceDef(serviceId);
}
public String getLoggerName()
{
- return _moduleDef.getLoggerName();
+ return moduleDef.getLoggerName();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ObjectLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ObjectLocatorImpl.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ObjectLocatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ObjectLocatorImpl.java Tue May 6 14:52:36 2008
@@ -18,56 +18,55 @@
import org.apache.tapestry.ioc.ObjectLocator;
/**
- * Base service locator class used when only the module is known (i.e., when instantiating a module
- * builder class).
+ * Base service locator class used when only the module is known (i.e., when instantiating a module builder class).
*/
public class ObjectLocatorImpl implements ObjectLocator
{
- private final InternalRegistry _registry;
+ private final InternalRegistry registry;
- private final Module _module;
+ private final Module module;
public ObjectLocatorImpl(InternalRegistry registry, Module module)
{
- _registry = registry;
- _module = module;
+ this.registry = registry;
+ this.module = module;
}
public <T> T getService(String serviceId, Class<T> serviceInterface)
{
- String expandedServiceId = _registry.expandSymbols(serviceId);
+ String expandedServiceId = registry.expandSymbols(serviceId);
- return _registry.getService(expandedServiceId, serviceInterface);
+ return registry.getService(expandedServiceId, serviceInterface);
}
public <T> T getService(Class<T> serviceInterface)
{
- return _registry.getService(serviceInterface);
+ return registry.getService(serviceInterface);
}
public <T> T getObject(Class<T> objectType, AnnotationProvider annotationProvider)
{
- return _registry.getObject(objectType, annotationProvider);
+ return registry.getObject(objectType, annotationProvider);
}
protected InternalRegistry getRegistry()
{
- return _registry;
+ return registry;
}
protected Module getModule()
{
- return _module;
+ return module;
}
public <T> T autobuild(Class<T> clazz)
{
- return _registry.autobuild(clazz);
+ return registry.autobuild(clazz);
}
public <T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass)
{
- return _registry.proxy(interfaceClass, implementationClass);
+ return registry.proxy(interfaceClass, implementationClass);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/OrIdMatcher.java Tue May 6 14:52:36 2008
@@ -1,17 +1,17 @@
-// 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.ioc.internal;
import org.apache.tapestry.ioc.IdMatcher;
@@ -23,16 +23,16 @@
*/
public final class OrIdMatcher implements IdMatcher
{
- private final IdMatcher[] _matchers;
+ private final IdMatcher[] matchers;
public OrIdMatcher(Collection<IdMatcher> matchers)
{
- _matchers = matchers.toArray(new IdMatcher[matchers.size()]);
+ this.matchers = matchers.toArray(new IdMatcher[matchers.size()]);
}
public boolean matches(String id)
{
- for (IdMatcher m : _matchers)
+ for (IdMatcher m : matchers)
if (m.matches(id)) return true;
return false;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RecursiveServiceCreationCheckWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RecursiveServiceCreationCheckWrapper.java?rev=653936&r1=653935&r2=653936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RecursiveServiceCreationCheckWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/RecursiveServiceCreationCheckWrapper.java Tue May 6 14:52:36 2008
@@ -19,55 +19,54 @@
import org.slf4j.Logger;
/**
- * Decorator for {@link org.apache.tapestry.ioc.ObjectCreator} that ensures the service is only
- * created once. This detects a situation where the service builder for a service directly or
- * indirectly invokes methods on the service itself. This would show up as a second call up the
- * ServiceCreator stack injected into the proxy, potentially leading to endless recursion. We try to
- * identify that recursion and produce a useable exception report.
+ * Decorator for {@link org.apache.tapestry.ioc.ObjectCreator} that ensures the service is only created once. This
+ * detects a situation where the service builder for a service directly or indirectly invokes methods on the service
+ * itself. This would show up as a second call up the ServiceCreator stack injected into the proxy, potentially leading
+ * to endless recursion. We try to identify that recursion and produce a useable exception report.
*/
public class RecursiveServiceCreationCheckWrapper implements ObjectCreator
{
- private final ServiceDef _serviceDef;
+ private final ServiceDef serviceDef;
- private final ObjectCreator _delegate;
+ private final ObjectCreator delegate;
- private final Logger _logger;
+ private final Logger logger;
- private boolean _locked;
+ private boolean locked;
public RecursiveServiceCreationCheckWrapper(ServiceDef serviceDef, ObjectCreator delegate,
Logger logger)
{
- _serviceDef = serviceDef;
- _delegate = delegate;
- _logger = logger;
+ this.serviceDef = serviceDef;
+ this.delegate = delegate;
+ this.logger = logger;
}
/**
- * We could make this method synchronized, but in the context of creating a service for a proxy,
- * it will already be synchronized (inside the proxy).
+ * We could make this method synchronized, but in the context of creating a service for a proxy, it will already be
+ * synchronized (inside the proxy).
*/
public Object createObject()
{
- if (_locked)
- throw new IllegalStateException(IOCMessages.recursiveServiceBuild(_serviceDef));
+ if (locked)
+ throw new IllegalStateException(IOCMessages.recursiveServiceBuild(serviceDef));
// Set the lock, to ensure that recursive service construction fails.
- _locked = true;
+ locked = true;
try
{
- return _delegate.createObject();
+ return delegate.createObject();
}
catch (RuntimeException ex)
{
- _logger.error(IOCMessages.serviceConstructionFailed(_serviceDef, ex), ex);
+ logger.error(IOCMessages.serviceConstructionFailed(serviceDef, ex), ex);
// Release the lock on failure; the service is now in an unknown state, but we may
// be able to continue from here.
- _locked = false;
+ locked = false;
throw ex;
}