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:59:39 UTC
svn commit: r653938 - in /tapestry/tapestry5/trunk/tapestry-ioc/src:
main/java/org/apache/tapestry/ioc/
main/java/org/apache/tapestry/ioc/internal/
test/java/org/apache/tapestry/ioc/
Author: hlship
Date: Tue May 6 14:59:39 2008
New Revision: 653938
URL: http://svn.apache.org/viewvc?rev=653938&view=rev
Log:
Remove some static imports.
Modified:
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/ContributionDefImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
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=653938&r1=653937&r2=653938&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:59:39 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.ioc;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry.ioc.internal.util.Defense;
/**
* A wrapper that allows objects of a target type to be ordered. Each Orderable object is given a unique id and a set of
@@ -38,7 +38,7 @@
public Orderable(String id, T target, String... constraints)
{
- this.id = notBlank(id, "id");
+ this.id = Defense.notBlank(id, "id");
this.target = target;
this.constraints = constraints;
}
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=653938&r1=653937&r2=653938&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:59:39 2008
@@ -22,7 +22,6 @@
import org.apache.tapestry.ioc.internal.RegistryWrapper;
import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.ioc.internal.util.OneShotLock;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.TapestryIOCModule;
@@ -44,7 +43,7 @@
/**
* Module defs, keyed on module id.
*/
- final List<ModuleDef> modules = newList();
+ final List<ModuleDef> modules = CollectionFactory.newList();
private final ClassLoader classLoader;
@@ -97,7 +96,7 @@
{
lock.check();
- List<Class> queue = newList(Arrays.asList(moduleBuilderClasses));
+ List<Class> queue = CollectionFactory.newList(Arrays.asList(moduleBuilderClasses));
while (!queue.isEmpty())
{
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=653938&r1=653937&r2=653938&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:59:39 2008
@@ -19,7 +19,7 @@
import org.apache.tapestry.ioc.ServiceBuilderResources;
import org.apache.tapestry.ioc.ServiceResources;
import static org.apache.tapestry.ioc.internal.ConfigurationType.*;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.slf4j.Logger;
import java.lang.reflect.ParameterizedType;
@@ -36,13 +36,13 @@
{
protected final String serviceId;
- private final Map<Class, Object> parameterDefaults = newMap();
+ private final Map<Class, Object> parameterDefaults = CollectionFactory.newMap();
protected final ServiceBuilderResources resources;
protected final Logger logger;
- private final static Map<Class, ConfigurationType> PARAMETER_TYPE_TO_CONFIGURATION_TYPE = newMap();
+ private final static Map<Class, ConfigurationType> PARAMETER_TYPE_TO_CONFIGURATION_TYPE = CollectionFactory.newMap();
protected final String creatorDescription;
@@ -74,7 +74,7 @@
protected final Map<Class, Object> getParameterDefaultsWithConfiguration(Class[] parameterTypes,
Type[] genericParameterTypes)
{
- Map<Class, Object> result = newMap(parameterDefaults);
+ Map<Class, Object> result = CollectionFactory.newMap(parameterDefaults);
ConfigurationType type = null;
for (int i = 0; i < parameterTypes.length; i++)
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=653938&r1=653937&r2=653938&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:59:39 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ioc.*;
import org.apache.tapestry.ioc.def.ContributionDef;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassFactory;
@@ -71,7 +71,7 @@
private <T> void invokeMethod(ModuleBuilderSource source, ObjectLocator locator,
Class<T> parameterType, T parameterValue)
{
- Map<Class, Object> parameterDefaults = newMap();
+ Map<Class, Object> parameterDefaults = CollectionFactory.newMap();
// The way it works is: the method will take Configuration, OrderedConfiguration or
// MappedConfiguration. So, if the method is for one type and the service is for a different
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java?rev=653938&r1=653937&r2=653938&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BarneyModule.java Tue May 6 14:59:39 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.ioc.annotations.Match;
import org.apache.tapestry.ioc.annotations.Order;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import java.util.ArrayList;
import java.util.HashMap;
@@ -94,7 +94,7 @@
{
return new DecoratorList()
{
- private List<String> names = newList();
+ private List<String> names = CollectionFactory.newList();
public void add(String name)
{