Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java Fri Oct 27 08:38:47 2006 @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.ioc.services.ChainBuilderImpl; import org.apache.tapestry.internal.ioc.services.DefaultImplementationBuilderImpl; import org.apache.tapestry.internal.ioc.services.ExceptionAnalyzerImpl; @@ -45,11 +44,8 @@ /** * Defines the base set of services for the Tapestry IOC container. - * - * */ @Id("tapestry.ioc") [EMAIL PROTECTED] public final class TapestryIOCModule { private final ClassFactory _classFactory; @@ -209,7 +205,7 @@ * * @see #buildTypeCoercer(Collection, ComponentInstantiatorSource) */ - @SuppressNullCheck + public static void contributeTypeCoercer(Configuration<CoercionTuple> configuration) { add(configuration, Object.class, String.class, new Coercion<Object, String>()
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/runtime/LifecycleEvent.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/runtime/LifecycleEvent.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/runtime/LifecycleEvent.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/runtime/LifecycleEvent.java Fri Oct 27 08:38:47 2006 @@ -15,7 +15,6 @@ package org.apache.tapestry.runtime; import org.apache.commons.logging.Log; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; /** * Event object passed into a lifecycle method. Each component class forms a chain of command around @@ -71,7 +70,7 @@ * describes the method invoked, the method that returned the value * @return true if the value was non-null, and the event is now aborted */ - @SuppressNullCheck + public boolean storeResult(T result, String methodDescription) { if (result == null) Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/MethodSignature.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/MethodSignature.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/MethodSignature.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/MethodSignature.java Fri Oct 27 08:38:47 2006 @@ -18,8 +18,6 @@ import java.lang.reflect.Modifier; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; - /** * A representation of a method signature, which consists of its name, modifiers (primarily, * visibility), return type, parameter types, and declared exception types. @@ -28,10 +26,7 @@ * situations where the actual class has not been loaded yet. When classes are already loaded (such * as, for use with [EMAIL PROTECTED] org.apache.hivemind.service.ClassFab}), then a different implementation * with the same name, [EMAIL PROTECTED] org.apache.tapestry.ioc.services.MethodSignature} is used. - * - * */ [EMAIL PROTECTED] public class MethodSignature implements Comparable<MethodSignature> { private int _hashCode = -1; Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TapestryModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TapestryModule.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TapestryModule.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TapestryModule.java Fri Oct 27 08:38:47 2006 @@ -32,7 +32,6 @@ import org.apache.tapestry.annotations.CleanupRender; import org.apache.tapestry.annotations.SetupRender; import org.apache.tapestry.internal.InternalConstants; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.bindings.LiteralBindingFactory; import org.apache.tapestry.internal.services.ApplicationGlobalsImpl; import org.apache.tapestry.internal.services.BindingSourceImpl; @@ -93,7 +92,6 @@ @Id("tapestry") @SubModule( { InternalModule.class }) [EMAIL PROTECTED] public final class TapestryModule { private final ChainBuilder _chainBuilder; Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TransformUtils.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TransformUtils.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TransformUtils.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TransformUtils.java Fri Oct 27 08:38:47 2006 @@ -18,13 +18,10 @@ import java.util.Map; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.annotations.Utility; /** * Support code for generating code (used when transforming component classes). - * - * */ @Utility public final class TransformUtils @@ -33,7 +30,6 @@ private static final Map<Class, PrimitiveTypeInfo> _classToInfo = newMap(); - @SuppressNullCheck static class PrimitiveTypeInfo { private final Class _wrapperType; Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/BaseTestCase.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/BaseTestCase.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/BaseTestCase.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/BaseTestCase.java Fri Oct 27 08:38:47 2006 @@ -40,7 +40,6 @@ import org.apache.tapestry.MarkupWriter; import org.apache.tapestry.Resource; import org.apache.tapestry.annotations.Parameter; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.services.InjectionProvider; import org.apache.tapestry.ioc.Configuration; import org.apache.tapestry.ioc.LogSource; @@ -70,10 +69,8 @@ /** * Base test case that adds a number of convienience factory and training methods to * [EMAIL PROTECTED] org.apache.tapestry.test.TestBase}. - * - * */ [EMAIL PROTECTED] + public abstract class BaseTestCase extends TestBase { protected final void train_findFieldsWithAnnotation(ClassTransformation transformation, @@ -553,7 +550,8 @@ return newMock(HttpServletRequest.class); } - protected final void train_getSession(HttpServletRequest request, boolean create, HttpSession session) + protected final void train_getSession(HttpServletRequest request, boolean create, + HttpSession session) { request.getSession(create); setReturnValue(session); Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/TestBase.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/TestBase.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/TestBase.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/TestBase.java Fri Oct 27 08:38:47 2006 @@ -15,7 +15,6 @@ package org.apache.tapestry.test; import org.apache.commons.logging.Log; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.easymock.EasyMock; import org.easymock.IExpectationSetters; import org.easymock.IMocksControl; @@ -101,7 +100,6 @@ * value to be returned from the method call */ @SuppressWarnings("unchecked") - @SuppressNullCheck protected final <T> IExpectationSetters<T> setReturnValue(Object returnValue) { return getMocksControl().andReturn(returnValue); Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/Defense.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/Defense.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/Defense.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/Defense.java Fri Oct 27 08:38:47 2006 @@ -14,16 +14,12 @@ package org.apache.tapestry.util; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.annotations.Utility; /** * Static utility methods for defensive programming. - * - * */ @Utility [EMAIL PROTECTED] public final class Defense { Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/StrategyRegistry.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/StrategyRegistry.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/StrategyRegistry.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/StrategyRegistry.java Fri Oct 27 08:38:47 2006 @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.util.InheritanceSearch; import org.apache.tapestry.internal.util.InternalUtils; @@ -29,7 +28,6 @@ * 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 */ @@ -81,7 +79,7 @@ * @throws IllegalArgumentException * if no matching adapter may be found */ - @SuppressNullCheck + public A getByInstance(Object value) { return get(value == null ? void.class : value.getClass()); Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/BaseLocatableTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/BaseLocatableTest.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/BaseLocatableTest.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/BaseLocatableTest.java Fri Oct 27 08:38:47 2006 @@ -14,7 +14,6 @@ package org.apache.tapestry; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.test.BaseTestCase; import org.testng.annotations.Test; @@ -23,7 +22,7 @@ */ public class BaseLocatableTest extends BaseTestCase { - @SuppressNullCheck + static class LocatableFixture extends BaseLocatable { LocatableFixture(Location location) Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java Fri Oct 27 08:38:47 2006 @@ -18,7 +18,6 @@ import org.apache.tapestry.ComponentResources; import org.apache.tapestry.Location; import org.apache.tapestry.internal.TapestryException; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.internal.util.InternalUtils; import org.apache.tapestry.ioc.StringHolder; @@ -364,7 +363,6 @@ } @Test(dataProvider = "values") - @SuppressNullCheck public void special_prop_binding_values(String expression, Object expected) { Location l = newLocation(); Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java Fri Oct 27 08:38:47 2006 @@ -19,16 +19,11 @@ import java.util.List; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.ObjectCreator; import org.apache.tapestry.ioc.ServiceDecorator; import org.testng.annotations.Test; -/** - * - */ [EMAIL PROTECTED] public class InterceptorStackBuilderTest extends InternalBaseTestCase { private static final String SERVICE_ID = "foo.bar.Baz"; Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java Fri Oct 27 08:38:47 2006 @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.internal.test.InternalBaseTestCase; import org.apache.tapestry.ioc.services.TypeCoercer; import org.testng.annotations.AfterClass; @@ -28,10 +27,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * - */ [EMAIL PROTECTED] public class TypeCoercerImplTest extends InternalBaseTestCase { private TypeCoercer _coercer; Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java Fri Oct 27 08:38:47 2006 @@ -14,12 +14,6 @@ package org.apache.tapestry.internal.services; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; - -/** - * - */ [EMAIL PROTECTED] public class FieldAccessBean { private String _foo; Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java Fri Oct 27 08:38:47 2006 @@ -16,15 +16,11 @@ import org.apache.tapestry.annotations.ComponentClass; import org.apache.tapestry.annotations.Parameter; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; /** * Used by [EMAIL PROTECTED] org.apache.tapestry.internal.services.ParameterWorkerTest}. - * - * */ @ComponentClass [EMAIL PROTECTED] public class ParameterComponent { @Parameter Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java Fri Oct 27 08:38:47 2006 @@ -14,12 +14,6 @@ package org.apache.tapestry.internal.services; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; - -/** - * - */ [EMAIL PROTECTED] public class ReadOnlyBean { private String _value; Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/ioc/BarneyModule.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/ioc/BarneyModule.java?view=diff&rev=468421&r1=468420&r2=468421 ============================================================================== --- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/ioc/BarneyModule.java (original) +++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/ioc/BarneyModule.java Fri Oct 27 08:38:47 2006 @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; -import org.apache.tapestry.internal.annotations.SuppressNullCheck; import org.apache.tapestry.ioc.annotations.Contribute; import org.apache.tapestry.ioc.annotations.Id; import org.apache.tapestry.ioc.annotations.Match; @@ -29,10 +28,8 @@ /** * Module used to demonstrate decorator ordering. - * - * */ [EMAIL PROTECTED] + @Id("barney") public class BarneyModule {
