You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2006/10/27 17:38:51 UTC
svn commit: r468421 [1/2] - in
/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src:
main/aspect/org/apache/tapestry/internal/aspects/
main/java/org/apache/tapestry/ main/java/org/apache/tapestry/dom/
main/java/org/apache/tapest...
Author: hlship
Date: Fri Oct 27 08:38:47 2006
New Revision: 468421
URL: http://svn.apache.org/viewvc?view=rev&rev=468421
Log:
Remove automatic null checking of parameters, and the @SuppressNullCheck annnotation.
Removed:
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/aspect/org/apache/tapestry/internal/aspects/CatchNullParameters.aj
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/aspect/org/apache/tapestry/internal/aspects/InternalCatchNullParameters.aj
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/annotations/SuppressNullCheck.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/aspects/CatchNullParametersAspectTest.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/aspects/InternalUtilityAspectTest.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/aspects/NullTarget.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/aspects/PartiallySuppressedNullTarget.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/aspects/SuppressedNullTarget.java
Modified:
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/BaseLocatable.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Element.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Node.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/TapestryException.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/BasePropBinding.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/DecoratorDefImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ModuleImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/RegistryImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingMappedConfigurationWrapper.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapper.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/AbstractFab.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFabImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassPropertyAdapterImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ExceptionInfoImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAccessImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAdapterImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ServiceLogger.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/Orderer.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/Orderable.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/runtime/LifecycleEvent.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/MethodSignature.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/services/TransformUtils.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/BaseTestCase.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/test/TestBase.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/Defense.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/util/StrategyRegistry.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/BaseLocatableTest.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/InterceptorStackBuilderTest.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImplTest.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/FieldAccessBean.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ParameterComponent.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/internal/services/ReadOnlyBean.java
tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/test/java/org/apache/tapestry/ioc/BarneyModule.java
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/BaseLocatable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/BaseLocatable.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/BaseLocatable.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/BaseLocatable.java Fri Oct 27 08:38:47 2006
@@ -14,14 +14,9 @@
package org.apache.tapestry;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
-
/**
* Base implementation of {@link org.apache.tapestry.Locatable}.
- *
- *
*/
-@SuppressNullCheck
public class BaseLocatable implements Locatable
{
private final Location _location;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Element.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Element.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Element.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Element.java Fri Oct 27 08:38:47 2006
@@ -23,14 +23,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
-
/**
* An element that will render with a begin tag and attributes, a body, and an end tag. Also acts as
* a factory for enclosed Element, Text and Comment nodes. TODO: Support for CDATA nodes. Do we need
* Entity nodes?
- *
- *
*/
public final class Element extends Node
{
@@ -73,7 +69,6 @@
* the value for the attribute. A value of null is allowed, and no attribute will be
* added to the element.
*/
- @SuppressNullCheck
public void addAttribute(String name, String value)
{
notBlank(name, "name");
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Node.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Node.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Node.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/dom/Node.java Fri Oct 27 08:38:47 2006
@@ -20,12 +20,8 @@
import java.io.StringWriter;
import java.util.List;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
-
/**
* A node within the DOM.
- *
- *
*/
public abstract class Node
{
@@ -39,7 +35,6 @@
*
* @param container
*/
- @SuppressNullCheck
protected Node(Node container)
{
_container = container;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/TapestryException.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/TapestryException.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/TapestryException.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/TapestryException.java Fri Oct 27 08:38:47 2006
@@ -16,16 +16,12 @@
import org.apache.tapestry.Locatable;
import org.apache.tapestry.Location;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
/**
* Exception class used as a replacement for {@link java.lang.RuntimeException} when the exception
* is related to a particular location.
- *
- *
*/
-@SuppressNullCheck
public class TapestryException extends RuntimeException implements Locatable
{
private static final long serialVersionUID = 6396903640977182682L;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java Fri Oct 27 08:38:47 2006
@@ -18,14 +18,10 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.Location;
import org.apache.tapestry.internal.TapestryException;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
/**
* Abstract base class for bindings.
- *
- *
*/
-@SuppressNullCheck
public abstract class AbstractBinding extends BaseLocatable implements Binding
{
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/BasePropBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/BasePropBinding.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/BasePropBinding.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/BasePropBinding.java Fri Oct 27 08:38:47 2006
@@ -16,16 +16,12 @@
import org.apache.tapestry.Location;
import org.apache.tapestry.internal.TapestryException;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
/**
* Base class for bindings created by the
* {@link org.apache.tapestry.internal.bindings.PropBindingFactory}. A subclass of this is created
* at runtime.
- *
- *
*/
-@SuppressNullCheck
public abstract class BasePropBinding extends AbstractBinding
{
private final String _toString;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBinding.java Fri Oct 27 08:38:47 2006
@@ -15,14 +15,10 @@
package org.apache.tapestry.internal.bindings;
import org.apache.tapestry.Location;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
/**
* Binding type for literal string values, usually supplied in-line in the component template.
- *
- *
*/
-@SuppressNullCheck
public class LiteralBinding extends AbstractBinding
{
private final String _description;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/LiteralBindingFactory.java Fri Oct 27 08:38:47 2006
@@ -17,16 +17,13 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Location;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.services.BindingFactory;
/**
* Binding factory that treats the expression as a literal string. The simplest form of binding.
*
- *
* @see org.apache.tapestry.internal.bindings.LiteralBinding
*/
-@SuppressNullCheck
public class LiteralBindingFactory implements BindingFactory
{
public Binding newBinding(String description, ComponentResources component, String expression,
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/bindings/PropBindingFactory.java Fri Oct 27 08:38:47 2006
@@ -26,7 +26,6 @@
import org.apache.tapestry.Location;
import org.apache.tapestry.events.InvalidationListener;
import org.apache.tapestry.internal.TapestryException;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.ClassFabUtils;
import org.apache.tapestry.ioc.services.ClassFactory;
@@ -40,10 +39,7 @@
* Binding factory for reading and updating JavaBean properties. Uses
* {@link org.apache.tapestry.ioc.services.PropertyAccess} to analyze the properties, and generates
* a binding class using the component {@link org.apache.tapestry.ioc.services.ClassFactory}.
- *
- *
*/
-@SuppressNullCheck
public class PropBindingFactory implements BindingFactory, InvalidationListener
{
private final PropertyAccess _access;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/DecoratorDefImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/DecoratorDefImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/DecoratorDefImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/DecoratorDefImpl.java Fri Oct 27 08:38:47 2006
@@ -20,7 +20,6 @@
import java.lang.reflect.Method;
import java.util.List;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.IdMatcher;
import org.apache.tapestry.ioc.ModuleBuilderSource;
@@ -44,7 +43,6 @@
private final String[] _constraints;
- @SuppressNullCheck
public DecoratorDefImpl(String decoratorId, Method decoratorMethod, String[] patterns,
String[] constraints)
{
@@ -80,7 +78,8 @@
return _decoratorId;
}
- public ServiceDecorator createDecorator(ModuleBuilderSource moduleBuilderSource, ServiceResources resources)
+ public ServiceDecorator createDecorator(ModuleBuilderSource moduleBuilderSource,
+ ServiceResources resources)
{
return new ServiceDecoratorImpl(_decoratorMethod, moduleBuilderSource, resources);
}
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ModuleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ModuleImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ModuleImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ModuleImpl.java Fri Oct 27 08:38:47 2006
@@ -30,7 +30,6 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.ObjectCreator;
import org.apache.tapestry.ioc.ServiceBuilderResources;
@@ -78,7 +77,6 @@
/** Keyed on fully qualified service id; values are instantiated services (proxies). */
private final Map<String, Object> _services = newMap();
- @SuppressNullCheck
public <T> T getService(String serviceId, Class<T> serviceInterface, Module module)
{
notBlank(serviceId, "serviceId");
@@ -135,7 +133,6 @@
return _registry.findDecoratorsForService(sd);
}
- @SuppressNullCheck
public Collection<String> findServiceIdsForInterface(Class serviceInterface, Module module)
{
notNull(serviceInterface, "serviceInterface");
@@ -393,10 +390,8 @@
// Check to see if the registry has shutdown. The registryShutdown() method
// throws IllegalStateException.
- builder.addln(
- "if (_shutdown) %s.registryShutdown(\"%s\");",
- IOCProxyUtilities.class.getName(),
- serviceId);
+ builder.addln("if (_shutdown) %s.registryShutdown(\"%s\");", IOCProxyUtilities.class
+ .getName(), serviceId);
// We can release the creator after invoking it, we only create the service once.
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/RegistryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/RegistryImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/RegistryImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/RegistryImpl.java Fri Oct 27 08:38:47 2006
@@ -26,7 +26,6 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.annotations.OneShot;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.ioc.services.ClassFactoryImpl;
import org.apache.tapestry.internal.ioc.services.RegistryShutdownHubImpl;
import org.apache.tapestry.internal.ioc.services.ThreadCleanupHubImpl;
@@ -90,7 +89,6 @@
private final ClassFactory _classFactory;
- @SuppressNullCheck
public static final class OrderedConfigurationToOrdererAdaptor<T> implements
OrderedConfiguration<T>
{
@@ -165,7 +163,6 @@
}
/** Internal access, usualy from another module. */
- @SuppressNullCheck
public <T> T getService(String serviceId, Class<T> serviceInterface, Module module)
{
T result = checkForBuiltinService(serviceId, serviceInterface);
@@ -266,7 +263,6 @@
MappedConfiguration<K, V> configuration = new MappedConfiguration<K, V>()
{
- @SuppressNullCheck
public void add(K key, V value)
{
result.put(key, value);
@@ -383,7 +379,6 @@
}
// Seems like something that could be cached.
- @SuppressNullCheck
public <T> T getService(Class<T> serviceInterface, Module module)
{
List<String> ids = CollectionFactory.newList();
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingConfigurationWrapper.java Fri Oct 27 08:38:47 2006
@@ -15,14 +15,11 @@
package org.apache.tapestry.internal.ioc;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.Configuration;
import org.apache.tapestry.ioc.def.ContributionDef;
/**
* Performs some validation before delegating to another Configuration.
- *
- *
*/
public class ValidatingConfigurationWrapper<T> implements Configuration<T>
{
@@ -48,7 +45,6 @@
_delegate = delegate;
}
- @SuppressNullCheck
public void add(T object)
{
if (object == null)
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingMappedConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingMappedConfigurationWrapper.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingMappedConfigurationWrapper.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingMappedConfigurationWrapper.java Fri Oct 27 08:38:47 2006
@@ -17,7 +17,6 @@
import java.util.Map;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.def.ContributionDef;
@@ -31,11 +30,9 @@
* <p>
* When a warning is logged, the key/value pair is not added to the delegate.
*
- *
* @param <K>
* @param <V>
*/
-@SuppressNullCheck
public class ValidatingMappedConfigurationWrapper<K, V> implements MappedConfiguration<K, V>
{
private final String _serviceId;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapper.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapper.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/ValidatingOrderedConfigurationWrapper.java Fri Oct 27 08:38:47 2006
@@ -17,7 +17,6 @@
import static org.apache.tapestry.ioc.IOCUtilities.toQualifiedId;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.OrderedConfiguration;
import org.apache.tapestry.ioc.def.ContributionDef;
@@ -28,7 +27,6 @@
* ensures that incorrect values contributed in don't screw up the
* {@link org.apache.tapestry.internal.util.Orderer} (and generate a bunch of error messages there).
*
- *
* @param <T>
*/
public class ValidatingOrderedConfigurationWrapper<T> implements OrderedConfiguration<T>
@@ -58,7 +56,6 @@
_delegate = delegate;
}
- @SuppressNullCheck
public void add(String id, T object, String... constraints)
{
_delegate.add(toQualifiedId(_moduleId, id), validVersionOf(object), constraints);
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/AbstractFab.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/AbstractFab.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/AbstractFab.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/AbstractFab.java Fri Oct 27 08:38:47 2006
@@ -22,14 +22,11 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.annotations.OneShot;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
/**
* Base class for {@link org.apache.tapestry.internal.ioc.services.ClassFabImpl}. This code is a
* fork from HiveMind; it is kept seperate from ClassFabImpl in case we want to re-introduce the
* idea of an InterfaceFab.
- *
- *
*/
@OneShot
public class AbstractFab
@@ -70,7 +67,6 @@
_ctClass.addInterface(ctInterfaceClass);
}
- @SuppressNullCheck
protected CtClass[] convertClasses(Class[] inputClasses)
{
if (inputClasses == null || inputClasses.length == 0)
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFabImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFabImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFabImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFabImpl.java Fri Oct 27 08:38:47 2006
@@ -31,7 +31,6 @@
import javassist.NotFoundException;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.ClassFabUtils;
@@ -250,7 +249,6 @@
addMethod(Modifier.PUBLIC, signature, "return " + value + ";");
}
- @SuppressNullCheck
public void addConstructor(Class[] parameterTypes, Class[] exceptions, String body)
{
Defense.notBlank(body, "body");
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassFactoryClassPool.java Fri Oct 27 08:38:47 2006
@@ -24,8 +24,6 @@
import javassist.CtClass;
import javassist.LoaderClassPath;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
-
/**
* Used to ensure that {@link javassist.ClassPool#appendClassPath(javassist.ClassPath)} is invoked
* with a synchronized lock, and also handles tricky class loading issues (caused by the creation of
@@ -64,7 +62,6 @@
* the class loader to add (derived from a loaded class, and may be null for some
* system classes)
*/
- @SuppressNullCheck
public synchronized void addClassLoaderIfNeeded(ClassLoader loader)
{
if (loader == null || loader == _loader || _loaders.contains(loader))
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassPropertyAdapterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassPropertyAdapterImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassPropertyAdapterImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ClassPropertyAdapterImpl.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.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry.ioc.services.PropertyAdapter;
@@ -64,13 +63,11 @@
return _adapters.get(name);
}
- @SuppressNullCheck
public Object get(Object instance, String propertyName)
{
return adaptorFor(propertyName).get(instance);
}
- @SuppressNullCheck
public void set(Object instance, String propertyName, Object value)
{
adaptorFor(propertyName).set(instance, value);
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ExceptionInfoImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ExceptionInfoImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ExceptionInfoImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ExceptionInfoImpl.java Fri Oct 27 08:38:47 2006
@@ -19,14 +19,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ExceptionInfo;
-/**
- *
- */
-@SuppressNullCheck
public class ExceptionInfoImpl implements ExceptionInfo
{
private final String _className;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAccessImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAccessImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAccessImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAccessImpl.java Fri Oct 27 08:38:47 2006
@@ -20,7 +20,6 @@
import java.beans.Introspector;
import java.util.Map;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry.ioc.services.PropertyAccess;
@@ -28,13 +27,11 @@
{
private final Map<Class, ClassPropertyAdapter> _adapters = newThreadSafeMap();
- @SuppressNullCheck
public Object get(Object instance, String propertyName)
{
return getAdapter(instance).get(instance, propertyName);
}
- @SuppressNullCheck
public void set(Object instance, String propertyName, Object value)
{
getAdapter(instance).set(instance, propertyName, value);
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAdapterImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAdapterImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAdapterImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/PropertyAdapterImpl.java Fri Oct 27 08:38:47 2006
@@ -18,11 +18,9 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.services.PropertyAdapter;
import org.apache.tapestry.util.Defense;
-@SuppressNullCheck
public class PropertyAdapterImpl implements PropertyAdapter
{
private final String _name;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ServiceLogger.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ServiceLogger.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ServiceLogger.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/ServiceLogger.java Fri Oct 27 08:38:47 2006
@@ -19,15 +19,12 @@
import java.util.Iterator;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.services.ExceptionTracker;
import org.apache.tapestry.util.Defense;
/**
* Used by {@link org.apache.tapestry.internal.ioc.services.LoggingDecoratorImpl} to delegate out
* logging behavior to a seperate object (helps ensure no naming conflicts).
- *
- *
*/
public final class ServiceLogger
{
@@ -148,7 +145,6 @@
* @param result
* the return value for the method invocation
*/
- @SuppressNullCheck
public void exit(String name, Object result)
{
Defense.notNull(name, "name");
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/ioc/services/TypeCoercerImpl.java Fri Oct 27 08:38:47 2006
@@ -26,7 +26,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.services.CompoundCoercion;
import org.apache.tapestry.internal.util.InheritanceSearch;
import org.apache.tapestry.internal.util.InternalUtils;
@@ -114,7 +113,6 @@
}
@SuppressWarnings("unchecked")
- @SuppressNullCheck
public Object coerce(Object input, Class targetType)
{
Defense.notNull(targetType, "targetType");
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/model/MutableComponentModelImpl.java Fri Oct 27 08:38:47 2006
@@ -23,7 +23,6 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.Resource;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.model.EmbeddedComponentModel;
@@ -57,7 +56,6 @@
private List<String> _mixinClassNames;
- @SuppressNullCheck
public MutableComponentModelImpl(String componentClassName, Log log, Resource baseResource,
ComponentModel parentModel)
{
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java Fri Oct 27 08:38:47 2006
@@ -15,14 +15,10 @@
package org.apache.tapestry.internal.parser;
import org.apache.tapestry.Location;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
/**
* Ends a previously started element (including components, parameters, etc.).
- *
- *
*/
-@SuppressNullCheck
public class EndElementToken extends TemplateToken
{
public EndElementToken(Location location)
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/parser/StartComponentToken.java Fri Oct 27 08:38:47 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.internal.parser;
import org.apache.tapestry.Location;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
/**
* The start element of a component within the template. Will be followed by a series of
@@ -23,7 +22,6 @@
* and type), and eventually will be balanced by an
* {@link org.apache.tapestry.internal.parser.EndElementToken}.
*/
-@SuppressNullCheck
public class StartComponentToken extends TemplateToken
{
private final String _id;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/BindingSourceImpl.java Fri Oct 27 08:38:47 2006
@@ -20,15 +20,10 @@
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.services.BindingFactory;
import org.apache.tapestry.services.BindingSource;
import org.apache.tapestry.util.Defense;
-/**
- *
- */
-@SuppressNullCheck
public class BindingSourceImpl implements BindingSource
{
private final Map<String, BindingFactory> _factories;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ComponentEventImpl.java Fri Oct 27 08:38:47 2006
@@ -16,14 +16,9 @@
import org.apache.tapestry.ComponentEventHandler;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.runtime.ComponentEvent;
-/**
- *
- */
-@SuppressNullCheck
public class ComponentEventImpl implements ComponentEvent
{
private final String _eventType;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java Fri Oct 27 08:38:47 2006
@@ -18,12 +18,8 @@
import javassist.CtClass;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
-
/**
* Stores transformation type data about one argument to a class constructor.
- *
- *
*/
public class ConstructorArg
{
@@ -39,7 +35,6 @@
* @param value
* value to be injected via the constructor (may be null)
*/
- @SuppressNullCheck
ConstructorArg(CtClass type, Object value)
{
_type = notNull(type, "type");
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java Fri Oct 27 08:38:47 2006
@@ -46,7 +46,6 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.model.ComponentModel;
import org.apache.tapestry.runtime.ComponentLifecycle;
@@ -122,7 +121,6 @@
* This is a constructor for the root class, the class that directly contains the ComponentClass
* annotation.
*/
- @SuppressNullCheck
public InternalClassTransformationImpl(CtClass ctClass, ClassLoader loader, Log log,
ComponentModel componentModel)
{
@@ -156,7 +154,6 @@
addMethod(sig, "return " + _resourcesFieldName + ";");
}
- @SuppressNullCheck
public InternalClassTransformationImpl(CtClass ctClass,
InternalClassTransformation parentTransformation, ClassLoader loader, Log log,
ComponentModel componentModel)
@@ -952,7 +949,6 @@
return fieldName;
}
- @SuppressNullCheck
public String addInjectedField(Class type, String suggestedName, Object value)
{
notNull(type, "type");
@@ -1036,7 +1032,6 @@
_constructor.append(format(" %s = $%d;\n", fieldName, _constructorArgs.size()));
}
- @SuppressNullCheck
public void injectField(String fieldName, Object value)
{
notNull(fieldName, "fieldName");
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalModule.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalModule.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/InternalModule.java Fri Oct 27 08:38:47 2006
@@ -27,7 +27,6 @@
import org.apache.tapestry.Location;
import org.apache.tapestry.events.InvalidationListener;
import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.bindings.LiteralBinding;
import org.apache.tapestry.internal.bindings.PropBindingFactory;
import org.apache.tapestry.ioc.LogSource;
@@ -65,7 +64,6 @@
*
*/
@Id("tapestry.internal")
-@SuppressNullCheck
public final class InternalModule
{
private final ComponentInstantiatorSource _componentInstantiatorSource;
@@ -337,7 +335,6 @@
_keywords.put("null", null);
}
- @SuppressNullCheck
public Binding newBinding(String description, ComponentResources component,
String expression, Location location)
{
@@ -352,7 +349,7 @@
BindingFactory thisFactory = new BindingFactory()
{
- @SuppressNullCheck
+
public Binding newBinding(String description, ComponentResources component,
String expression, Location location)
{
@@ -367,7 +364,6 @@
{
private final Pattern _pattern = Pattern.compile("^\\s*(-?\\d+)\\s*$");
- @SuppressNullCheck
public Binding newBinding(String description, ComponentResources component,
String expression, Location location)
{
@@ -389,7 +385,6 @@
private final Pattern _pattern = Pattern
.compile("^\\s*(-?\\d+)\\s*\\.\\.\\s*(-?\\d+)\\s*$");
- @SuppressNullCheck
public Binding newBinding(String description, ComponentResources component,
String expression, Location location)
{
@@ -415,7 +410,6 @@
private final Pattern _pattern = Pattern
.compile("^\\s*(\\-?((\\d+\\.)|(\\d*\\.\\d+)))\\s*$");
- @SuppressNullCheck
public Binding newBinding(String description, ComponentResources component,
String expression, Location location)
{
@@ -438,7 +432,6 @@
private final Pattern _pattern = Pattern.compile("^\\s*'(.*)'\\s*$");
- @SuppressNullCheck
public Binding newBinding(String description, ComponentResources component,
String expression, Location location)
{
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java Fri Oct 27 08:38:47 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.internal.services;
import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.services.ComponentClassResolver;
@@ -23,10 +22,6 @@
import org.apache.tapestry.services.WebResponse;
import org.apache.tapestry.util.Defense;
-/**
- *
- */
-@SuppressNullCheck
public class LinkFactoryImpl implements LinkFactory
{
private final WebRequest _request;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageElementFactoryImpl.java Fri Oct 27 08:38:47 2006
@@ -20,7 +20,6 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.TapestryException;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.parser.AttributeToken;
import org.apache.tapestry.internal.parser.ExpansionToken;
import org.apache.tapestry.internal.parser.StartElementToken;
@@ -44,7 +43,7 @@
* Null check suppressed as much as to simplify testing (yea! I can pass a null TypeCoercer) as it
* is for efficiency.
*/
-@SuppressNullCheck
+
public class PageElementFactoryImpl implements PageElementFactory
{
private final ComponentInstantiatorSource _componentInstantiatorSource;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PageLoaderImpl.java Fri Oct 27 08:38:47 2006
@@ -26,7 +26,6 @@
import org.apache.tapestry.events.InvalidationListener;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.TapestryException;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
import org.apache.tapestry.internal.parser.AttributeToken;
import org.apache.tapestry.internal.parser.ComponentTemplate;
@@ -47,9 +46,6 @@
import org.apache.tapestry.util.CollectionFactory;
import org.apache.tapestry.util.IdAllocator;
-/**
- *
- */
public class PageLoaderImpl extends InvalidationEventHubImpl implements PageLoader,
InvalidationListener
{
@@ -67,7 +63,6 @@
private Locale _locale;
- @SuppressNullCheck
public PageLoaderImpl(ComponentTemplateSource templateSource,
PageElementFactory pageElementFactory, BindingSource bindingSource,
LinkFactory linkFactory, PersistentFieldManager persistentFieldManager)
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldBundleImpl.java Fri Oct 27 08:38:47 2006
@@ -19,11 +19,9 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.services.PersistentFieldBundle;
import org.apache.tapestry.services.PersistentFieldChange;
-@SuppressNullCheck
public class PersistentFieldBundleImpl implements PersistentFieldBundle
{
/**
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldChangeImpl.java Fri Oct 27 08:38:47 2006
@@ -14,11 +14,9 @@
package org.apache.tapestry.internal.services;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.util.Defense;
-@SuppressNullCheck
public class PersistentFieldChangeImpl implements PersistentFieldChange
{
private final String _componentId;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/PersistentFieldManagerImpl.java Fri Oct 27 08:38:47 2006
@@ -17,7 +17,6 @@
import java.util.Collection;
import java.util.Map;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.services.PersistentFieldBundle;
import org.apache.tapestry.services.PersistentFieldChange;
@@ -25,7 +24,6 @@
import org.apache.tapestry.services.PersistentFieldStrategy;
import org.apache.tapestry.util.CollectionFactory;
-@SuppressNullCheck
public class PersistentFieldManagerImpl implements PersistentFieldManager
{
private final Map<String, PersistentFieldStrategy> _strategies;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategy.java Fri Oct 27 08:38:47 2006
@@ -21,7 +21,6 @@
import java.util.Collections;
import java.util.List;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.services.PersistentFieldStrategy;
import org.apache.tapestry.services.WebRequest;
@@ -33,7 +32,7 @@
* Builds attribute names as:
* <code>state:<em>page-name</em>:<em>component-id</em>:<em>field-name</em></code>
*/
-@SuppressNullCheck
+
public class SessionPersistentFieldStrategy implements PersistentFieldStrategy
{
/**
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java Fri Oct 27 08:38:47 2006
@@ -30,7 +30,6 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.TapestryException;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.services.ComponentEventImpl;
import org.apache.tapestry.internal.services.Instantiator;
import org.apache.tapestry.internal.util.InternalUtils;
@@ -129,7 +128,7 @@
* @param location
* location of the element (within a template), used as part of exception reporting
*/
- @SuppressNullCheck
+
public ComponentPageElementImpl(Page page, ComponentPageElement container, String id,
Instantiator instantiator, TypeCoercer typeCoercer, Location location)
{
@@ -284,7 +283,7 @@
private RenderCommand _setupRender = new RenderCommand()
{
- @SuppressNullCheck
+
public void render(MarkupWriter writer, RenderQueue queue)
{
_rendering = true;
@@ -307,7 +306,7 @@
private RenderCommand _beginRender = new RenderCommand()
{
- @SuppressNullCheck
+
public void render(MarkupWriter writer, RenderQueue queue)
{
LifecycleEvent<Boolean> event = newEvent(true);
@@ -329,7 +328,7 @@
private RenderCommand _beforeRenderBody = new RenderCommand()
{
- @SuppressNullCheck
+
public void render(MarkupWriter writer, RenderQueue queue)
{
LifecycleEvent<Boolean> event = newEvent(true);
@@ -351,7 +350,7 @@
private RenderCommand _afterRender = new RenderCommand()
{
- @SuppressNullCheck
+
public void render(MarkupWriter writer, RenderQueue queue)
{
LifecycleEvent<Boolean> event = newEvent(false);
@@ -375,7 +374,7 @@
private RenderCommand _cleanupRender = new RenderCommand()
{
- @SuppressNullCheck
+
public void render(MarkupWriter writer, RenderQueue queue)
{
LifecycleEvent<Boolean> event = newEvent(false);
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/InternalComponentResourcesImpl.java Fri Oct 27 08:38:47 2006
@@ -24,7 +24,6 @@
import org.apache.tapestry.Link;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.TapestryException;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.services.Instantiator;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.model.ComponentModel;
@@ -35,7 +34,7 @@
* resources to the component, including access to its parameters, parameter bindings, and
* persistent field data.
*/
-@SuppressNullCheck
+
public class InternalComponentResourcesImpl implements InternalComponentResources
{
private final ComponentModel _componentModel;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/structure/PageImpl.java Fri Oct 27 08:38:47 2006
@@ -21,14 +21,11 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.services.LinkFactory;
import org.apache.tapestry.runtime.PageLifecycleListener;
import org.apache.tapestry.services.PersistentFieldBundle;
import org.apache.tapestry.services.PersistentFieldManager;
-/** */
-@SuppressNullCheck
public class PageImpl implements Page
{
private final String _name;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/test/InternalBaseTestCase.java Fri Oct 27 08:38:47 2006
@@ -28,7 +28,6 @@
import org.apache.tapestry.Location;
import org.apache.tapestry.Resource;
import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.ioc.InternalRegistry;
import org.apache.tapestry.internal.ioc.Module;
import org.apache.tapestry.internal.parser.ComponentTemplate;
@@ -65,10 +64,8 @@
/**
* Contains additional factory and training methods related to internal interfaces.
- *
- *
*/
-@SuppressNullCheck
+
public class InternalBaseTestCase extends BaseTestCase implements Registry
{
private static Registry _registry;
@@ -284,7 +281,8 @@
setReturnValue(page);
}
- protected final void train_getComponentResources(ComponentPageElement element, InternalComponentResources resources)
+ protected final void train_getComponentResources(ComponentPageElement element,
+ InternalComponentResources resources)
{
element.getComponentResources();
setReturnValue(resources);
@@ -296,7 +294,8 @@
setReturnValue(className);
}
- protected final void train_newRenderBodyElement(PageElementFactory elementFactory, ComponentPageElement component, PageElement body)
+ protected final void train_newRenderBodyElement(PageElementFactory elementFactory,
+ ComponentPageElement component, PageElement body)
{
elementFactory.newRenderBodyElement(component);
setReturnValue(body);
@@ -313,7 +312,9 @@
setReturnValue(Arrays.asList(names));
}
- protected final void train_newComponentElement(PageElementFactory elementFactory, ComponentPageElement container, String embeddedId, String embeddedType, String componentClassName, Location location, ComponentPageElement embedded)
+ protected final void train_newComponentElement(PageElementFactory elementFactory,
+ ComponentPageElement container, String embeddedId, String embeddedType,
+ String componentClassName, Location location, ComponentPageElement embedded)
{
elementFactory.newComponentElement(
isA(Page.class),
@@ -331,7 +332,8 @@
setReturnValue(componentType);
}
- protected final void train_getEmbeddedComponentModel(ComponentModel model, String embeddedId, EmbeddedComponentModel emodel)
+ protected final void train_getEmbeddedComponentModel(ComponentModel model, String embeddedId,
+ EmbeddedComponentModel emodel)
{
model.getEmbeddedComponentModel(embeddedId);
setReturnValue(emodel);
@@ -378,11 +380,12 @@
protected final void train_getEmbeddedIds(ComponentModel model, String... ids)
{
model.getEmbeddedComponentIds();
-
+
setReturnValue(Arrays.asList(ids));
}
- protected void train_getTemplate(ComponentTemplateSource templateSource, String className, Locale locale, ComponentTemplate template)
+ protected void train_getTemplate(ComponentTemplateSource templateSource, String className,
+ Locale locale, ComponentTemplate template)
{
templateSource.getTemplate(className, locale);
setReturnValue(template);
@@ -394,7 +397,8 @@
setReturnValue(model);
}
- protected final void train_newRootComponentElement(PageElementFactory elementFactory, String className, ComponentPageElement rootElement)
+ protected final void train_newRootComponentElement(PageElementFactory elementFactory,
+ String className, ComponentPageElement rootElement)
{
elementFactory.newRootComponentElement(isA(Page.class), eq(className));
setReturnValue(rootElement);
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/DependencyNode.java Fri Oct 27 08:38:47 2006
@@ -22,7 +22,6 @@
import java.util.List;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.ioc.Orderable;
/**
@@ -31,7 +30,7 @@
*
* @param <T>
*/
-@SuppressNullCheck
+
class DependencyNode<T>
{
private final Log _log;
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/InternalUtils.java Fri Oct 27 08:38:47 2006
@@ -29,7 +29,6 @@
import org.apache.tapestry.Locatable;
import org.apache.tapestry.Location;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.annotations.Utility;
import org.apache.tapestry.ioc.ServiceLocator;
import org.apache.tapestry.ioc.annotations.Inject;
@@ -81,7 +80,7 @@
}
/** Returns the size of an object array, or null if the array is empty. */
- @SuppressNullCheck
+
public static int size(Object[] array)
{
return array == null ? 0 : array.length;
@@ -267,13 +266,12 @@
* Returns true if the input is null, or is a zero length string (excluding leading/trailing
* whitespace).
*/
- @SuppressNullCheck
+
public static boolean isBlank(String input)
{
return input == null || input.length() == 0 || input.trim().length() == 0;
}
- @SuppressNullCheck
public static boolean isNonBlank(String input)
{
return !isBlank(input);
@@ -292,7 +290,7 @@
* Sniffs the object to see if it is a {@link Location} or {@link Locatable}. Returns null if
* null or not convertable to a location.
*/
- @SuppressNullCheck
+
public static Location locationOf(Object location)
{
if (location == null)
@@ -315,7 +313,7 @@
* the map to extract keys from (may be null)
* @return the sorted keys, or the empty set if map is null
*/
- @SuppressNullCheck
+
public static List<String> sortedKeys(Map map)
{
if (map == null)
@@ -341,7 +339,7 @@
* @param key
* @return the value from the map, or null if the map is null
*/
- @SuppressNullCheck
+
public static <K, V> V get(Map<K, V> map, K key)
{
if (map == null)
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/Orderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/Orderer.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/Orderer.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/internal/util/Orderer.java Fri Oct 27 08:38:47 2006
@@ -23,7 +23,6 @@
import org.apache.commons.logging.Log;
import org.apache.tapestry.internal.annotations.OneShot;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.ioc.IdMatcherImpl;
import org.apache.tapestry.ioc.IOCUtilities;
import org.apache.tapestry.ioc.IdMatcher;
@@ -113,7 +112,7 @@
* optional, variable constraints
* @see #add(Orderable)
*/
- @SuppressNullCheck
+
public void add(String id, T target, String... constraints)
{
add(new Orderable<T>(id, target, constraints));
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/IOCUtilities.java Fri Oct 27 08:38:47 2006
@@ -23,14 +23,11 @@
import java.util.Enumeration;
import java.util.jar.Manifest;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
import org.apache.tapestry.internal.annotations.Utility;
/**
* A collection of utility methods for a couple of different areas, including creating the initial
* {@link org.apache.tapestry.ioc.Registry}.
- *
- *
*/
@Utility
public final class IOCUtilities
@@ -150,7 +147,7 @@
* Qualifies a list of interceptor service ids provided for an interceptor contribution. The
* special value "*" is not qualified.
*/
- @SuppressNullCheck
+
public static String qualifySimpleIdList(String sourceModuleId, String list)
{
if (list == null || list.equals("") || list.equals("*"))
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/Orderable.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/Orderable.java?view=diff&rev=468421&r1=468420&r2=468421
==============================================================================
--- tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/Orderable.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/Orderable.java Fri Oct 27 08:38:47 2006
@@ -16,8 +16,6 @@
import static org.apache.tapestry.util.Defense.notBlank;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
-
/**
* A wrapper that allows objects of a target type to be ordered. Each Orderable object is given a
* unique id and a set of pre-requisites (objects which should be ordered earlier) and
@@ -40,7 +38,7 @@
* the object to be ordered; this may also be null (in which case the id represents a
* placeholder)
*/
- @SuppressNullCheck
+
public Orderable(String id, T target, String... constraints)
{
_id = notBlank(id, "id");
Modified: tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/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/ioc/services/MethodSignature.java (original)
+++ tapestry/tapestry5/tapestry-core/branches/hlship-20061027-removeaspectj/src/main/java/org/apache/tapestry/ioc/services/MethodSignature.java Fri Oct 27 08:38:47 2006
@@ -20,8 +20,6 @@
import java.lang.reflect.Method;
-import org.apache.tapestry.internal.annotations.SuppressNullCheck;
-
/**
* A representation of a {@link java.lang.reflect.Method}, identifying the name, return type,
* parameter types and exception types. Actual Method objects are tied to a particular class, and
@@ -54,7 +52,6 @@
private Class[] _exceptionTypes;
- @SuppressNullCheck
public MethodSignature(Class returnType, String name, Class[] parameterTypes,
Class[] exceptionTypes)
{