You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2014/02/08 14:47:38 UTC
[2/2] git commit: Replaces all tabs by spaces
Replaces all tabs by spaces
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/5b3d81aa
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/5b3d81aa
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/5b3d81aa
Branch: refs/heads/master
Commit: 5b3d81aa9b7b99e644cfd919ead1a4907351bd16
Parents: 1174e70
Author: Thiago H. de Paula Figueiredo <th...@apache.org>
Authored: Sat Feb 8 11:47:11 2014 -0200
Committer: Thiago H. de Paula Figueiredo <th...@apache.org>
Committed: Sat Feb 8 11:47:11 2014 -0200
----------------------------------------------------------------------
.../tapestry5/plastic/PlasticManager.java | 2 +-
.../apache/tapestry5/ContextAwareException.java | 2 +-
.../tapestry5/ExceptionHandlerAssistant.java | 2 +-
.../org/apache/tapestry5/MetaDataConstants.java | 12 +-
.../java/org/apache/tapestry5/ValueEncoder.java | 4 +-
.../UnknownActivationContextCheck.java | 18 +--
.../tapestry5/corelib/components/Delegate.java | 20 +--
.../corelib/components/PropertyEditor.java | 2 +-
.../internal/BeanValidationContextImpl.java | 18 +--
.../internal/bindings/InternalPropBinding.java | 8 +-
.../internal/bindings/PropBinding.java | 10 +-
.../model/MutableComponentModelImpl.java | 22 ++--
.../pageload/ComponentAssemblerImpl.java | 4 +-
.../internal/pageload/PageLoaderImpl.java | 4 +-
.../internal/services/ComponentEventImpl.java | 22 ++--
.../DefaultRequestExceptionHandler.java | 2 +-
.../services/EndOfRequestEventHubImpl.java | 2 +-
.../tapestry5/internal/services/LinkImpl.java | 2 +-
.../internal/services/PageActivatorImpl.java | 44 +++----
.../services/PersistentFieldManagerImpl.java | 2 +-
.../UnknownActivationContextHandler.java | 4 +-
.../UnknownActivationContextHandlerImpl.java | 36 +++---
.../meta/UnknownActivationContextExtractor.java | 2 +-
.../structure/ComponentPageElementImpl.java | 22 ++--
.../internal/transform/OnEventWorker.java | 8 +-
.../internal/translator/BigTypesFormatter.java | 2 +-
.../apache/tapestry5/model/ComponentModel.java | 20 +--
.../tapestry5/model/MutableComponentModel.java | 24 ++--
.../ActivationContextintegrationTests.java | 96 +++++++-------
.../integration/activationctx/pages/Index.java | 14 +--
.../activationctx/pages/OneContext.java | 4 +-
.../activationctx/pages/TwoContext.java | 8 +-
.../activationctx/services/AppModule.java | 10 +-
.../ActivationContextIntegrationTests2.java | 60 ++++-----
.../integration/activationctx2/pages/Index.java | 14 +--
.../activationctx2/services/AppModule.java | 16 +--
.../integration/app1/CoreBehaviorsTests.java | 46 +++----
.../tapestry5/integration/app1/FormTests.java | 28 ++---
.../integration/app1/GeneralComponentTests.java | 36 +++---
.../app1/mixins/EchoValueWithId.java | 6 +-
.../tapestry5/integration/app1/pages/Index.java | 14 +--
.../app1/pages/KnownActivationContextDemo.java | 6 +-
.../app1/pages/PageContextInForm.java | 2 +-
.../app1/pages/SelectModelCoercionDemo.java | 2 +-
.../app1/pages/ValidatorMacroDemo.java | 16 +--
.../integration/app1/services/AppModule.java | 8 +-
.../services/ComponentEventImplTest.java | 24 ++--
.../DefaultRequestExceptionHandlerTest.java | 124 +++++++++----------
.../structure/ComponentPageElementImplTest.java | 98 +++++++--------
.../apache/tapestry5/ioc/def/ServiceDef3.java | 4 +-
.../services/ClassPropertyAdapterImpl.java | 2 +-
.../internal/services/PropertyAccessImpl.java | 2 +-
.../ioc/internal/util/InternalUtils.java | 8 +-
.../ioc/internal/AnnotatedServiceInterface.java | 4 +-
.../internal/AnnotatedServiceInterfaceImpl.java | 6 +-
.../internal/NonAnnotatedServiceInterface.java | 4 +-
.../tapestry5/ioc/internal/TestAdvice.java | 40 +++---
.../util/FieldInjectionViaJavaxNamed.java | 2 +-
58 files changed, 512 insertions(+), 512 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
----------------------------------------------------------------------
diff --git a/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
index 4da7cc8..735c9f4 100644
--- a/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
+++ b/plastic/src/main/java/org/apache/tapestry5/plastic/PlasticManager.java
@@ -228,7 +228,7 @@ public class PlasticManager implements PlasticClassListenerHub
*/
public <T> ClassInstantiator<T> createProxy(Class<T> interfaceType, PlasticClassTransformer callback)
{
- return createProxy(interfaceType, null, callback);
+ return createProxy(interfaceType, null, callback);
}
/**
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/ContextAwareException.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ContextAwareException.java b/tapestry-core/src/main/java/org/apache/tapestry5/ContextAwareException.java
index b9c9f62..9c8b22c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ContextAwareException.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ContextAwareException.java
@@ -15,5 +15,5 @@
package org.apache.tapestry5;
public interface ContextAwareException {
- Object[] getContext();
+ Object[] getContext();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/ExceptionHandlerAssistant.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ExceptionHandlerAssistant.java b/tapestry-core/src/main/java/org/apache/tapestry5/ExceptionHandlerAssistant.java
index e722afc..7f76075 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ExceptionHandlerAssistant.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ExceptionHandlerAssistant.java
@@ -18,5 +18,5 @@ import java.io.IOException;
import java.util.List;
public interface ExceptionHandlerAssistant {
- public Object handleRequestException(Throwable exception, List<Object> exceptionContext) throws IOException;
+ public Object handleRequestException(Throwable exception, List<Object> exceptionContext) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
index be9a2f9..9ff2734 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
@@ -44,10 +44,10 @@ public class MetaDataConstants
*/
public static final String WHITELIST_ONLY_PAGE = "tapestry.white-list-only-page";
- /**
- * Meta data key applied to pages that may only be accessed with a exact activation context.
- *
- * @since 5.4
- */
- public static final String UNKNOWN_ACTIVATION_CONTEXT_CHECK = "tapestry.unknwon-activation-context-check";
+ /**
+ * Meta data key applied to pages that may only be accessed with a exact activation context.
+ *
+ * @since 5.4
+ */
+ public static final String UNKNOWN_ACTIVATION_CONTEXT_CHECK = "tapestry.unknwon-activation-context-check";
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
index 1318dd0..d8cd164 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
@@ -50,9 +50,9 @@ package org.apache.tapestry5;
*
* <pre>
* public static void contributeValueEncoderSource(
- * MappedConfiguration<Class<Color>, ValueEncoderFactory<Color>> configuration)
+ * MappedConfiguration<Class<Color>, ValueEncoderFactory<Color>> configuration)
* {
- * configuration.addInstance(Color.class, ColorEncoder.class);
+ * configuration.addInstance(Color.class, ColorEncoder.class);
* }
* </pre>
*
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/annotations/UnknownActivationContextCheck.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/UnknownActivationContextCheck.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/UnknownActivationContextCheck.java
index 609f16b..8512d3f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/UnknownActivationContextCheck.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/UnknownActivationContextCheck.java
@@ -36,13 +36,13 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
@UseWith(AnnotationUseContext.PAGE)
public @interface UnknownActivationContextCheck
{
- /**
- * If <code>true</code>, the default, the framework will check for an exact (number and type of parameters)
- * activation context method and if not found will respond with a 404 Not Found status code, if <code>false</code>
- * the activation context is ignored as it was before 5.4 release.
- *
- * @see org.apache.tapestry5.MetaDataConstants#UNKNOWN_ACTIVATION_CONTEXT_CHECK
- * @see org.apache.tapestry5.services.HttpError
- */
- boolean value() default true;
+ /**
+ * If <code>true</code>, the default, the framework will check for an exact (number and type of parameters)
+ * activation context method and if not found will respond with a 404 Not Found status code, if <code>false</code>
+ * the activation context is ignored as it was before 5.4 release.
+ *
+ * @see org.apache.tapestry5.MetaDataConstants#UNKNOWN_ACTIVATION_CONTEXT_CHECK
+ * @see org.apache.tapestry5.services.HttpError
+ */
+ boolean value() default true;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
index be83a0e..0e06d25 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
@@ -45,16 +45,16 @@ public class Delegate
@Parameter(required = true)
private Object to;
- @Inject private ComponentResources resources;
- @InjectContainer private Component container;
-
- Object beginRender()
- {
- for(String name : resources.getInformalParameterNames()) {
- Object value = resources.getInformalParameter(name, Object.class);
- container.getComponentResources().storeRenderVariable(name, value);
- }
-
+ @Inject private ComponentResources resources;
+ @InjectContainer private Component container;
+
+ Object beginRender()
+ {
+ for(String name : resources.getInformalParameterNames()) {
+ Object value = resources.getInformalParameter(name, Object.class);
+ container.getComponentResources().storeRenderVariable(name, value);
+ }
+
return to;
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
index c79c192..1f9a418 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
@@ -218,7 +218,7 @@ public class PropertyEditor
if(beanValidationContext != null)
{
- beanValidationContext.setCurrentProperty(propertyName);
+ beanValidationContext.setCurrentProperty(propertyName);
}
heartbeat.begin();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/BeanValidationContextImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/BeanValidationContextImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/BeanValidationContextImpl.java
index 49536a0..c52d897 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/BeanValidationContextImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/BeanValidationContextImpl.java
@@ -34,14 +34,14 @@ public class BeanValidationContextImpl implements BeanValidationContext
return bean;
}
- public String getCurrentProperty()
- {
- return currentProperty;
- }
-
- public void setCurrentProperty(String propertyName)
- {
- this.currentProperty = propertyName;
- }
+ public String getCurrentProperty()
+ {
+ return currentProperty;
+ }
+
+ public void setCurrentProperty(String propertyName)
+ {
+ this.currentProperty = propertyName;
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/InternalPropBinding.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/InternalPropBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/InternalPropBinding.java
index 7e6cdc8..1d7fd60 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/InternalPropBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/InternalPropBinding.java
@@ -21,8 +21,8 @@ import org.apache.tapestry5.Binding;
*/
public interface InternalPropBinding extends Binding
{
- /**
- * Returns the name of the property, if exists.
- */
- String getPropertyName();
+ /**
+ * Returns the name of the property, if exists.
+ */
+ String getPropertyName();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
index 0e7e097..e7802bc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
@@ -107,14 +107,14 @@ public class PropBinding extends AbstractBinding implements InternalPropBinding
return conduit.getAnnotation(annotationClass);
}
- public String getPropertyName()
- {
- return TapestryInternalUtils.toInternalPropertyConduit(conduit).getPropertyName();
- }
+ public String getPropertyName()
+ {
+ return TapestryInternalUtils.toInternalPropertyConduit(conduit).getPropertyName();
+ }
public String getExpression()
{
return expression;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
index a78366d..c1a02b0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
@@ -69,7 +69,7 @@ public final class MutableComponentModelImpl implements MutableComponentModel
private final String libraryName;
- private boolean handleActivationEventContext;
+ private boolean handleActivationEventContext;
public MutableComponentModelImpl(String componentClassName, Logger logger, Resource baseResource,
ComponentModel parentModel, boolean pageClass, String libraryName)
@@ -81,8 +81,8 @@ public final class MutableComponentModelImpl implements MutableComponentModel
this.pageClass = pageClass;
this.libraryName = libraryName;
- // Default to false, explicitly set during page transformation
- this.handleActivationEventContext = false;
+ // Default to false, explicitly set during page transformation
+ this.handleActivationEventContext = false;
// Pre-allocate names from the parent, to avoid name collisions.
@@ -400,13 +400,13 @@ public final class MutableComponentModelImpl implements MutableComponentModel
return pageClass;
}
- public void doHandleActivationEventContext()
- {
- this.handleActivationEventContext = true;
- }
+ public void doHandleActivationEventContext()
+ {
+ this.handleActivationEventContext = true;
+ }
- public boolean handleActivationEventContext()
- {
- return this.handleActivationEventContext;
- }
+ public boolean handleActivationEventContext()
+ {
+ return this.handleActivationEventContext;
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssemblerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssemblerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssemblerImpl.java
index 3e3f27c..91d42b9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssemblerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/ComponentAssemblerImpl.java
@@ -61,7 +61,7 @@ class ComponentAssemblerImpl implements ComponentAssembler
private final SymbolSource symbolSource;
- private final MetaDataLocator metaDataLocator;
+ private final MetaDataLocator metaDataLocator;
private Map<String, String> publishedParameterToEmbeddedId;
@@ -80,7 +80,7 @@ class ComponentAssemblerImpl implements ComponentAssembler
this.tracker = tracker;
this.request = request;
this.symbolSource = symbolSource;
- this.metaDataLocator = metaDataLocator;
+ this.metaDataLocator = metaDataLocator;
}
public ComponentPageElement assembleRootComponent(final Page page)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
index 2f976e2..995f43d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/pageload/PageLoaderImpl.java
@@ -148,7 +148,7 @@ public class PageLoaderImpl implements PageLoader, ComponentAssemblerSource
private final Logger logger;
- private final MetaDataLocator metaDataLocator;
+ private final MetaDataLocator metaDataLocator;
public PageLoaderImpl(ComponentInstantiatorSource instantiatorSource, ComponentTemplateSource templateSource,
PageElementFactory elementFactory, ComponentPageElementResourcesSource resourcesSource,
@@ -168,7 +168,7 @@ public class PageLoaderImpl implements PageLoader, ComponentAssemblerSource
this.request = request;
this.symbolSource = symbolSource;
this.logger = logger;
- this.metaDataLocator = metaDataLocator;
+ this.metaDataLocator = metaDataLocator;
}
@PostInjection
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java
index 7de3120..8f6a5b0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java
@@ -31,7 +31,7 @@ public class ComponentEventImpl extends EventImpl implements ComponentEvent
private final ComponentPageElementResources elementResources;
- private final boolean exactParameterCountMatch;
+ private final boolean exactParameterCountMatch;
/**
* @param eventType
@@ -44,17 +44,17 @@ public class ComponentEventImpl extends EventImpl implements ComponentEvent
* invoked when a non-null return value is obtained from an event handler method
* @param elementResources
* provides access to common resources and services
- * @param exactParameterCountMatch
- * the {@link org.apache.tapestry5.ioc.annotations.Symbol} indicating an exact match
- * on parameter count in the {@link EventContext}.
- * @param model
- * the {@link ComponentModel} of the component originating the event.
+ * @param exactParameterCountMatch
+ * the {@link org.apache.tapestry5.ioc.annotations.Symbol} indicating an exact match
+ * on parameter count in the {@link EventContext}.
+ * @param model
+ * the {@link ComponentModel} of the component originating the event.
* @param logger
* used to log method invocations
*/
public ComponentEventImpl(String eventType, String originatingComponentId, EventContext context,
ComponentEventCallback handler, ComponentPageElementResources elementResources,
- boolean exactParameterCountMatch, ComponentModel model, Logger logger)
+ boolean exactParameterCountMatch, ComponentModel model, Logger logger)
{
super(handler, logger, elementResources);
@@ -62,7 +62,7 @@ public class ComponentEventImpl extends EventImpl implements ComponentEvent
this.originatingComponentId = originatingComponentId;
this.elementResources = elementResources;
this.context = context;
- this.exactParameterCountMatch = exactParameterCountMatch && !model.handleActivationEventContext();
+ this.exactParameterCountMatch = exactParameterCountMatch && !model.handleActivationEventContext();
}
@Override
@@ -77,10 +77,10 @@ public class ComponentEventImpl extends EventImpl implements ComponentEvent
if (isAborted())
return false;
- boolean parameterCountMatch = exactParameterCountMatch ?
- context.getCount() == parameterCount : context.getCount() >= parameterCount;
+ boolean parameterCountMatch = exactParameterCountMatch ?
+ context.getCount() == parameterCount : context.getCount() >= parameterCount;
- return this.eventType.equalsIgnoreCase(eventType) && parameterCountMatch
+ return this.eventType.equalsIgnoreCase(eventType) && parameterCountMatch
&& (originatingComponentId.equalsIgnoreCase(componentId) || componentId.equals(""));
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
index 62a8708..70f72cb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
@@ -94,7 +94,7 @@ public class DefaultRequestExceptionHandler implements RequestExceptionHandler
String pageName,
Request request, Response response, ComponentClassResolver componentClassResolver,
- LinkSource linkSource, ServiceResources serviceResources, Map<Class, Object> configuration)
+ LinkSource linkSource, ServiceResources serviceResources, Map<Class, Object> configuration)
{
this.pageCache = pageCache;
this.renderer = renderer;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EndOfRequestEventHubImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EndOfRequestEventHubImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EndOfRequestEventHubImpl.java
index a5743f9..c80c32e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EndOfRequestEventHubImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EndOfRequestEventHubImpl.java
@@ -25,7 +25,7 @@ public class EndOfRequestEventHubImpl implements EndOfRequestEventHub
private final RequestGlobals requestGlobals;
public EndOfRequestEventHubImpl(RequestGlobals requestGlobals) {
- this.requestGlobals = requestGlobals;
+ this.requestGlobals = requestGlobals;
}
private final List<EndOfRequestListener> listeners = CollectionFactory.newThreadSafeList();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
index ee192e4..8d4f62f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
@@ -28,7 +28,7 @@ import java.util.TreeMap;
public class LinkImpl implements Link
{
- private Map<String, List<String>> parameters;
+ private Map<String, List<String>> parameters;
private final String basePath;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageActivatorImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageActivatorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageActivatorImpl.java
index 5ebdc7c..c5c6bea 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageActivatorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageActivatorImpl.java
@@ -28,19 +28,19 @@ import javax.servlet.http.HttpServletResponse;
public class PageActivatorImpl implements PageActivator
{
- private final Logger logger;
+ private final Logger logger;
- private final MetaDataLocator metaDataLocator;
+ private final MetaDataLocator metaDataLocator;
- private final UnknownActivationContextHandler unknownActivationContextHandler;
+ private final UnknownActivationContextHandler unknownActivationContextHandler;
- public PageActivatorImpl(Logger logger, MetaDataLocator metaDataLocator,
- UnknownActivationContextHandler unknownActivationContextHandler)
- {
- this.logger = logger;
- this.metaDataLocator = metaDataLocator;
- this.unknownActivationContextHandler = unknownActivationContextHandler;
- }
+ public PageActivatorImpl(Logger logger, MetaDataLocator metaDataLocator,
+ UnknownActivationContextHandler unknownActivationContextHandler)
+ {
+ this.logger = logger;
+ this.metaDataLocator = metaDataLocator;
+ this.unknownActivationContextHandler = unknownActivationContextHandler;
+ }
@SuppressWarnings("unchecked")
public boolean activatePage(ComponentResources pageResources, EventContext activationContext,
@@ -48,21 +48,21 @@ public class PageActivatorImpl implements PageActivator
{
TrackableComponentEventCallback callback = new ComponentResultProcessorWrapper(resultProcessor);
- boolean handled = pageResources.triggerContextEvent(EventConstants.ACTIVATE, activationContext, callback);
+ boolean handled = pageResources.triggerContextEvent(EventConstants.ACTIVATE, activationContext, callback);
- boolean acceptEmpty = !pageResources.getComponentModel().handlesEvent(EventConstants.ACTIVATE) &&
- activationContext.getCount() == 0;
+ boolean acceptEmpty = !pageResources.getComponentModel().handlesEvent(EventConstants.ACTIVATE) &&
+ activationContext.getCount() == 0;
- boolean checkUnknown = metaDataLocator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK,
- pageResources, Boolean.class);
+ boolean checkUnknown = metaDataLocator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK,
+ pageResources, Boolean.class);
- if ( !handled && !acceptEmpty && checkUnknown &&
- !pageResources.getComponentModel().handleActivationEventContext())
- {
- logger.info("Page {} required an exact activation context, let's handle this", pageResources.getPageName());
- unknownActivationContextHandler.handleUnknownContext(pageResources, activationContext);
- return true;
- }
+ if ( !handled && !acceptEmpty && checkUnknown &&
+ !pageResources.getComponentModel().handleActivationEventContext())
+ {
+ logger.info("Page {} required an exact activation context, let's handle this", pageResources.getPageName());
+ unknownActivationContextHandler.handleUnknownContext(pageResources, activationContext);
+ return true;
+ }
if (callback.isAborted())
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java
index d03d2e6..66b002f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java
@@ -76,7 +76,7 @@ public class PersistentFieldManagerImpl implements PersistentFieldManager
public void discardChanges(String pageName, String strategyName) {
PersistentFieldStrategy strategy = strategies.get(strategyName);
if (strategy != null) strategy.discardChanges(pageName);
- }
+ }
public void postChange(String pageName, ComponentResources resources, String fieldName, Object newValue)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
index 1bc0d5b..a48d388 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandler.java
@@ -36,6 +36,6 @@ public interface UnknownActivationContextHandler
* Answer the client in the case of a request coming in with an unknown activation context.
*/
@SuppressWarnings("unchecked")
- void handleUnknownContext(ComponentResources pageResources, EventContext activationContext)
- throws IOException;
+ void handleUnknownContext(ComponentResources pageResources, EventContext activationContext)
+ throws IOException;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandlerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandlerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandlerImpl.java
index 6b33595..70a2554 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandlerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UnknownActivationContextHandlerImpl.java
@@ -30,28 +30,28 @@ import java.io.IOException;
*/
public class UnknownActivationContextHandlerImpl implements UnknownActivationContextHandler
{
- private final Logger logger;
+ private final Logger logger;
- private final ComponentEventResultProcessor resultProcessor;
+ private final ComponentEventResultProcessor resultProcessor;
- public UnknownActivationContextHandlerImpl(Logger logger,
- @Traditional @Primary
- ComponentEventResultProcessor resultProcessor)
- {
- this.logger = logger;
- this.resultProcessor = resultProcessor;
- }
+ public UnknownActivationContextHandlerImpl(Logger logger,
+ @Traditional @Primary
+ ComponentEventResultProcessor resultProcessor)
+ {
+ this.logger = logger;
+ this.resultProcessor = resultProcessor;
+ }
- public void handleUnknownContext(ComponentResources pageResources, EventContext activationContext)
- throws IOException
- {
- logger.warn("Activate event on page {} was fired with context {} but was not handled",
- pageResources.getPage().getClass(), activationContext);
+ public void handleUnknownContext(ComponentResources pageResources, EventContext activationContext)
+ throws IOException
+ {
+ logger.warn("Activate event on page {} was fired with context {} but was not handled",
+ pageResources.getPage().getClass(), activationContext);
- String message = String.format("Activation context %s unrecognized for page %s",
- activationContext, pageResources.getPage().getClass());
+ String message = String.format("Activation context %s unrecognized for page %s",
+ activationContext, pageResources.getPage().getClass());
- resultProcessor.processResultValue(new HttpError(HttpServletResponse.SC_NOT_FOUND, message));
- }
+ resultProcessor.processResultValue(new HttpError(HttpServletResponse.SC_NOT_FOUND, message));
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/UnknownActivationContextExtractor.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/UnknownActivationContextExtractor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/UnknownActivationContextExtractor.java
index ee03175..27d34e3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/UnknownActivationContextExtractor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/meta/UnknownActivationContextExtractor.java
@@ -24,6 +24,6 @@ public class UnknownActivationContextExtractor implements MetaDataExtractor<Unkn
{
public void extractMetaData(MutableComponentModel model, UnknownActivationContextCheck annotation)
{
- model.setMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, Boolean.toString(annotation.value()));
+ model.setMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, Boolean.toString(annotation.value()));
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
index 26d6d03..73e38c4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
@@ -509,11 +509,11 @@ public class ComponentPageElementImpl extends BaseLocatable implements Component
// should be okay since it's a shadow service object
private final Request request;
private final SymbolSource symbolSource;
- private final MetaDataLocator metaDataLocator;
+ private final MetaDataLocator metaDataLocator;
private final boolean productionMode;
private final boolean componentTracingEnabled;
- private final boolean exactParameterCountMatch;
+ private final boolean exactParameterCountMatch;
// We know that, at the very least, there will be an element to force the component to render
// its body, so there's no reason to wait to initialize the list.
@@ -548,7 +548,7 @@ public class ComponentPageElementImpl extends BaseLocatable implements Component
ComponentPageElementImpl(Page page, ComponentPageElement container, String id, String nestedId, String completeId,
String elementName, Instantiator instantiator, Location location,
ComponentPageElementResources elementResources, Request request,
- SymbolSource symbolSource, MetaDataLocator metaDataLocator)
+ SymbolSource symbolSource, MetaDataLocator metaDataLocator)
{
super(location);
@@ -561,17 +561,17 @@ public class ComponentPageElementImpl extends BaseLocatable implements Component
this.elementResources = elementResources;
this.request = request;
this.symbolSource = symbolSource;
- this.metaDataLocator = metaDataLocator;
+ this.metaDataLocator = metaDataLocator;
// evaluate this once because it gets referenced a lot during rendering
this.productionMode = "true".equals(symbolSource.valueForSymbol(SymbolConstants.PRODUCTION_MODE));
this.componentTracingEnabled = "true".equals(symbolSource
.valueForSymbol(SymbolConstants.COMPONENT_RENDER_TRACING_ENABLED));
- this.exactParameterCountMatch = metaDataLocator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK,
- page.getName(), Boolean.class);
+ this.exactParameterCountMatch = metaDataLocator.findMeta(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK,
+ page.getName(), Boolean.class);
- ComponentResources containerResources = container == null ? null : container.getComponentResources();
+ ComponentResources containerResources = container == null ? null : container.getComponentResources();
coreResources = new InternalComponentResourcesImpl(this.page, this, containerResources, this.elementResources,
completeId, nestedId, instantiator, false);
@@ -596,10 +596,10 @@ public class ComponentPageElementImpl extends BaseLocatable implements Component
*/
public ComponentPageElementImpl(Page page, Instantiator instantiator,
ComponentPageElementResources elementResources, Request request,
- SymbolSource symbolSource, MetaDataLocator metaDataLocator)
+ SymbolSource symbolSource, MetaDataLocator metaDataLocator)
{
- this(page, null, null, null, page.getName(), null, instantiator, null, elementResources,
- request, symbolSource, metaDataLocator);
+ this(page, null, null, null, page.getName(), null, instantiator, null, elementResources,
+ request, symbolSource, metaDataLocator);
}
private void initializeRenderPhases()
@@ -659,7 +659,7 @@ public class ComponentPageElementImpl extends BaseLocatable implements Component
ComponentPageElementImpl child = new ComponentPageElementImpl(page, this, id, nestedId, completeId,
elementName, instantiator, location, elementResources, request, symbolSource, metaDataLocator);
- addEmbeddedElement(child);
+ addEmbeddedElement(child);
return child;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
index ca25276..9a4a92d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
@@ -133,7 +133,7 @@ public class OnEventWorker implements ComponentClassTransformWorker2
int minContextValues = 0;
- boolean handleActivationEventContext = false;
+ boolean handleActivationEventContext = false;
EventHandlerMethod(PlasticMethod method)
{
@@ -223,7 +223,7 @@ public class OnEventWorker implements ComponentClassTransformWorker2
if (provider != null)
{
providers.add(provider);
- this.handleActivationEventContext = true;
+ this.handleActivationEventContext = true;
continue;
}
@@ -387,8 +387,8 @@ public class OnEventWorker implements ComponentClassTransformWorker2
model.addEventHandler(method.eventType);
- if (method.handleActivationEventContext)
- model.doHandleActivationEventContext();
+ if (method.handleActivationEventContext)
+ model.doHandleActivationEventContext();
}
builder.loadVariable(resultVariable).returnResult();
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/BigTypesFormatter.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/BigTypesFormatter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/BigTypesFormatter.java
index a6d1904..5e1498f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/BigTypesFormatter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/BigTypesFormatter.java
@@ -47,7 +47,7 @@ public abstract class BigTypesFormatter implements NumericFormatter
public Number parse(String clientValue) throws ParseException
{
- // Allow for " " here since FF2/IE replaces \u00A0 (non breaking space) with \u0020 (normal space)
+ // Allow for " " here since FF2/IE replaces \u00A0 (non breaking space) with \u0020 (normal space)
String noGroups = clientValue.replace(toString(symbols.getGroupingSeparator()), "").replace(" ", "");
String fixedNeg = noGroups.replace(symbols.getMinusSign(), '-');
String fixedDec = fixedNeg.replace(symbols.getDecimalSeparator(), '.');
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
index f19c018..6366611 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
@@ -212,14 +212,14 @@ public interface ComponentModel
*/
String[] getOrderForMixin(String mixinClassName);
- /**
- * Relevant for pages only, indicates that the component handle the {@link org.apache.tapestry5.EventConstants.ACTIVATE}
- * events with a catch all rules
- *
- * @since 5.4
- * @see {@link MutableComponentModel.doHandleActivationEventContext()}
- * @return <code>true</code> in case the page implement a catch all rules for the activate event context,
- * <code>false</code> otherwise
- */
- boolean handleActivationEventContext();
+ /**
+ * Relevant for pages only, indicates that the component handle the {@link org.apache.tapestry5.EventConstants.ACTIVATE}
+ * events with a catch all rules
+ *
+ * @since 5.4
+ * @see {@link MutableComponentModel.doHandleActivationEventContext()}
+ * @return <code>true</code> in case the page implement a catch all rules for the activate event context,
+ * <code>false</code> otherwise
+ */
+ boolean handleActivationEventContext();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
index c7f0477..e289ba5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
@@ -121,16 +121,16 @@ public interface MutableComponentModel extends ComponentModel
*/
void addEventHandler(String eventType);
- /**
- * Relevant for pages only, identifies that the component handle {@link org.apache.tapestry5.EventConstants.ACTIVATE}
- * events supporting one of the three special case for catch all rules:
- * <ul>
- * <li><code>{@link java.lang.Object}[]</code></li>
- * <li><code>{@link java.util.List}</code></li>
- * <li><code>{@link org.apache.tapestry5.EventContext}</code></li>
- * </ul>
- *
- * @since 5.4
- */
- void doHandleActivationEventContext();
+ /**
+ * Relevant for pages only, identifies that the component handle {@link org.apache.tapestry5.EventConstants.ACTIVATE}
+ * events supporting one of the three special case for catch all rules:
+ * <ul>
+ * <li><code>{@link java.lang.Object}[]</code></li>
+ * <li><code>{@link java.util.List}</code></li>
+ * <li><code>{@link org.apache.tapestry5.EventContext}</code></li>
+ * </ul>
+ *
+ * @since 5.4
+ */
+ void doHandleActivationEventContext();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/ActivationContextintegrationTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/ActivationContextintegrationTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/ActivationContextintegrationTests.java
index da6be55..2a0d2b5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/ActivationContextintegrationTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/ActivationContextintegrationTests.java
@@ -22,67 +22,67 @@ import org.testng.annotations.Test;
*/
public class ActivationContextintegrationTests extends TapestryCoreTestCase
{
- @Test
- public void no_context_correct()
- {
- openLinks("No context correct");
+ @Test
+ public void no_context_correct()
+ {
+ openLinks("No context correct");
- assertTextPresent("You are able to see me only without activation context");
- }
+ assertTextPresent("You are able to see me only without activation context");
+ }
- @Test
- public void no_context_error()
- {
- openLinks("No context error");
+ @Test
+ public void no_context_error()
+ {
+ openLinks("No context error");
- assertTextPresent("HTTP ERROR 404");
- }
+ assertTextPresent("HTTP ERROR 404");
+ }
- @Test
- public void one_context_without()
- {
- openLinks("One context without");
+ @Test
+ public void one_context_without()
+ {
+ openLinks("One context without");
- assertTextPresent("HTTP ERROR 404");
- }
+ assertTextPresent("HTTP ERROR 404");
+ }
- @Test
- public void one_context_with_one()
- {
- openLinks("One context correct");
+ @Test
+ public void one_context_with_one()
+ {
+ openLinks("One context correct");
- assertTextPresent("You are able to see me only with one parameter in the activation context");
- }
+ assertTextPresent("You are able to see me only with one parameter in the activation context");
+ }
- @Test
- public void one_context_with_two()
- {
- openLinks("One context error");
+ @Test
+ public void one_context_with_two()
+ {
+ openLinks("One context error");
- assertTextPresent("HTTP ERROR 404");
- }
+ assertTextPresent("HTTP ERROR 404");
+ }
- @Test
- public void two_context_without()
- {
- openLinks("Two context without");
+ @Test
+ public void two_context_without()
+ {
+ openLinks("Two context without");
- assertTextPresent("HTTP ERROR 404");
- }
+ assertTextPresent("HTTP ERROR 404");
+ }
- @Test
- public void two_context_with_one()
- {
- openLinks("Two context error");
+ @Test
+ public void two_context_with_one()
+ {
+ openLinks("Two context error");
- assertTextPresent("HTTP ERROR 404");
- }
+ assertTextPresent("HTTP ERROR 404");
+ }
- @Test
- public void two_context_with_two()
- {
- openLinks("Two context correct");
+ @Test
+ public void two_context_with_two()
+ {
+ openLinks("Two context correct");
- assertTextPresent("You are able to see me only with two parameters in the activation context");
- }
+ assertTextPresent("You are able to see me only with two parameters in the activation context");
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/Index.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/Index.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/Index.java
index 39dc050..b91111c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/Index.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/Index.java
@@ -20,11 +20,11 @@ package org.apache.tapestry5.integration.activationctx.pages;
public class Index
{
- public String[] getTwoValues()
- {
- return new String[] {
- "One",
- "Two"
- };
- }
+ public String[] getTwoValues()
+ {
+ return new String[] {
+ "One",
+ "Two"
+ };
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/OneContext.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/OneContext.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/OneContext.java
index e49070a..c78fa66 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/OneContext.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/OneContext.java
@@ -20,6 +20,6 @@ import org.apache.tapestry5.annotations.UnknownActivationContextCheck;
@UnknownActivationContextCheck
public class OneContext
{
- @PageActivationContext
- private String activationContext;
+ @PageActivationContext
+ private String activationContext;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/TwoContext.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/TwoContext.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/TwoContext.java
index 74f73a8..27c4786 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/TwoContext.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/pages/TwoContext.java
@@ -19,8 +19,8 @@ import org.apache.tapestry5.annotations.UnknownActivationContextCheck;
@UnknownActivationContextCheck
public class TwoContext
{
- void onActivate(String one, String two)
- {
- // Do some nifty stuff...
- }
+ void onActivate(String one, String two)
+ {
+ // Do some nifty stuff...
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/services/AppModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/services/AppModule.java
index ca1e777..eede5c8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/services/AppModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx/services/AppModule.java
@@ -22,9 +22,9 @@ import org.apache.tapestry5.ioc.MappedConfiguration;
*/
public class AppModule
{
- public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
- {
- configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en,fr");
- configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
- }
+ public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
+ {
+ configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en,fr");
+ configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/ActivationContextIntegrationTests2.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/ActivationContextIntegrationTests2.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/ActivationContextIntegrationTests2.java
index 1939788..75b7b37 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/ActivationContextIntegrationTests2.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/ActivationContextIntegrationTests2.java
@@ -22,43 +22,43 @@ import org.testng.annotations.Test;
*/
public class ActivationContextIntegrationTests2 extends TapestryCoreTestCase
{
- @Test
- public void checked_context_correct()
- {
- openLinks("Context checked correct");
+ @Test
+ public void checked_context_correct()
+ {
+ openLinks("Context checked correct");
- assertTextPresent("You are able to see me only without activation context");
- }
+ assertTextPresent("You are able to see me only without activation context");
+ }
- @Test
- public void checked_context_error()
- {
- openLinks("Context checked error");
+ @Test
+ public void checked_context_error()
+ {
+ openLinks("Context checked error");
- assertTextPresent("HTTP ERROR 404");
- }
+ assertTextPresent("HTTP ERROR 404");
+ }
- @Test
- public void unchecked_context_empty()
- {
- openLinks("Context unchecked without");
+ @Test
+ public void unchecked_context_empty()
+ {
+ openLinks("Context unchecked without");
- assertTextPresent("You are able to see with all context you like...");
- }
+ assertTextPresent("You are able to see with all context you like...");
+ }
- @Test
- public void unchecked_context_one()
- {
- openLinks("Context unchecked with one");
+ @Test
+ public void unchecked_context_one()
+ {
+ openLinks("Context unchecked with one");
- assertTextPresent("You are able to see with all context you like...");
- }
+ assertTextPresent("You are able to see with all context you like...");
+ }
- @Test
- public void unchecked_context_two()
- {
- openLinks("Context unchecked with two");
+ @Test
+ public void unchecked_context_two()
+ {
+ openLinks("Context unchecked with two");
- assertTextPresent("You are able to see with all context you like...");
- }
+ assertTextPresent("You are able to see with all context you like...");
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/pages/Index.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/pages/Index.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/pages/Index.java
index ca5276a..58b469a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/pages/Index.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/pages/Index.java
@@ -22,11 +22,11 @@ import org.apache.tapestry5.annotations.UnknownActivationContextCheck;
@UnknownActivationContextCheck(false)
public class Index
{
- public String[] getTwoValues()
- {
- return new String[] {
- "One",
- "Two"
- };
- }
+ public String[] getTwoValues()
+ {
+ return new String[] {
+ "One",
+ "Two"
+ };
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/services/AppModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/services/AppModule.java
index 3ff209d..720e69b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/services/AppModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/activationctx2/services/AppModule.java
@@ -23,13 +23,13 @@ import org.apache.tapestry5.ioc.MappedConfiguration;
*/
public class AppModule
{
- public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
- {
- configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en");
- configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
- configuration.add(SymbolConstants.COMPRESS_WHITESPACE, "false");
+ public static void contributeApplicationDefaults(MappedConfiguration<String, String> configuration)
+ {
+ configuration.add(SymbolConstants.SUPPORTED_LOCALES, "en");
+ configuration.add(SymbolConstants.PRODUCTION_MODE, "false");
+ configuration.add(SymbolConstants.COMPRESS_WHITESPACE, "false");
- // Enable by default the check on activation context parameters
- configuration.add(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, "true");
- }
+ // Enable by default the check on activation context parameters
+ configuration.add(MetaDataConstants.UNKNOWN_ACTIVATION_CONTEXT_CHECK, "true");
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
index 9f14319..388ec13 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/CoreBehaviorsTests.java
@@ -1682,27 +1682,27 @@ public class CoreBehaviorsTests extends App1TestCase
assertTextPresent("Component Event Link Decorated: true");
}
- /**
- * TAP5-2070
- */
- @Test
- public void unknown_activation_context_demo()
- {
- openLinks("Unknown Activation Context Demo");
-
- assertText("//title", "Error 404 Activation context <EventContext: Unwanted, context>" +
- " unrecognized for page class org.apache.tapestry5.integration.app1.pages.UnknownActivationContextDemo");
- }
-
- /**
- * TAP5-2070
- */
- @Test
- public void known_activation_context_demo()
- {
- openLinks("Known Activation Context Demo");
-
- assertTextPresent("Page called with correct activation context",
- "You should never see me if use an erroneous activation context");
- }
+ /**
+ * TAP5-2070
+ */
+ @Test
+ public void unknown_activation_context_demo()
+ {
+ openLinks("Unknown Activation Context Demo");
+
+ assertText("//title", "Error 404 Activation context <EventContext: Unwanted, context>" +
+ " unrecognized for page class org.apache.tapestry5.integration.app1.pages.UnknownActivationContextDemo");
+ }
+
+ /**
+ * TAP5-2070
+ */
+ @Test
+ public void known_activation_context_demo()
+ {
+ openLinks("Known Activation Context Demo");
+
+ assertTextPresent("Page called with correct activation context",
+ "You should never see me if use an erroneous activation context");
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
index 37876a6..a45d1ed 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java
@@ -1038,25 +1038,25 @@ public class FormTests extends App1TestCase
@Test
public void create_select_model_from_objects() throws Exception
{
- openLinks("SelectModel from objects");
-
- select("track", "label=The Calling");
-
- clickAndWait(SUBMIT);
-
- assertTextPresent("Selected track: The Calling, Synaesthetic");
+ openLinks("SelectModel from objects");
+
+ select("track", "label=The Calling");
+
+ clickAndWait(SUBMIT);
+
+ assertTextPresent("Selected track: The Calling, Synaesthetic");
}
@Test
public void create_select_model_coercion() throws Exception
{
- openLinks("SelectModel coercion");
-
- select("track", "label=The Calling");
-
- clickAndWait(SUBMIT);
-
- assertTextPresent("Selected track: The Calling, Synaesthetic");
+ openLinks("SelectModel coercion");
+
+ select("track", "label=The Calling");
+
+ clickAndWait(SUBMIT);
+
+ assertTextPresent("Selected track: The Calling, Synaesthetic");
}
@Test
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GeneralComponentTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GeneralComponentTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GeneralComponentTests.java
index 96f896c..4fc65db 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GeneralComponentTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/GeneralComponentTests.java
@@ -86,27 +86,27 @@ public class GeneralComponentTests extends App1TestCase
/** TAP5-1378 */
@Test public void using_delegate_for_inline_components() {
- openLinks("Inline Delegate");
-
- // no params
- assertText("block1", "block 1");
-
- // multiple renders w/ multiple parameters
- assertText("xpath=(//p[@class='superhero'])[1]", "Steve Rogers");
- assertText("xpath=(//p[@class='superhero'])[2]", "Bruce Banner");
+ openLinks("Inline Delegate");
+
+ // no params
+ assertText("block1", "block 1");
+
+ // multiple renders w/ multiple parameters
+ assertText("xpath=(//p[@class='superhero'])[1]", "Steve Rogers");
+ assertText("xpath=(//p[@class='superhero'])[2]", "Bruce Banner");
}
/** TAP5-742 */
@Test public void component_tracing_comments() throws Exception {
- String contents = IOUtils.toString(new URL(getBaseURL()).openStream());
-
- // off by default
- assertFalse(contents.contains("Index:loop"));
- assertFalse(contents.contains("Index:pagelink"));
-
- // enable with a query parameter
- contents = IOUtils.toString(new URL(getBaseURL() + "?t:component-trace=true").openStream());
- assertTrue(contents.contains("Index:loop"));
- assertTrue(contents.contains("Index:pagelink"));
+ String contents = IOUtils.toString(new URL(getBaseURL()).openStream());
+
+ // off by default
+ assertFalse(contents.contains("Index:loop"));
+ assertFalse(contents.contains("Index:pagelink"));
+
+ // enable with a query parameter
+ contents = IOUtils.toString(new URL(getBaseURL() + "?t:component-trace=true").openStream());
+ assertTrue(contents.contains("Index:loop"));
+ assertTrue(contents.contains("Index:pagelink"));
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/EchoValueWithId.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/EchoValueWithId.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/EchoValueWithId.java
index e7bc894..3b2ba76 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/EchoValueWithId.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/EchoValueWithId.java
@@ -27,9 +27,9 @@ import org.apache.tapestry5.annotations.Parameter;
*/
public class EchoValueWithId
{
- @Parameter
- private String id;
-
+ @Parameter
+ private String id;
+
@BindParameter
private String value;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
index 96b7bd9..32afdf3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
@@ -40,14 +40,14 @@ public class Index
public final String pageName;
public final String label;
public final String description;
- public final Object[] context;
+ public final Object[] context;
public Item(String pageName, String label, String description, Object... context)
{
this.pageName = pageName;
this.label = label;
this.description = description;
- this.context = context;
+ this.context = context;
}
public int compareTo(Item o)
@@ -333,7 +333,7 @@ public class Index
"passing explicit context in a page render link"),
new Item("pagecontextinform", "Page Context in Form", "passivate/activate page context in Form",
- "betty", "wilma", "context with spaces", "context/with/slashes"),
+ "betty", "wilma", "context with spaces", "context/with/slashes"),
new Item("ValidBeanEditorDemo", "Client Validation Demo", "BeanEditor with validation enabled"),
@@ -543,11 +543,11 @@ public class Index
new Item("FormLinkParameters", "FormLinkParameters Demo", "Form link parameters should be unescaped for a hidden field"),
- new Item("KnownActivationContextDemo", "Known Activation Context Demo", "Page is displayed normally if called without context (TAP5-2070)",
- "Exact"),
+ new Item("KnownActivationContextDemo", "Known Activation Context Demo", "Page is displayed normally if called without context (TAP5-2070)",
+ "Exact"),
- new Item("UnknownActivationContextDemo", "Unknown Activation Context Demo", "Page refuse to serve if called with an unknown activation context (TAP5-2070)",
- "Unwanted", "context"),
+ new Item("UnknownActivationContextDemo", "Unknown Activation Context Demo", "Page refuse to serve if called with an unknown activation context (TAP5-2070)",
+ "Unwanted", "context"),
new Item("ModuleConfigurationCallbackDemo", "ModuleConfigurationCallback Demo", "Shows an example of changing the Require.js configuration using JavaScriptSupport.addModuleConfigurationDemo()"),
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/KnownActivationContextDemo.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/KnownActivationContextDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/KnownActivationContextDemo.java
index 8e10172..41ec729 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/KnownActivationContextDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/KnownActivationContextDemo.java
@@ -22,7 +22,7 @@ import org.apache.tapestry5.annotations.UnknownActivationContextCheck;
@UnknownActivationContextCheck
public class KnownActivationContextDemo
{
- @PageActivationContext
- @Property
- private String activationContext;
+ @PageActivationContext
+ @Property
+ private String activationContext;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
index 3265a33..0c89ead 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
@@ -27,7 +27,7 @@ public class PageContextInForm
Object[] onPassivate()
{
- return activationContext;
+ return activationContext;
}
public Object[] getActivationContext()
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelectModelCoercionDemo.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelectModelCoercionDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelectModelCoercionDemo.java
index 131b186..a45a8a6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelectModelCoercionDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SelectModelCoercionDemo.java
@@ -18,7 +18,7 @@ public class SelectModelCoercionDemo
private Track track;
public List<Track> getTracks(){
- return library.getTracks();
+ return library.getTracks();
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidatorMacroDemo.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidatorMacroDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidatorMacroDemo.java
index bde2023..e804d6b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidatorMacroDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidatorMacroDemo.java
@@ -19,12 +19,12 @@ import org.apache.tapestry5.beaneditor.Validate;
public class ValidatorMacroDemo
{
- @Property
- @Persist
- private String password;
-
- @Property
- @Persist
- @Validate("password")
- private String password2;
+ @Property
+ @Persist
+ private String password;
+
+ @Property
+ @Persist
+ @Validate("password")
+ private String password2;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java
index 0f5a5b7..d1849fe 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java
@@ -295,10 +295,10 @@ public class AppModule
{
configuration.add(Track.class, new ValueLabelProvider<Track>() {
- public String getLabel(Track value) {
- return value.getTitle();
- }
- });
+ public String getLabel(Track value) {
+ return value.getTitle();
+ }
+ });
}
@Contribute(ComponentClassResolver.class)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/5b3d81aa/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
index 4629bb6..53e57dd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
@@ -56,7 +56,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -83,7 +83,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Logger logger = mockLogger();
Object result = new Object();
ComponentPageElementResources resources = mockResources();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -107,7 +107,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -128,7 +128,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -151,7 +151,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
EventContext context = mockEventContext();
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -175,7 +175,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Integer value = new Integer(27);
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, false);
@@ -200,7 +200,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
EventContext context = mockEventContext();
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -232,7 +232,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
EventContext context = mockEventContext();
ComponentPageElementResources resources = mockComponentPageElementResources();
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -270,7 +270,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
Object result = new Object();
String methodDescription = "foo.Bar.baz()";
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
EasyMock.expectLastCall().atLeastOnce();
@@ -306,7 +306,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
ComponentPageElementResources resources = mockResources();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -331,7 +331,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
{
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
logger.debug(eq(TapestryMarkers.EVENT_HANDLER_METHOD), isA(String.class));
@@ -357,7 +357,7 @@ public class ComponentEventImplTest extends InternalBaseTestCase
ComponentEventCallback handler = mockComponentEventHandler();
Logger logger = mockLogger();
ComponentPageElementResources resources = mockResources();
- ComponentModel model = mockComponentModel();
+ ComponentModel model = mockComponentModel();
train_isDebugEnabled(logger, true);
EasyMock.expectLastCall().atLeastOnce();