diff --git a/spring-binding/src/test/java/org/springframework/binding/convert/service/ConversionExecutorImplTests.java b/spring-binding/src/test/java/org/springframework/binding/convert/service/StaticConversionExecutorImplTests.java similarity index 88% rename from spring-binding/src/test/java/org/springframework/binding/convert/service/ConversionExecutorImplTests.java rename to spring-binding/src/test/java/org/springframework/binding/convert/service/StaticConversionExecutorImplTests.java index dfbe1e6b..7b664000 100644 --- a/spring-binding/src/test/java/org/springframework/binding/convert/service/ConversionExecutorImplTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/convert/service/StaticConversionExecutorImplTests.java @@ -21,12 +21,8 @@ import junit.framework.TestCase; import org.springframework.binding.convert.ConversionException; import org.springframework.binding.convert.converters.AbstractConverter; -import org.springframework.binding.convert.service.StaticConversionExecutor; -/** - * Test case for {@link StaticConversionExecutor}. - */ -public class ConversionExecutorImplTests extends TestCase { +public class StaticConversionExecutorImplTests extends TestCase { private StaticConversionExecutor conversionExecutor; diff --git a/spring-binding/src/test/java/org/springframework/binding/mapping/MappingTests.java b/spring-binding/src/test/java/org/springframework/binding/mapping/MappingTests.java index 7a493a17..92098296 100644 --- a/spring-binding/src/test/java/org/springframework/binding/mapping/MappingTests.java +++ b/spring-binding/src/test/java/org/springframework/binding/mapping/MappingTests.java @@ -17,9 +17,6 @@ package org.springframework.binding.mapping; import junit.framework.TestCase; -/** - * Unit tests for the {@link org.springframework.binding.mapping.RequiredMapping}. - */ public class MappingTests extends TestCase { public void testMapping() { diff --git a/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java b/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java index 01fdce43..c607e401 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java @@ -22,7 +22,7 @@ import org.springframework.faces.model.OneSelectionTrackingListDataModel; * Web Flow converters. * *

- * In addition to the standard Web Flow conversion, this service provide conversion from a {@link List} into a + * In addition to the standard Web Flow conversion, this service provide conversion from a list into a * {@link OneSelectionTrackingListDataModel} using a "dataModel" alias for the type. *

* diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java index 59911c38..0687cb07 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java @@ -27,7 +27,7 @@ import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** - * {@link Renderer} for the {@code } tag. + * Renderer for the {@code } tag. * * @author Jeremy Grelle * diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseComponentRenderer.java index 5ecb09ea..449a270a 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseComponentRenderer.java @@ -22,6 +22,7 @@ import java.util.Map; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import javax.faces.render.Renderer; /** * Base {@link Renderer} for typical faces components, handling the rendering for common {@link UIComponent} attributes. diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java index 429eb92d..8b4a6fc4 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java @@ -19,6 +19,7 @@ import java.io.IOException; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlTagRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlTagRenderer.java index 9e9dc68b..c915f38f 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlTagRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlTagRenderer.java @@ -105,13 +105,11 @@ abstract class BaseHtmlTagRenderer extends Renderer { protected abstract String getRenderedTagName(UIComponent component); /** - * @param component TODO * @return an array of the tag attributes to be rendered */ protected abstract String[] getAttributesToRender(UIComponent component); /** - * @param component TODO * @return a map that returns the bean property name for any attribute that doesn't map directly (i.e., the 'class' * attribute maps to the 'styleClass' bean property) */ @@ -120,8 +118,7 @@ abstract class BaseHtmlTagRenderer extends Renderer { }; /** - * @param component TODO - * @return a map of registered {@link RenderAttributeCallback}s for attributes that require special rendering logic + * @return a map of registered RenderAttributeCallbacks for attributes that require special rendering logic */ protected Map getAttributeCallbacks(UIComponent component) { return Collections.EMPTY_MAP; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java index a8b9a3bc..bb8c857c 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java @@ -19,6 +19,7 @@ import java.io.IOException; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DelegatingViewRoot.java b/spring-faces/src/main/java/org/springframework/faces/ui/DelegatingViewRoot.java index ff3e3d90..1be132d4 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DelegatingViewRoot.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DelegatingViewRoot.java @@ -68,7 +68,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIViewRoot#createUniqueId() */ public String createUniqueId() { @@ -121,7 +120,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param expr - * @return * @see javax.faces.component.UIComponentBase#findComponent(java.lang.String) */ public UIComponent findComponent(String expr) { @@ -129,7 +127,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIViewRoot#getAfterPhaseListener() */ public MethodExpression getAfterPhaseListener() { @@ -137,7 +134,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getAttributes() */ public Map getAttributes() { @@ -145,7 +141,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIViewRoot#getBeforePhaseListener() */ public MethodExpression getBeforePhaseListener() { @@ -153,7 +148,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getChildCount() */ public int getChildCount() { @@ -161,7 +155,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getChildren() */ public List getChildren() { @@ -170,7 +163,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param context - * @return * @see javax.faces.component.UIComponentBase#getClientId(javax.faces.context.FacesContext) */ public String getClientId(FacesContext context) { @@ -179,7 +171,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param ctx - * @return * @see javax.faces.component.UIComponent#getContainerClientId(javax.faces.context.FacesContext) */ public String getContainerClientId(FacesContext ctx) { @@ -188,7 +179,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param name - * @return * @see javax.faces.component.UIComponentBase#getFacet(java.lang.String) */ public UIComponent getFacet(String name) { @@ -196,7 +186,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getFacetCount() */ public int getFacetCount() { @@ -204,7 +193,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getFacets() */ public Map getFacets() { @@ -212,7 +200,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getFacetsAndChildren() */ public Iterator getFacetsAndChildren() { @@ -220,7 +207,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIViewRoot#getFamily() */ public String getFamily() { @@ -228,7 +214,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getId() */ public String getId() { @@ -236,7 +221,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIViewRoot#getLocale() */ public Locale getLocale() { @@ -244,7 +228,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getParent() */ public UIComponent getParent() { @@ -252,7 +235,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getRendererType() */ public String getRendererType() { @@ -260,7 +242,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIViewRoot#getRenderKitId() */ public String getRenderKitId() { @@ -268,7 +249,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#getRendersChildren() */ public boolean getRendersChildren() { @@ -277,7 +257,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param name - * @return * @deprecated * @see javax.faces.component.UIComponentBase#getValueBinding(java.lang.String) */ @@ -287,7 +266,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param name - * @return * @see javax.faces.component.UIComponent#getValueExpression(java.lang.String) */ public ValueExpression getValueExpression(String name) { @@ -295,7 +273,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIViewRoot#getViewId() */ public String getViewId() { @@ -306,7 +283,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { * @param context * @param clientId * @param callback - * @return * @throws FacesException * @see javax.faces.component.UIComponentBase#invokeOnComponent(javax.faces.context.FacesContext, java.lang.String, * javax.faces.component.ContextCallback) @@ -317,7 +293,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#isRendered() */ public boolean isRendered() { @@ -325,7 +300,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @return * @see javax.faces.component.UIComponentBase#isTransient() */ public boolean isTransient() { @@ -333,7 +307,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { } /** - * @param context * @see javax.faces.component.UIViewRoot#processApplication(javax.faces.context.FacesContext) */ public void processApplication(FacesContext context) { @@ -360,7 +333,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param context - * @return * @see javax.faces.component.UIComponentBase#processSaveState(javax.faces.context.FacesContext) */ public Object processSaveState(FacesContext context) { @@ -410,7 +382,6 @@ public abstract class DelegatingViewRoot extends UIViewRoot { /** * @param facesContext - * @return * @see javax.faces.component.UIViewRoot#saveState(javax.faces.context.FacesContext) */ public Object saveState(FacesContext facesContext) { diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java index 7f714faa..f11825b3 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java @@ -15,8 +15,6 @@ */ package org.springframework.faces.webflow; -import java.io.IOException; - import javax.faces.FacesException; import javax.faces.FactoryFinder; import javax.faces.context.FacesContext; @@ -71,7 +69,7 @@ public class FlowLifecycle extends Lifecycle { /** * Delegates to the wrapped {@link Lifecycle}. - * @throws IOException + * @throws FacesException */ public void render(FacesContext context) throws FacesException { delegate.render(context); diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java index 68a3beef..9815f939 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfFinalResponseActionTests.java @@ -1,7 +1,6 @@ package org.springframework.faces.webflow; import java.io.IOException; -import java.io.StringWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -49,8 +48,6 @@ public class JsfFinalResponseActionTests extends TestCase { private PhaseListener trackingListener; - private StringWriter output = new StringWriter(); - ExpressionParser parser = new WebFlowELExpressionParser(new ExpressionFactoryImpl()); protected void setUp() throws Exception { diff --git a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewTests.java b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewTests.java index 6471be55..d68d5aa5 100644 --- a/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewTests.java +++ b/spring-faces/src/test/java/org/springframework/faces/webflow/JsfViewTests.java @@ -18,10 +18,7 @@ import org.apache.shale.test.mock.MockResponseWriter; import org.apache.shale.test.mock.MockStateManager; import org.easymock.EasyMock; import org.springframework.faces.ui.AjaxViewRoot; -import org.springframework.webflow.core.collection.LocalAttributeMap; import org.springframework.webflow.core.collection.MutableAttributeMap; -import org.springframework.webflow.definition.FlowDefinition; -import org.springframework.webflow.definition.StateDefinition; import org.springframework.webflow.execution.FlowExecutionContext; import org.springframework.webflow.execution.FlowExecutionKey; import org.springframework.webflow.execution.RequestContext; @@ -260,37 +257,4 @@ public class JsfViewTests extends TestCase { executed = true; } } - - private class ModalViewState implements StateDefinition { - - MutableAttributeMap attrs = new LocalAttributeMap(); - - public boolean isViewState() { - return true; - } - - public ModalViewState() { - attrs.asMap().put("modal", Boolean.TRUE); - } - - public String getId() { - throw new UnsupportedOperationException("Auto-generated method stub"); - } - - public FlowDefinition getOwner() { - throw new UnsupportedOperationException("Auto-generated method stub"); - } - - public MutableAttributeMap getAttributes() { - return attrs; - } - - public String getCaption() { - throw new UnsupportedOperationException("Auto-generated method stub"); - } - - public String getDescription() { - throw new UnsupportedOperationException("Auto-generated method stub"); - } - } } diff --git a/spring-webflow-samples/booking-portlet-faces/.classpath b/spring-webflow-samples/booking-portlet-faces/.classpath index 86a64422..586c7ad0 100644 --- a/spring-webflow-samples/booking-portlet-faces/.classpath +++ b/spring-webflow-samples/booking-portlet-faces/.classpath @@ -6,7 +6,5 @@ - - diff --git a/spring-webflow/src/test/java/org/springframework/webflow/action/DispatchMethodInvokerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/action/DispatchMethodInvokerTests.java index 7a768a44..324bc73c 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/action/DispatchMethodInvokerTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/action/DispatchMethodInvokerTests.java @@ -15,37 +15,10 @@ */ package org.springframework.webflow.action; -import org.springframework.webflow.action.DispatchMethodInvoker; - import junit.framework.TestCase; -/** - * Unit tests for {@link DispatchMethodInvoker}. - * - * @author Ben Hale - */ public class DispatchMethodInvokerTests extends TestCase { - private class MockClass { - private boolean methodCalled = false; - - public boolean getMethodCalled() { - return methodCalled; - } - - public void argumentMethod(Object o) { - methodCalled = true; - } - - public void noArgumentMethod() { - methodCalled = true; - } - - public void exceptionMethod(Object o) throws Exception { - throw new Exception("expected exception"); - } - } - private MockClass mockClass; protected void setUp() { @@ -79,4 +52,24 @@ public class DispatchMethodInvokerTests extends TestCase { } } + private class MockClass { + private boolean methodCalled = false; + + public boolean getMethodCalled() { + return methodCalled; + } + + public void argumentMethod(Object o) { + methodCalled = true; + } + + public void noArgumentMethod() { + methodCalled = true; + } + + public void exceptionMethod(Object o) throws Exception { + throw new Exception("expected exception"); + } + } + } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java index 59a5c188..a4a1fa77 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/config/FlowExecutorFactoryBeanTests.java @@ -48,8 +48,7 @@ public class FlowExecutorFactoryBeanTests extends TestCase { } }); factoryBean.afterPropertiesSet(); - FlowExecutor executor = (FlowExecutor) factoryBean.getObject(); - MockExternalContext context = new MockExternalContext(); + factoryBean.getObject(); } public void testGetFlowExecutorOptionsSpecified() throws Exception {