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 2007/09/15 18:46:19 UTC
svn commit: r575936 - in /tapestry/tapestry5/trunk: .settings/
tapestry-component-report/src/main/java/org/apache/tapestry/mojo/
tapestry-core/src/main/java/org/apache/tapestry/corelib/base/
tapestry-core/src/main/java/org/apache/tapestry/corelib/compo...
Author: hlship
Date: Sat Sep 15 09:46:17 2007
New Revision: 575936
URL: http://svn.apache.org/viewvc?rev=575936&view=rev
Log:
Change project build to enforce (as errors) some sloppy coding such as unused imports
Removed:
tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.ui.prefs
Modified:
tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs
tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/BeanEditFormTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SubmitTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InternalRegistry.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceResourcesImpl.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java
Modified: tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ tapestry/tapestry5/trunk/.settings/org.eclipse.jdt.core.prefs Sat Sep 15 09:46:17 2007
@@ -1,8 +1,8 @@
-#Mon Jul 30 09:36:58 PDT 2007
+#Sat Sep 15 07:54:57 PDT 2007
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=error
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=warning
@@ -22,8 +22,8 @@
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=error
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
@@ -33,6 +33,7 @@
org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -42,13 +43,13 @@
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java Sat Sep 15 09:46:17 2007
@@ -95,16 +95,19 @@
*/
private String workDirectory;
+ @Override
protected String getOutputDirectory()
{
return outputDirectory;
}
+ @Override
protected MavenProject getProject()
{
return project;
}
+ @Override
protected SiteRenderer getSiteRenderer()
{
return siteRenderer;
@@ -345,7 +348,7 @@
@SuppressWarnings("unchecked")
private String sourcePath()
{
- List<String> roots = (List<String>) project.getCompileSourceRoots();
+ List<String> roots = project.getCompileSourceRoots();
return toArgumentPath(roots);
}
@@ -401,7 +404,7 @@
@SuppressWarnings("unchecked")
private String classPath() throws MavenReportException
{
- List<Artifact> artifacts = (List<Artifact>) project.getCompileArtifacts();
+ List<Artifact> artifacts = project.getCompileArtifacts();
return artifactsToArgumentPath(artifacts);
}
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java Sat Sep 15 09:46:17 2007
@@ -18,7 +18,6 @@
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java Sat Sep 15 09:46:17 2007
@@ -240,4 +240,14 @@
{
return _decorator;
}
+
+ protected final void setDecorator(ValidationDecorator decorator)
+ {
+ _decorator = decorator;
+ }
+
+ protected final void setFormSupport(FormSupport formSupport)
+ {
+ _formSupport = formSupport;
+ }
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java Sat Sep 15 09:46:17 2007
@@ -14,37 +14,25 @@
package org.apache.tapestry.corelib.components;
-import java.util.Locale;
-
import org.apache.tapestry.Binding;
-import org.apache.tapestry.Block;
import org.apache.tapestry.ClientElement;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
import org.apache.tapestry.FormValidationControl;
-import org.apache.tapestry.Translator;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.Inject;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BeanBlockSource;
import org.apache.tapestry.services.BeanModelSource;
import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.PropertyEditContext;
-import org.apache.tapestry.services.TranslatorDefaultSource;
/**
- * A component that creates an entire form editting the properties of a particular bean. Inspired by
+ * A component that creates an entire form editing the properties of a particular bean. Inspired by
* <a href="http://www.trailsframework.org/">Trails</a> and <a
* href="http://beanform.sourceforge.net/">BeanForm</a> (both for Tapestry 4). Generates a simple
- * UI for editting the properties of a JavaBean, with the flavor of UI for each property (text
+ * UI for editing the properties of a JavaBean, with the flavor of UI for each property (text
* field, checkbox, drop down list) determined from the property type, and the order and validation
* for the properties determined from annotations on the property's getter and setter methods.
* <p>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/DTDToken.java Sat Sep 15 09:46:17 2007
@@ -57,6 +57,7 @@
return _systemId;
}
+ @Override
public String toString()
{
return String.format("DTD[name=%s; publicId=%s; systemId=%s]", _name, _publicId, _systemId);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/BeanModelSourceImpl.java Sat Sep 15 09:46:17 2007
@@ -28,7 +28,6 @@
import org.apache.tapestry.internal.beaneditor.BeanModelImpl;
import org.apache.tapestry.ioc.LoggerSource;
import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
import org.apache.tapestry.ioc.services.PropertyAccess;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextImpl.java Sat Sep 15 09:46:17 2007
@@ -66,13 +66,12 @@
{
String current = queue.pop();
- Set<String> matches = (Set<String>) _servletContext.getResourcePaths(current);
+ Set<String> matches = _servletContext.getResourcePaths(current);
// Tomcat 5.5.20 inside JBoss 4.0.2 has been observed to do this!
// Perhaps other servers do as well.
- if (matches == null)
- continue;
+ if (matches == null) continue;
for (String match : matches)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java Sat Sep 15 09:46:17 2007
@@ -34,7 +34,6 @@
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.apache.tapestry.ioc.util.StrategyRegistry;
import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentClassResolver;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Response;
@@ -44,8 +43,6 @@
private final Response _response;
- private final ComponentClassResolver _componentClassResolver;
-
private final ComponentInvocationMap _componentInvocationMap;
private final RequestPageCache _pageCache;
@@ -62,13 +59,11 @@
}
public LinkFactoryImpl(Request request, Response encoder,
- ComponentClassResolver componentClassResolver,
- ComponentInvocationMap componentInvocationMap, RequestPageCache pageCache,
- TypeCoercer typeCoercer)
+ ComponentInvocationMap componentInvocationMap,
+ RequestPageCache pageCache, TypeCoercer typeCoercer)
{
_request = request;
_response = encoder;
- _componentClassResolver = componentClassResolver;
_componentInvocationMap = componentInvocationMap;
_pageCache = pageCache;
_typeCoercer = typeCoercer;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RootPathDispatcher.java Sat Sep 15 09:46:17 2007
@@ -32,19 +32,16 @@
private final PageRenderRequestHandler _handler;
- private final PageResponseRenderer _renderer;
-
+
private final String _startPageName;
private final String[] _emptyContext = new String[0];
public RootPathDispatcher(final ComponentClassResolver componentClassResolver,
- final PageRenderRequestHandler handler, final PageResponseRenderer renderer,
- final String startPageName)
+ final PageRenderRequestHandler handler, final String startPageName)
{
_componentClassResolver = componentClassResolver;
_handler = handler;
- _renderer = renderer;
_startPageName = startPageName;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java Sat Sep 15 09:46:17 2007
@@ -38,9 +38,6 @@
SOFTWARE.
*/
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Collection;
import java.util.List;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
@@ -414,6 +411,7 @@
*
* @return a printable, displayable, transmittable representation of the array.
*/
+ @Override
public String toString()
{
try
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java Sat Sep 15 09:46:17 2007
@@ -38,8 +38,6 @@
SOFTWARE.
*/
-import java.io.IOException;
-import java.io.Writer;
import java.util.Map;
import java.util.Set;
@@ -115,6 +113,7 @@
*
* @return NULL.
*/
+ @Override
protected final Object clone()
{
return this;
@@ -127,6 +126,7 @@
* An object to test for nullness.
* @return true if the object parameter is the JSONObject.NULL object or null.
*/
+ @Override
public boolean equals(Object object)
{
return object == null || object == this;
@@ -137,6 +137,7 @@
*
* @return The string "null".
*/
+ @Override
public String toString()
{
return "null";
@@ -797,6 +798,7 @@
* beginning with <code>{</code> <small>(left brace)</small> and ending with
* <code>}</code> <small>(right brace)</small>.
*/
+ @Override
public String toString()
{
boolean comma = false;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java Sat Sep 15 09:46:17 2007
@@ -503,6 +503,7 @@
*
* @return " at character [myIndex] of [mySource]"
*/
+ @Override
public String toString()
{
return " at character " + _index + " of " + _source;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Sat Sep 15 09:46:17 2007
@@ -129,7 +129,6 @@
import org.apache.tapestry.internal.services.PageRenderDispatcher;
import org.apache.tapestry.internal.services.PageRenderRequestHandlerImpl;
import org.apache.tapestry.internal.services.PageRenderSupportImpl;
-import org.apache.tapestry.internal.services.PageResponseRenderer;
import org.apache.tapestry.internal.services.ParameterWorker;
import org.apache.tapestry.internal.services.PersistWorker;
import org.apache.tapestry.internal.services.PersistentFieldManagerImpl;
@@ -863,8 +862,6 @@
private final RequestPageCache _requestPageCache;
- private final PageResponseRenderer _pageResponseRenderer;
-
private final Environment _environment;
private final StrategyBuilder _strategyBuilder;
@@ -889,8 +886,6 @@
RequestPageCache requestPageCache,
- PageResponseRenderer pageResponseRenderer,
-
Environment environment,
StrategyBuilder strategyBuilder,
@@ -910,7 +905,6 @@
_applicationGlobals = applicationGlobals;
_chainBuilder = chainBuilder;
_requestPageCache = requestPageCache;
- _pageResponseRenderer = pageResponseRenderer;
_environment = environment;
_strategyBuilder = strategyBuilder;
_componentInstantiatorSource = componentInstantiatorSource;
@@ -1335,7 +1329,7 @@
// Looks for the root path and renders the start page
configuration.add("RootPath", new RootPathDispatcher(componentClassResolver,
- pageRenderRequestHandler, _pageResponseRenderer, startPageName), "before:Asset");
+ pageRenderRequestHandler, startPageName), "before:Asset");
// This goes first because an asset to be streamed may have an file extension, such as
// ".html", that will confuse the later dispatchers.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java Sat Sep 15 09:46:17 2007
@@ -82,6 +82,7 @@
import org.apache.tapestry.services.Context;
import org.apache.tapestry.services.Environment;
import org.apache.tapestry.services.FieldValidatorSource;
+import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Heartbeat;
import org.apache.tapestry.services.InjectionProvider;
import org.apache.tapestry.services.MethodFilter;
@@ -978,6 +979,11 @@
protected final void train_getPageName(ComponentResourcesCommon resources, String pageName)
{
expect(resources.getPageName()).andReturn(pageName).atLeastOnce();
+ }
+
+ protected final FormSupport mockFormSupport()
+ {
+ return newMock(FormSupport.class);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/BeanEditFormTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/BeanEditFormTest.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/BeanEditFormTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/BeanEditFormTest.java Sat Sep 15 09:46:17 2007
@@ -22,7 +22,6 @@
import org.apache.tapestry.integration.app1.data.RegistrationData;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.PropertyEditContext;
import org.apache.tapestry.services.BeanModelSource;
import org.apache.tapestry.services.Environment;
import org.apache.tapestry.test.TapestryTestCase;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SubmitTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SubmitTest.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SubmitTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SubmitTest.java Sat Sep 15 09:46:17 2007
@@ -105,12 +105,5 @@
heartbeat.end();
verify();
-
}
-
- protected final FormSupport mockFormSupport()
- {
- return newMock(FormSupport.class);
- }
-
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java Sat Sep 15 09:46:17 2007
@@ -27,9 +27,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.beaneditor.OrderBefore;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.services.ClassFactory;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java Sat Sep 15 09:46:17 2007
@@ -17,7 +17,6 @@
import org.apache.tapestry.annotations.BeforeRenderBody;
import org.apache.tapestry.beaneditor.OrderAfter;
import org.apache.tapestry.beaneditor.OrderBefore;
-import org.apache.tapestry.ioc.annotations.Symbol;
public class TargetBean extends DefaultComponent
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java Sat Sep 15 09:46:17 2007
@@ -148,8 +148,6 @@
ComponentResources resources = mockComponentResources();
Messages messages = mockMessages();
- Class propertyType = String.class;
-
train_getMessages(resources, messages);
stub_contains(messages, false);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/LinkFactoryImplTest.java Sat Sep 15 09:46:17 2007
@@ -27,7 +27,6 @@
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.internal.util.Holder;
import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.ComponentClassResolver;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Response;
import org.easymock.EasyMock;
@@ -124,7 +123,6 @@
{
Request request = mockRequest();
Response response = mockResponse();
- ComponentClassResolver resolver = mockComponentClassResolver();
Page page = mockPage();
ComponentPageElement rootElement = mockComponentPageElement();
LinkFactoryListener listener = mockLinkFactoryListener();
@@ -150,8 +148,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, resolver, map, null,
- _typeCoercer);
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, null, _typeCoercer);
factory.addListener(listener);
Link link = factory.createPageLink(page, false);
@@ -171,7 +168,6 @@
{
Request request = mockRequest();
Response response = mockResponse();
- ComponentClassResolver resolver = mockComponentClassResolver();
Page page = mockPage();
LinkFactoryListener listener = mockLinkFactoryListener();
ComponentInvocationMap map = mockComponentInvocationMap();
@@ -195,8 +191,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, resolver, map, null,
- _typeCoercer);
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, null, _typeCoercer);
factory.addListener(listener);
Link link = factory.createPageLink(page, false, "biff", "bazz");
@@ -216,7 +211,6 @@
{
Request request = mockRequest();
Response response = mockResponse();
- ComponentClassResolver resolver = mockComponentClassResolver();
Page page = mockPage();
LinkFactoryListener listener = mockLinkFactoryListener();
ComponentInvocationMap map = mockComponentInvocationMap();
@@ -239,8 +233,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, resolver, map, null,
- _typeCoercer);
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, null, _typeCoercer);
factory.addListener(listener);
Link link = factory.createPageLink(page, true);
@@ -259,7 +252,6 @@
{
Request request = mockRequest();
Response response = mockResponse();
- ComponentClassResolver resolver = mockComponentClassResolver();
Page page = mockPage();
ComponentPageElement rootElement = mockComponentPageElement();
LinkFactoryListener listener = mockLinkFactoryListener();
@@ -289,8 +281,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, resolver, map, cache,
- _typeCoercer);
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, _typeCoercer);
factory.addListener(listener);
Link link = factory.createPageLink(PAGE_LOGICAL_NAME, false);
@@ -385,7 +376,6 @@
{
Request request = mockRequest();
Response response = mockResponse();
- ComponentClassResolver resolver = mockComponentClassResolver();
ComponentPageElement element = mockComponentPageElement();
Page page = mockPage();
ComponentPageElement rootElement = mockComponentPageElement();
@@ -414,8 +404,7 @@
replay();
- LinkFactory factory = new LinkFactoryImpl(request, response, resolver, map, cache,
- _typeCoercer);
+ LinkFactory factory = new LinkFactoryImpl(request, response, map, cache, _typeCoercer);
factory.addListener(listener);
Link link = factory.createActionLink(element, eventName, false, context);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/PageRenderDispatcherTest.java Sat Sep 15 09:46:17 2007
@@ -37,7 +37,6 @@
public void not_a_page_request() throws Exception
{
ComponentClassResolver resolver = mockComponentClassResolver();
- PageResponseRenderer renderer = mockPageResponseRenderer();
RequestPageCache cache = mockRequestPageCache();
PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, null, null, null);
Request request = mockRequest();
@@ -61,7 +60,6 @@
public void empty_path() throws Exception
{
ComponentClassResolver resolver = mockComponentClassResolver();
- PageResponseRenderer renderer = mockPageResponseRenderer();
PageRenderRequestHandler handler = newMock(PageRenderRequestHandler.class);
Request request = mockRequest();
Response response = mockResponse();
@@ -120,7 +118,8 @@
replay();
- PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor, renderer, response);
+ PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor,
+ renderer, response);
Dispatcher d = new PageRenderDispatcher(resolver, handler);
@@ -168,7 +167,8 @@
replay();
- PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor, renderer, response);
+ PageRenderRequestHandler handler = new PageRenderRequestHandlerImpl(cache, processor,
+ renderer, response);
Dispatcher d = new PageRenderDispatcher(resolver, handler);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InternalRegistry.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InternalRegistry.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InternalRegistry.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/InternalRegistry.java Sat Sep 15 09:46:17 2007
@@ -18,12 +18,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectProvider;
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.ServiceDecorator;
import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.def.ServiceDef;
import org.apache.tapestry.ioc.services.ClassFab;
import org.apache.tapestry.ioc.services.RegistryShutdownHub;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceResourcesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceResourcesImpl.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceResourcesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/internal/ServiceResourcesImpl.java Sat Sep 15 09:46:17 2007
@@ -107,6 +107,7 @@
return getModule().getModuleBuilder();
}
+ @Override
public <T> T autobuild(Class<T> clazz)
{
notNull(clazz, "clazz");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry/ioc/services/CoercionTuple.java Sat Sep 15 09:46:17 2007
@@ -53,6 +53,7 @@
return _coercion.coerce(input);
}
+ @Override
public String toString()
{
return String.format("%s --> %s", convert(_sourceType), convert(_targetType));
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java Sat Sep 15 09:46:17 2007
@@ -20,6 +20,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.FieldValidator;
import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry.ValidationDecorator;
import org.apache.tapestry.ValidationException;
import org.apache.tapestry.ValidationTracker;
import org.apache.tapestry.annotations.Environmental;
@@ -105,6 +106,7 @@
_resources = resources;
}
+ @Override
protected void processSubmission(FormSupport formSupport, String elementName)
{
UploadedFile uploaded = _decoder.getFileUpload(elementName);
@@ -140,9 +142,9 @@
writer.element("input", "type", "file", "name", getElementName(), "id", getClientId());
_validate.render(writer);
-
+
_resources.renderInformalParameters(writer);
-
+
getValidationDecorator().insideField(this);
}
@@ -159,5 +161,19 @@
Binding defaultValue()
{
return createDefaultParameterBinding("value");
+ }
+
+ void injectDecorator(ValidationDecorator decorator)
+ {
+ setDecorator(decorator);
+ }
+
+ void injectFormSupport(FormSupport formSupport)
+ {
+ // We have our copy ...
+ _formSupport = formSupport;
+
+ // As does AbstractField
+ setFormSupport(formSupport);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParameterValue.java Sat Sep 15 09:46:17 2007
@@ -27,11 +27,13 @@
public static final ParameterValue NULL = new ParameterValue()
{
+ @Override
public String single()
{
return null;
}
+ @Override
public String[] multi()
{
return null;
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/ParametersServletRequestWrapper.java Sat Sep 15 09:46:17 2007
@@ -28,7 +28,7 @@
/**
* Wrapper for HttpServletRequest that overrides the parameter methods of the wrapped request. i.e.
- * parameters are retreived from the wrapper rather than the real request.
+ * parameters are retrieved from the wrapper rather than the real request.
*/
public class ParametersServletRequestWrapper extends HttpServletRequestWrapper
{
@@ -39,11 +39,13 @@
super(httpServletRequest);
}
+ @Override
public String getParameter(String name)
{
return getValueFor(name).single();
}
+ @Override
public Map<String, Object> getParameterMap()
{
Map<String, Object> paramMap = newMap();
@@ -58,11 +60,13 @@
return paramMap;
}
+ @Override
public Enumeration getParameterNames()
{
return Collections.enumeration(_parameters.keySet());
}
+ @Override
public String[] getParameterValues(String name)
{
return getValueFor(name).multi();
Modified: tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java?rev=575936&r1=575935&r2=575936&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/apache/tapestry/upload/components/UploadTest.java Sat Sep 15 09:46:17 2007
@@ -55,9 +55,8 @@
Upload component = new Upload(null, null, null, null, resources);
- setValidationDecorator(component, new StubValidationDecorator());
-
- setFormSupport(component, formSupport);
+ component.injectDecorator(new StubValidationDecorator());
+ component.injectFormSupport(formSupport);
component.beginRender(writer);
@@ -72,22 +71,11 @@
}
- protected final FormSupport mockFormSupport()
- {
- return newMock(FormSupport.class);
- }
-
- private void setFormSupport(Upload component, FormSupport formSupport)
- throws IllegalAccessException
- {
- setField(component, "_formSupport", formSupport);
- }
-
@Test
public void validation_decorator_invoked_inside_begin_render() throws Exception
{
getMocksControl().checkOrder(true);
-
+
ComponentResources resources = mockComponentResources();
Upload component = new Upload(null, null, null, null, resources);
MarkupWriter writer = createMarkupWriter();
@@ -95,11 +83,12 @@
FormSupport formSupport = mockFormSupport();
formSupport.setEncodingType(Upload.MULTIPART_ENCTYPE);
- setField(component, "_formSupport", formSupport);
+
+ component.injectFormSupport(formSupport);
ValidationDecorator decorator = mockValidationDecorator();
- setValidationDecorator(component, decorator);
+ component.injectDecorator(decorator);
resources.renderInformalParameters(writer);
decorator.insideField(component);
@@ -116,6 +105,7 @@
return newMock(ValidationDecorator.class);
}
+ @SuppressWarnings("unchecked")
@Test
public void begin_render_invokes_field_validator() throws Exception
{
@@ -129,11 +119,11 @@
FormSupport formSupport = mockFormSupport();
formSupport.setEncodingType(Upload.MULTIPART_ENCTYPE);
- setField(component, "_formSupport", formSupport);
+ component.injectFormSupport(formSupport);
ValidationDecorator decorator = mockValidationDecorator();
- setValidationDecorator(component, decorator);
+ component.injectDecorator(decorator);
validate.render(writer);
resources.renderInformalParameters(writer);
@@ -204,6 +194,7 @@
assertNull(component.getValue());
}
+ @SuppressWarnings("unchecked")
@Test
public void process_submission_calls_validator() throws Exception
{
@@ -224,6 +215,7 @@
verify();
}
+ @SuppressWarnings("unchecked")
@Test
public void process_submission_tracks_validator_errors() throws Exception
{
@@ -255,35 +247,5 @@
protected final MultipartDecoder mockMultipartDecoder()
{
return newMock(MultipartDecoder.class);
- }
-
- private void setValidationDecorator(Upload component, ValidationDecorator decorator)
- throws IllegalAccessException
- {
- setField(component, "_decorator", decorator);
- }
-
- private void setField(Object bean, String name, Object value) throws IllegalAccessException
- {
- Class clazz = bean.getClass();
- java.lang.reflect.Field field = null;
-
- while (field == null && clazz != null)
- {
- try
- {
- field = clazz.getDeclaredField(name);
- }
- catch (NoSuchFieldException e)
- {
- field = null;
- }
- clazz = clazz.getSuperclass();
- }
- if (field != null)
- {
- field.setAccessible(true);
- field.set(bean, value);
- }
}
}