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/11/12 23:23:28 UTC
svn commit: r594319 [36/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/or...
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/Stack.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/Stack.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/Stack.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/Stack.java Mon Nov 12 14:22:31 2007
@@ -19,9 +19,9 @@
/**
* A simple, streamlined implementation of {@link java.util.Stack}. The implementation is
* <em>not</em> threadsafe.
- *
+ *
* @param <E>
- * the type of elements stored in the map
+ * the type of elements stored in the map
* @see CollectionFactory#newStack()
*/
public class Stack<E>
@@ -43,22 +43,25 @@
}
/**
- * @param initialSize
- * the initial size of the internal array (which will be expanded as necessary). For
- * best efficiency, set this to the maximum depth of the stack.
+ * @param initialSize the initial size of the internal array (which will be expanded as necessary). For
+ * best efficiency, set this to the maximum depth of the stack.
*/
public Stack(int initialSize)
{
_items = new Object[Math.max(initialSize, MINIMUM_SIZE)];
}
- /** Returns true if the stack is empty. */
+ /**
+ * Returns true if the stack is empty.
+ */
public boolean isEmpty()
{
return _index < 0;
}
- /** Pushes a new item onto the stack. */
+ /**
+ * Pushes a new item onto the stack.
+ */
public void push(E item)
{
_index++;
@@ -77,10 +80,9 @@
/**
* Pops the top element off the stack and returns it.
- *
+ *
* @return the top element of the stack
- * @throws IllegalStateException
- * if the stack is empty
+ * @throws IllegalStateException if the stack is empty
*/
@SuppressWarnings("unchecked")
public E pop()
@@ -103,10 +105,9 @@
/**
* Returns the top element of the stack without affecting the stack.
- *
+ *
* @return top element on the stack
- * @throws IllegalStateException
- * if the stack is empty
+ * @throws IllegalStateException if the stack is empty
*/
@SuppressWarnings("unchecked")
public E peek()
@@ -118,7 +119,7 @@
/**
* Describes the stack, listing the element in order of depth (top element first).
- *
+ *
* @return string description of the stack
*/
@Override
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/StrategyRegistry.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,18 @@
package org.apache.tapestry.ioc.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
+import org.apache.tapestry.ioc.internal.util.InheritanceSearch;
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.ioc.internal.util.InheritanceSearch;
-
/**
* A key component in implementing the "Gang of Four" Strategy pattern. A StrategyRegistry will
* match up a given input type with a registered strategy for that type.
- *
+ *
* @param <A>
- * the type of the strategy adapter
+ * the type of the strategy adapter
*/
public final class StrategyRegistry<A>
{
@@ -40,11 +37,9 @@
/**
* Creates a strategy registry for the given adapter type.
- *
- * @param adapterType
- * the type of adapter retrieved from the registry
- * @param registrations
- * map of registrations (the contents of the map are copied)
+ *
+ * @param adapterType the type of adapter retrieved from the registry
+ * @param registrations map of registrations (the contents of the map are copied)
*/
public StrategyRegistry(final Class<A> adapterType, Map<Class, A> registrations)
{
@@ -53,7 +48,7 @@
}
public static <A> StrategyRegistry<A> newInstance(Class<A> adapterType,
- Map<Class, A> registrations)
+ Map<Class, A> registrations)
{
return new StrategyRegistry<A>(adapterType, registrations);
}
@@ -71,12 +66,10 @@
/**
* Gets an adapter for an object. Searches based on the value's class, unless the value is null,
* in which case, a search on class void is used.
- *
- * @param value
- * for which an adapter is needed
+ *
+ * @param value for which an adapter is needed
* @return the adaptoer for the value
- * @throws IllegalArgumentException
- * if no matching adapter may be found
+ * @throws IllegalArgumentException if no matching adapter may be found
*/
public A getByInstance(Object value)
@@ -86,12 +79,10 @@
/**
* Searches for an adapter corresponding to the given input type.
- *
- * @param type
- * the type to search
+ *
+ * @param type the type to search
* @return the corresponding adapter
- * @throws IllegalArgumentException
- * if no matching adapter may be found
+ * @throws IllegalArgumentException if no matching adapter may be found
*/
public A get(Class type)
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/util/UtilMessages.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.ioc.util;
-import java.util.Collection;
-
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+
+import java.util.Collection;
/**
* Static messages
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/services/MasterObjectProvider.java Mon Nov 12 14:22:31 2007
@@ -29,29 +29,24 @@
* particular <em>context</em>, which will typically be a service builder method, service
* contributor method, or service decorator method. The locator parameter provides access to the
* services visible <em>to that context</em>.
- * <p>
+ * <p/>
* When the value is required and no {@link ObjectProvider} provided a non-null value, then
* {@link ObjectLocator#getService(Class)} is invoked, to provide a uniquely matching service,
* or throw a failure exception if no <em>single</em> service can be found.
- *
- * @param objectType
- * the expected object type
- * @param annotationProvider
- * provides access to annotations (typically, the field or parameter to which an
- * injection-related annotation is attached); annotations on the field or parameter
- * may also be used when resolving the desired object
- * @param locator
- * locator for the <em>context</em> in which the provider is being used
- * @param required
- * if true (normal case) a value must be provided; if false then it is allowed for no
- * ObjectProvider to provide a value, and this method may return null to indicate the
- * failure
+ *
+ * @param objectType the expected object type
+ * @param annotationProvider provides access to annotations (typically, the field or parameter to which an
+ * injection-related annotation is attached); annotations on the field or parameter
+ * may also be used when resolving the desired object
+ * @param locator locator for the <em>context</em> in which the provider is being used
+ * @param required if true (normal case) a value must be provided; if false then it is allowed for no
+ * ObjectProvider to provide a value, and this method may return null to indicate the
+ * failure
* @param <T>
* @return the requested object, or null if this object provider can not supply an object
- * @throws RuntimeException
- * if the expression can not be evaluated, or the type of object identified is not
- * assignable to the type specified by the objectType parameter
+ * @throws RuntimeException if the expression can not be evaluated, or the type of object identified is not
+ * assignable to the type specified by the objectType parameter
*/
<T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
- ObjectLocator locator, boolean required);
+ ObjectLocator locator, boolean required);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/site.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/site.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/site.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/site.xml Mon Nov 12 14:22:31 2007
@@ -31,20 +31,20 @@
<artifactId>maven-skin</artifactId>
<version>1.1</version>
</skin>
-
- <publishDate format="dd MMM yyyy" />
-
+
+ <publishDate format="dd MMM yyyy"/>
+
<body>
-
- <head>
+
+ <head>
<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
<script type="text/javascript">_uacct = "UA-400821-1"; urchinTracker();</script>
</head>
-
+
<menu name="Quick Links">
<item name="Download" href="http://tapestry.apache.org/download.html"/>
</menu>
-
+
<menu name="Tapestry IoC Container">
<item name="Introduction" href="index.html"/>
<item name="Overview of Tapestry IoC" href="overview.html"/>
@@ -61,24 +61,24 @@
<item name="Logging" href="logging.html"/>
<item name="Startup" href="startup.html"/>
</menu>
-
-
+
+
<menu name="Service Builders">
<item name="Chain Of Command" href="command.html"/>
<item name="Strategy" href="strategy.html"/>
<item name="Pipeline" href="pipeline.html"/>
<item name="Shadow Services" href="shadow.html"/>
</menu>
-
+
<menu name="Tapestry IoC Cookbook">
- <item name="Introduction" href="cookbook/index.html"/>
- <item name="Basics" href="cookbook/basics.html"/>
- <item name="Service Configurations" href="cookbook/servconf.html"/>
- <item name="Using Patterns" href="cookbook/patterns.html"/>
+ <item name="Introduction" href="cookbook/index.html"/>
+ <item name="Basics" href="cookbook/basics.html"/>
+ <item name="Service Configurations" href="cookbook/servconf.html"/>
+ <item name="Using Patterns" href="cookbook/patterns.html"/>
</menu>
-
-
+
+
<menu ref="reports"/>
-
+
</body>
</project>
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml Mon Nov 12 14:22:31 2007
@@ -16,14 +16,14 @@
-->
<suite name="Tapestry IOC" parallel="false" annotations="1.5" verbose="0">
- <test name="Tapestry IOC">
- <packages>
- <package name="org.apache.tapestry.ioc"/>
- <package name="org.apache.tapestry.ioc.services"/>
- <package name="org.apache.tapestry.ioc.util"/>
- <package name="org.apache.tapestry.ioc.internal"/>
- <package name="org.apache.tapestry.ioc.internal.services"/>
- <package name="org.apache.tapestry.ioc.internal.util"/>
- </packages>
- </test>
+ <test name="Tapestry IOC">
+ <packages>
+ <package name="org.apache.tapestry.ioc"/>
+ <package name="org.apache.tapestry.ioc.services"/>
+ <package name="org.apache.tapestry.ioc.util"/>
+ <package name="org.apache.tapestry.ioc.internal"/>
+ <package name="org.apache.tapestry.ioc.internal.services"/>
+ <package name="org.apache.tapestry.ioc.internal.util"/>
+ </packages>
+ </test>
</suite>
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=594319&r1=594318&r2=594319&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 Mon Nov 12 14:22:31 2007
@@ -14,6 +14,8 @@
package org.apache.tapestry.ioc;
+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 java.util.ArrayList;
@@ -21,9 +23,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.ioc.annotations.Match;
-import org.apache.tapestry.ioc.annotations.Order;
-
/**
* Module used to demonstrate decorator ordering.
*/
@@ -31,7 +30,7 @@
public class BarneyModule
{
@Match(
- { "UnorderedNames", "Fred", "PrivateFredAlias" })
+ {"UnorderedNames", "Fred", "PrivateFredAlias"})
@Order("after:Beta")
public Object decorateGamma(Object delegate, DecoratorList list)
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BlueMarker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BlueMarker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BlueMarker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/BlueMarker.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.ioc;
+import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@Target(
-{ PARAMETER, FIELD })
+ {PARAMETER, FIELD})
@Retention(RUNTIME)
@Documented
public @interface BlueMarker
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/ConcreteServiceBuilderModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/ConcreteServiceBuilderModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/ConcreteServiceBuilderModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/ConcreteServiceBuilderModule.java Mon Nov 12 14:22:31 2007
@@ -16,7 +16,9 @@
public class ConcreteServiceBuilderModule
{
- /** Of course, this is silly to do now that there is {@link ServiceBinder}. */
+ /**
+ * Of course, this is silly to do now that there is {@link ServiceBinder}.
+ */
public StringHolderImpl buildStringHolder()
{
return new StringHolderImpl();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/DecoratorList.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/DecoratorList.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/DecoratorList.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/DecoratorList.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,23 @@
-// 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 java.util.List;
+import java.util.List;
/**
* Used to track the order in which decorators are invoked.
- *
- *
*/
public interface DecoratorList
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/FredModule.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,14 @@
package org.apache.tapestry.ioc;
+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 java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.tapestry.ioc.annotations.Match;
-import org.apache.tapestry.ioc.annotations.Order;
-
/**
* Module used to demonstrate decorator ordering.
*/
@@ -44,7 +43,7 @@
}
@Match(
- { "UnorderedNames", "Fred" })
+ {"UnorderedNames", "Fred"})
@Order("before:Beta")
public Object decorateAlpha(Object delegate, DecoratorList list)
{
@@ -54,7 +53,7 @@
}
@Match(
- { "UnorderedNames", "Fred" })
+ {"UnorderedNames", "Fred"})
public Object decorateBeta(Object delegate, DecoratorList list)
{
list.add("beta");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Indirection.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Indirection.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Indirection.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Indirection.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
package org.apache.tapestry.ioc;
-/** Used to demonstrate indirection via symbols. */
+/**
+ * Used to demonstrate indirection via symbols.
+ */
public interface Indirection
{
String getName();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/IntegrationTest.java Mon Nov 12 14:22:31 2007
@@ -14,24 +14,16 @@
package org.apache.tapestry.ioc;
-import java.sql.PreparedStatement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.ioc.internal.ExceptionInConstructorModule;
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.ServiceActivity;
-import org.apache.tapestry.ioc.services.ServiceActivityScoreboard;
-import org.apache.tapestry.ioc.services.Status;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry.ioc.services.*;
import org.easymock.EasyMock;
import org.testng.Assert;
import org.testng.annotations.Test;
+import java.sql.PreparedStatement;
+import java.util.*;
+
/**
* A few tests that are easiest (or even just possible) by building a Registry and trying out a few
* things.
@@ -663,7 +655,7 @@
// On the build server, the order of keys inside the RegistryImpl's _markerToServiceDef
// is different, and so it *may* query ofr a number of other annotations
// besides Builtin.
-
+
expect(ap.getAnnotation(EasyMock.isA(Class.class))).andStubReturn(null);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/MasterModule.java Mon Nov 12 14:22:31 2007
@@ -20,7 +20,7 @@
* Used by {@link org.apache.tapestry.ioc.RegistryBuilderTest}.
*/
@SubModule(
-{ FredModule.class, BarneyModule.class })
+ {FredModule.class, BarneyModule.class})
public final class MasterModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/NameListHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/NameListHolder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/NameListHolder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/NameListHolder.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,25 @@
-// 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 java.util.List;
+import java.util.List;
/**
* Used for testing of ordered and unordered contributions. The names are contributed in from
* multiple modules. For unordered contributions, the values are sorted alphabetically. For ordered
* contributions, the values are ordered as per the contributions.
- *
- *
*/
public interface NameListHolder
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/PerThreadModule.java Mon Nov 12 14:22:31 2007
@@ -15,7 +15,6 @@
package org.apache.tapestry.ioc;
import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-
import org.apache.tapestry.ioc.annotations.Scope;
public class PerThreadModule
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Pingable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Pingable.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Pingable.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Pingable.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
package org.apache.tapestry.ioc;
-/** Interface used as a stand-in for testing for more complicated services. */
+/**
+ * Interface used as a stand-in for testing for more complicated services.
+ */
public interface Pingable
{
void ping();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedMarker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedMarker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedMarker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RedMarker.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.ioc;
+import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@Target(
-{ PARAMETER, FIELD })
+ {PARAMETER, FIELD})
@Retention(RUNTIME)
@Documented
public @interface RedMarker
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTest.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.ioc;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
public class RegistryBuilderTest extends IOCTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTestModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTestModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTestModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/RegistryBuilderTestModule.java Mon Nov 12 14:22:31 2007
@@ -16,7 +16,9 @@
public class RegistryBuilderTestModule
{
- /** Arbitrary interface and service name. */
+ /**
+ * Arbitrary interface and service name.
+ */
public Square buildSquare()
{
return new Square()
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Sizer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Sizer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Sizer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Sizer.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc;
/**
* Encapsulates a strategy for determining the size of an object. Different implementations are
* mapped to different types.
- *
- *
*/
public interface Sizer
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Square.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Square.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Square.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/Square.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc;
/**
* Used by {@link org.apache.tapestry.ioc.RegistryBuilderTest}.
- *
- *
*/
public interface Square
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StaticModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StaticModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StaticModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StaticModule.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.ioc;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
public class StaticModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolder.java Mon Nov 12 14:22:31 2007
@@ -1,21 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc;
/**
- *
+ *
*/
public interface StringHolder
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolderImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolderImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringHolderImpl.java Mon Nov 12 14:22:31 2007
@@ -1,21 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc;
/**
- *
+ *
*/
public class StringHolderImpl implements StringHolder
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringTransformer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringTransformer.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringTransformer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/StringTransformer.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc;
/**
* Used by {@link org.apache.tapestry.ioc.IntegrationTest}.
- *
- *
*/
public interface StringTransformer
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/YellowMarker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/YellowMarker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/YellowMarker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/YellowMarker.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.ioc;
+import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
@Target(
-{ PARAMETER, FIELD })
+ {PARAMETER, FIELD})
@Retention(RUNTIME)
@Documented
public @interface YellowMarker
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ArrayDecoratorMethodModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ArrayDecoratorMethodModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ArrayDecoratorMethodModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ArrayDecoratorMethodModule.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
- *
- *
*/
public class ArrayDecoratorMethodModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ContributionDefImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,22 +14,16 @@
package org.apache.tapestry.ioc.internal;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
-
-import java.lang.reflect.Method;
-
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.ModuleBuilderSource;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.OrderedConfiguration;
+import org.apache.tapestry.ioc.*;
import org.apache.tapestry.ioc.annotations.InjectService;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.test.IOCTestCase;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.isA;
import org.testng.annotations.Test;
+import java.lang.reflect.Method;
+
public class ContributionDefImplTest extends IOCTestCase implements ModuleBuilderSource
{
private Object _toContribute;
@@ -171,22 +165,22 @@
}
public void contributeUnorderedParameter(Configuration<UpcaseService> configuration,
- @InjectService("zip.Zap")
- UpcaseService service)
+ @InjectService("zip.Zap")
+ UpcaseService service)
{
configuration.add(service);
}
public void contributeOrderedParameter(OrderedConfiguration<UpcaseService> configuration,
- @InjectService("zip.Zap")
- UpcaseService service)
+ @InjectService("zip.Zap")
+ UpcaseService service)
{
configuration.add("fred", service);
}
public void contributeMappedParameter(MappedConfiguration<String, UpcaseService> configuration,
- @InjectService("zip.Zap")
- UpcaseService service)
+ @InjectService("zip.Zap")
+ UpcaseService service)
{
configuration.add("upcase", service);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,35 +14,27 @@
package org.apache.tapestry.ioc.internal;
-import static org.apache.tapestry.ioc.internal.IOCMessages.buildMethodConflict;
-import static org.easymock.EasyMock.and;
-import static org.easymock.EasyMock.contains;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-import org.apache.tapestry.ioc.AutobuildModule;
-import org.apache.tapestry.ioc.BlueMarker;
-import org.apache.tapestry.ioc.IOCConstants;
-import org.apache.tapestry.ioc.MarkerModule;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.RedMarker;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.StringHolder;
+import org.apache.tapestry.ioc.*;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.def.DecoratorDef;
import org.apache.tapestry.ioc.def.ModuleDef;
import org.apache.tapestry.ioc.def.ServiceDef;
+import static org.apache.tapestry.ioc.internal.IOCMessages.buildMethodConflict;
import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.test.IOCTestCase;
+import static org.easymock.EasyMock.and;
+import static org.easymock.EasyMock.contains;
import org.slf4j.Logger;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import java.lang.reflect.Method;
+import java.util.Set;
+
public class DefaultModuleDefImplTest extends IOCTestCase
{
private ClassFactory _classFactory;
@@ -127,7 +119,9 @@
verify();
}
- /** Two different methods both claim to build the same service. */
+ /**
+ * Two different methods both claim to build the same service.
+ */
@Test
public void service_id_conflict() throws Exception
{
@@ -146,7 +140,7 @@
// BigDecimal is arbitrary, any class would do.
ModuleDef md = new DefaultModuleDefImpl(ServiceIdConflictMethodModule.class, logger,
- _classFactory);
+ _classFactory);
Set<String> ids = md.getServiceIds();
@@ -284,7 +278,7 @@
}
private void attemptConfigurationMethod(Class moduleClass, String expectedServiceId,
- String expectedMethodSignature)
+ String expectedMethodSignature)
{
Logger logger = mockLogger();
@@ -394,7 +388,7 @@
try
{
new DefaultModuleDefImpl(UninstantiableAutobuildServiceModule.class, logger,
- _classFactory);
+ _classFactory);
unreachable();
}
catch (RuntimeException ex)
@@ -419,7 +413,7 @@
replay();
ModuleDef md = new DefaultModuleDefImpl(NonStaticBindMethodModule.class, logger,
- _classFactory);
+ _classFactory);
// Prove that the bind method was not invoke
@@ -439,7 +433,8 @@
// The point is, we're choosing the constructor with the largest number of parameters.
logger
- .debug(contains("Invoking constructor org.apache.tapestry.ioc.internal.MultipleConstructorsAutobuildService(StringHolder)"));
+ .debug(contains(
+ "Invoking constructor org.apache.tapestry.ioc.internal.MultipleConstructorsAutobuildService(StringHolder)"));
train_getServiceId(resources, "StringHolder");
train_getLogger(resources, logger);
@@ -453,7 +448,7 @@
replay();
ModuleDef def = new DefaultModuleDefImpl(MutlipleAutobuildServiceConstructorsModule.class,
- logger, _classFactory);
+ logger, _classFactory);
ServiceDef sd = def.getServiceDef("StringHolder");
@@ -486,8 +481,8 @@
assertTrue(ex
.getMessage()
.matches(
- "Error invoking service binder method org.apache.tapestry.ioc.internal.ExceptionInBindMethod.bind\\(ServiceBinder\\) "
- + "\\(at ExceptionInBindMethod.java:\\d+\\): Really, how often is this going to happen\\?"));
+ "Error invoking service binder method org.apache.tapestry.ioc.internal.ExceptionInBindMethod.bind\\(ServiceBinder\\) "
+ + "\\(at ExceptionInBindMethod.java:\\d+\\): Really, how often is this going to happen\\?"));
}
verify();
@@ -501,7 +496,7 @@
replay();
ModuleDef md = new DefaultModuleDefImpl(EagerLoadViaAnnotationModule.class, logger,
- _classFactory);
+ _classFactory);
ServiceDef sd = md.getServiceDef("Runnable");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FieService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FieService.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FieService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FieService.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* A placeholder for a real service interface.
- *
- *
*/
public interface FieService
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FoeService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FoeService.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FoeService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/FoeService.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* A placeholder for a real service interface.
- *
- *
*/
public interface FoeService
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/GlobPatternMatcherTest.java Mon Nov 12 14:22:31 2007
@@ -1,26 +1,25 @@
-// 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 static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertTrue;
-
-import org.testng.annotations.Test;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+import org.testng.annotations.Test;
/**
- *
+ *
*/
public class GlobPatternMatcherTest
{
@@ -33,7 +32,7 @@
public void glob_match_exact()
{
assertTrue(globMatch("fred", "fred"));
- assertTrue(globMatch("fred", "FRED"));
+ assertTrue(globMatch("fred", "FRED"));
assertFalse(globMatch("xfred", "fred"));
assertFalse(globMatch("fredx", "fred"));
assertFalse(globMatch("fred", "xfred"));
@@ -51,7 +50,7 @@
public void glob_match_prefix()
{
assertTrue(globMatch("fred.Barney", "*Barney"));
- assertTrue(globMatch("fred.Barney", "*BARNEY"));
+ assertTrue(globMatch("fred.Barney", "*BARNEY"));
assertFalse(globMatch("fred.Barneyx", "*Barney"));
assertFalse(globMatch("fred.Barney", "*Barneyx"));
assertFalse(globMatch("fred.Barney", "*xBarney"));
@@ -61,7 +60,7 @@
public void glob_match_suffix()
{
assertTrue(globMatch("fred.Barney", "fred*"));
- assertTrue(globMatch("fred.Barney", "FRED*"));
+ assertTrue(globMatch("fred.Barney", "FRED*"));
assertFalse(globMatch("xfred.Barney", "fred*"));
assertFalse(globMatch("fred.Barney", "fredx*"));
assertFalse(globMatch("fred.Barney", "xfred*"));
@@ -71,10 +70,10 @@
public void glob_match_infix()
{
assertTrue(globMatch("fred.Barney", "*d.B*"));
- assertTrue(globMatch("fred.Barney", "*D.B*"));
+ assertTrue(globMatch("fred.Barney", "*D.B*"));
assertTrue(globMatch("fred.Barney", "*Barney*"));
assertTrue(globMatch("fred.Barney", "*fred*"));
- assertTrue(globMatch("fred.Barney", "*FRED*"));
+ assertTrue(globMatch("fred.Barney", "*FRED*"));
assertFalse(globMatch("fred.Barney", "*flint*"));
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/InterceptorStackBuilderTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,13 @@
package org.apache.tapestry.ioc.internal;
-import static java.util.Arrays.asList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.util.List;
-
import org.apache.tapestry.ioc.ObjectCreator;
import org.apache.tapestry.ioc.ServiceDecorator;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.testng.annotations.Test;
+
+import static java.util.Arrays.asList;
+import java.util.List;
public class InterceptorStackBuilderTest extends IOCInternalTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ModuleImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,6 @@
package org.apache.tapestry.ioc.internal;
-import static org.easymock.EasyMock.contains;
-import static org.easymock.EasyMock.isA;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
-
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.RegistryBuilder;
import org.apache.tapestry.ioc.def.DecoratorDef;
@@ -30,9 +23,15 @@
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.RegistryShutdownListener;
import org.apache.tapestry.ioc.services.Status;
+import static org.easymock.EasyMock.contains;
+import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Set;
+
public class ModuleImplTest extends IOCInternalTestCase
{
@Test
@@ -44,7 +43,7 @@
ServiceActivityTracker tracker = mockServiceActivityTracker();
ModuleDef moduleDef = new DefaultModuleDefImpl(ModuleImplTestModule.class, logger,
- getClassFactory());
+ getClassFactory());
Module module = new ModuleImpl(registry, tracker, moduleDef, null, logger);
@@ -81,7 +80,7 @@
}
protected final void train_newClass(InternalRegistry registry, ClassFactory factory,
- Class serviceInterface)
+ Class serviceInterface)
{
expect(registry.newClass(serviceInterface)).andReturn(factory.newClass(serviceInterface));
}
@@ -202,7 +201,9 @@
return builder.build();
}
- /** The following tests work better as integration tests. */
+ /**
+ * The following tests work better as integration tests.
+ */
@Test
public void integration_tests()
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/MultipleConstructorsAutobuildService.java Mon Nov 12 14:22:31 2007
@@ -26,7 +26,7 @@
this(null);
}
- public MultipleConstructorsAutobuildService(@InjectService("ToUpperCaseStringHolder") StringHolder delegate)
+ public MultipleConstructorsAutobuildService(@InjectService("ToUpperCaseStringHolder")StringHolder delegate)
{
_delegate = delegate;
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoDelegateDecoratorMethodModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoDelegateDecoratorMethodModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoDelegateDecoratorMethodModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NoDelegateDecoratorMethodModule.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
- *
- *
*/
public class NoDelegateDecoratorMethodModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NonStaticBindMethodModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NonStaticBindMethodModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NonStaticBindMethodModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/NonStaticBindMethodModule.java Mon Nov 12 14:22:31 2007
@@ -20,7 +20,8 @@
public class NonStaticBindMethodModule
{
- public void bind(ServiceBinder binder) {
+ public void bind(ServiceBinder binder)
+ {
binder.bind(StringHolder.class, StringHolderImpl.class);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/PrimitiveDecoratorMethodModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/PrimitiveDecoratorMethodModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/PrimitiveDecoratorMethodModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/PrimitiveDecoratorMethodModule.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
- *
- *
*/
public class PrimitiveDecoratorMethodModule
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ReadManifest.java Mon Nov 12 14:22:31 2007
@@ -1,30 +1,30 @@
-// 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 static java.lang.String.format;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+
+import java.io.InputStream;
+import static java.lang.String.format;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
public class ReadManifest
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodFixture.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,6 @@
package org.apache.tapestry.ioc.internal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.tapestry.ioc.ServiceResources;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.InjectService;
@@ -25,6 +21,10 @@
import org.slf4j.Logger;
import org.testng.Assert;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
/**
* Used by {@link org.apache.tapestry.ioc.internal.ServiceBuilderMethodInvokerTest}.
*/
@@ -99,7 +99,7 @@
}
public FieService build_args(String serviceId, ServiceResources resources,
- Class serviceInterface, Logger log)
+ Class serviceInterface, Logger log)
{
assertEquals(serviceId, _expectedServiceId);
assertSame(resources, _expectedServiceResources);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceBuilderMethodInvokerTest.java Mon Nov 12 14:22:31 2007
@@ -14,22 +14,21 @@
package org.apache.tapestry.ioc.internal;
+import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry.ioc.ObjectCreator;
+import org.apache.tapestry.ioc.ServiceBuilderResources;
import static org.apache.tapestry.ioc.internal.AbstractServiceCreator.findParameterizedTypeFromGenericType;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
+import org.slf4j.Logger;
+import org.testng.Assert;
+import org.testng.annotations.Test;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.List;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.slf4j.Logger;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
public class ServiceBuilderMethodInvokerTest extends IOCInternalTestCase
{
private static final String SERVICE_ID = "Fie";
@@ -54,7 +53,7 @@
replay();
ObjectCreator sc = new ServiceBuilderMethodInvoker(resources, CREATOR_DESCRIPTION,
- findMethod(fixture, "build_noargs"));
+ findMethod(fixture, "build_noargs"));
Object actual = sc.createObject();
@@ -165,7 +164,7 @@
replay();
ObjectCreator sc = new ServiceBuilderMethodInvoker(resources, CREATOR_DESCRIPTION,
- findMethod(fixture, "build_injected"));
+ findMethod(fixture, "build_injected"));
Object actual = sc.createObject();
@@ -197,7 +196,7 @@
replay();
ObjectCreator sc = new ServiceBuilderMethodInvoker(resources, CREATOR_DESCRIPTION,
- findMethod(fixture, "buildWithOrderedConfiguration"));
+ findMethod(fixture, "buildWithOrderedConfiguration"));
Object actual = sc.createObject();
@@ -230,7 +229,7 @@
replay();
ObjectCreator sc = new ServiceBuilderMethodInvoker(resources, CREATOR_DESCRIPTION,
- findMethod(fixture, "buildWithUnorderedConfiguration"));
+ findMethod(fixture, "buildWithUnorderedConfiguration"));
Object actual = sc.createObject();
@@ -347,7 +346,7 @@
}
protected final void train_getModuleBuilder(ServiceBuilderResources resources,
- Object moduleBuilder)
+ Object moduleBuilder)
{
expect(resources.getModuleBuilder()).andReturn(moduleBuilder);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorFixture.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorFixture.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorFixture.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorFixture.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,23 @@
-// 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.testng.Assert;
+import org.testng.Assert;
/**
* Used by {@link org.apache.tapestry.ioc.internal.ServiceDecoratorImplTest}.
- *
- *
*/
public class ServiceDecoratorFixture extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ServiceDecoratorImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry.ioc.internal;
-import java.lang.reflect.Method;
-
import org.apache.tapestry.ioc.ModuleBuilderSource;
import org.apache.tapestry.ioc.ServiceResources;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+import java.lang.reflect.Method;
+
public class ServiceDecoratorImplTest extends IOCInternalTestCase
{
private static final String SERVICE_ID = "ioc.Fie";
@@ -39,7 +39,7 @@
/**
* Also, test logging of decorator method invocation.
- *
+ *
* @throws Exception
*/
@Test
@@ -66,7 +66,7 @@
// decorator method is the return value of the ServiceDecorator.
ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources,
- getClassFactory());
+ getClassFactory());
Object interceptor = decorator.createInterceptor(fixture._expectedDelegate);
@@ -93,7 +93,7 @@
Method m = findMethod(fixture, "decorateReturnNull");
ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources,
- getClassFactory());
+ getClassFactory());
Object interceptor = decorator.createInterceptor(delegate);
@@ -127,7 +127,7 @@
replay();
ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources,
- getClassFactory());
+ getClassFactory());
Object interceptor = decorator.createInterceptor(fixture._expectedDelegate);
@@ -155,7 +155,7 @@
Method m = findMethod(fixture, "decoratorThrowsException");
ServiceDecoratorImpl decorator = new ServiceDecoratorImpl(m, source, resources,
- getClassFactory());
+ getClassFactory());
try
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/SimpleModule.java Mon Nov 12 14:22:31 2007
@@ -53,7 +53,9 @@
return null;
}
- /** Minimal contribution method. */
+ /**
+ * Minimal contribution method.
+ */
public void contributeBarney(Configuration configuration)
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ToStringService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ToStringService.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ToStringService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ToStringService.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* Used by {@link org.apache.tapestry.ioc.internal.SingletonServiceLifecycleTest}.
- *
- *
*/
public interface ToStringService
{