From 0ea3fc17c74f9a470f17a45089541d4b71d72f07 Mon Sep 17 00:00:00 2001 From: James Mitchell Date: Tue, 10 Oct 2006 00:02:56 +0000 Subject: [PATCH] WW-1453 Simple cleanup items - remove duplicate and/or unused imports - change static access to class, not instance git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@454565 13f79535-47bb-0310-9956-ffa450edef68 --- core/src/main/java/org/apache/struts2/components/Bean.java | 1 - .../main/java/org/apache/struts2/components/Component.java | 1 - core/src/main/java/org/apache/struts2/components/Date.java | 1 - .../src/main/java/org/apache/struts2/components/Debug.java | 1 - .../org/apache/struts2/components/IteratorComponent.java | 1 - core/src/main/java/org/apache/struts2/components/Push.java | 1 - core/src/main/java/org/apache/struts2/components/Set.java | 1 - core/src/main/java/org/apache/struts2/components/Text.java | 1 - .../struts2/config/StrutsXmlConfigurationProvider.java | 4 ---- .../org/apache/struts2/dispatcher/FilterDispatcher.java | 3 +-- .../apache/struts2/dispatcher/ServletRedirectResult.java | 1 - .../java/org/apache/struts2/dispatcher/SessionMap.java | 2 -- .../java/org/apache/struts2/dispatcher/VelocityResult.java | 1 - .../struts2/interceptor/TokenSessionStoreInterceptor.java | 1 - .../struts2/portlet/dispatcher/Jsr168Dispatcher.java | 4 ---- .../struts2/portlet/result/PortletVelocityResult.java | 1 - .../org/apache/struts2/util/InvocationSessionStore.java | 1 - core/src/main/java/org/apache/struts2/util/Sorter.java | 1 - .../apache/struts2/views/freemarker/FreemarkerManager.java | 1 - .../apache/struts2/views/freemarker/FreemarkerResult.java | 1 - .../struts2/views/freemarker/tags/CheckboxListModel.java | 1 - .../apache/struts2/views/freemarker/tags/StrutsModels.java | 1 - .../org/apache/struts2/views/jsp/StrutsBodyTagSupport.java | 1 - .../main/java/org/apache/struts2/views/jsp/TagUtils.java | 1 - .../java/org/apache/struts2/views/util/ContextUtil.java | 1 - .../org/apache/struts2/views/velocity/VelocityManager.java | 1 - .../java/org/apache/struts2/views/xslt/StringAdapter.java | 7 ++----- .../dispatcher/ServletActionRedirectResultTest.java | 1 - .../struts2/dispatcher/ServletRedirectResultTest.java | 1 - .../java/org/apache/struts2/dispatcher/SessionMapTest.java | 2 -- .../apache/struts2/dispatcher/StrutsResultSupportTest.java | 1 - .../org/apache/struts2/dispatcher/VelocityResultTest.java | 1 - .../struts2/dispatcher/mapper/DefaultActionMapperTest.java | 1 - .../apache/struts2/interceptor/TokenInterceptorTest.java | 1 - .../org/apache/struts2/portlet/util/StrutsUtilTest.java | 1 - .../java/org/apache/struts2/views/jsp/ActionTagTest.java | 1 - .../java/org/apache/struts2/views/jsp/ElseIfTagTest.java | 1 - .../java/org/apache/struts2/views/jsp/ElseTagTest.java | 1 - .../java/org/apache/struts2/views/jsp/TextTagTest.java | 1 - .../test/java/org/apache/struts2/views/jsp/ui/MockTag.java | 4 ++-- .../org/apache/struts2/views/util/ContextUtilTest.java | 1 - 41 files changed, 5 insertions(+), 55 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/components/Bean.java b/core/src/main/java/org/apache/struts2/components/Bean.java index fcb7b585b..b1dcaff90 100644 --- a/core/src/main/java/org/apache/struts2/components/Bean.java +++ b/core/src/main/java/org/apache/struts2/components/Bean.java @@ -26,7 +26,6 @@ import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.util.OgnlUtil; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Component.java b/core/src/main/java/org/apache/struts2/components/Component.java index 6e69ed0f3..3a6184167 100644 --- a/core/src/main/java/org/apache/struts2/components/Component.java +++ b/core/src/main/java/org/apache/struts2/components/Component.java @@ -39,7 +39,6 @@ import org.apache.struts2.views.util.UrlHelper; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.TextParseUtil; -import com.opensymphony.xwork2.util.ValueStack; /** * Base class to extend for UI components. diff --git a/core/src/main/java/org/apache/struts2/components/Date.java b/core/src/main/java/org/apache/struts2/components/Date.java index 721f035f5..cec6a6c2f 100644 --- a/core/src/main/java/org/apache/struts2/components/Date.java +++ b/core/src/main/java/org/apache/struts2/components/Date.java @@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.TextProvider; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/Debug.java b/core/src/main/java/org/apache/struts2/components/Debug.java index 7d6e5a174..4f1220be6 100644 --- a/core/src/main/java/org/apache/struts2/components/Debug.java +++ b/core/src/main/java/org/apache/struts2/components/Debug.java @@ -13,7 +13,6 @@ import org.apache.struts2.StrutsException; import com.opensymphony.xwork2.util.OgnlUtil; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java index de34d8d48..6b50da71e 100644 --- a/core/src/main/java/org/apache/struts2/components/IteratorComponent.java +++ b/core/src/main/java/org/apache/struts2/components/IteratorComponent.java @@ -23,7 +23,6 @@ import java.util.Iterator; import org.apache.struts2.util.MakeIterator; import org.apache.struts2.views.jsp.IteratorStatus; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/components/Push.java b/core/src/main/java/org/apache/struts2/components/Push.java index d1b55469b..378baeee2 100644 --- a/core/src/main/java/org/apache/struts2/components/Push.java +++ b/core/src/main/java/org/apache/struts2/components/Push.java @@ -19,7 +19,6 @@ package org.apache.struts2.components; import java.io.Writer; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index 9e4ea3dba..a8c8c3e14 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -19,7 +19,6 @@ package org.apache.struts2.components; import java.io.Writer; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/components/Text.java b/core/src/main/java/org/apache/struts2/components/Text.java index a81f75938..7485b4676 100644 --- a/core/src/main/java/org/apache/struts2/components/Text.java +++ b/core/src/main/java/org/apache/struts2/components/Text.java @@ -30,7 +30,6 @@ import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.util.TextUtils; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.TextProvider; -import com.opensymphony.xwork2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index d3f0fdb77..021bbd6a2 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -4,10 +4,7 @@ package org.apache.struts2.config; import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; @@ -18,7 +15,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.StrutsException; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java index 73152727d..6e9ffd016 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java @@ -51,7 +51,6 @@ import org.apache.struts2.dispatcher.mapper.ActionMapping; import com.opensymphony.xwork2.util.ClassLoaderUtil; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.XWorkException; /** * Master filter for Struts that handles four distinct @@ -221,7 +220,7 @@ public class FilterDispatcher implements Filter, StrutsStatics { mapper = ActionMapperFactory.getMapper(); mapping = mapper.getMapping(request, du.getConfigurationManager()); } catch (Exception ex) { - du.sendError(request, response, servletContext, response.SC_INTERNAL_SERVER_ERROR, ex); + du.sendError(request, response, servletContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, ex); ActionContextCleanUp.cleanUp(req); return; } diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java index 4b25f230d..86ddba8ce 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java @@ -24,7 +24,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.mapper.ActionMapperFactory; -import org.springframework.beans.factory.config.SetFactoryBean; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java index a6a34c38f..81fa69d29 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/SessionMap.java @@ -19,11 +19,9 @@ package org.apache.struts2.dispatcher; import java.io.Serializable; import java.util.AbstractMap; -import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; import java.util.HashSet; -import java.util.Iterator; import java.util.Map; import java.util.Set; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java index f1b1c9750..b4a4dd246 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java @@ -41,7 +41,6 @@ import org.apache.velocity.context.Context; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java index 4ee62d31f..faedeeb77 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/TokenSessionStoreInterceptor.java @@ -29,7 +29,6 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java b/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java index 19f01adec..321bff6dc 100644 --- a/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java +++ b/core/src/main/java/org/apache/struts2/portlet/dispatcher/Jsr168Dispatcher.java @@ -61,7 +61,6 @@ import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.config.ConfigurationException; -import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.util.LocalizedTextUtil; /** @@ -169,8 +168,6 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics, private Dispatcher dispatcherUtils; - private boolean devMode = false; - /** * Initialize the portlet with the init parameters from portlet.xml */ @@ -212,7 +209,6 @@ public class Jsr168Dispatcher extends GenericPortlet implements StrutsStatics, } if ("true".equalsIgnoreCase(Settings.get(StrutsConstants.STRUTS_DEVMODE))) { - devMode = true; Settings.set(StrutsConstants.STRUTS_I18N_RELOAD, "true"); Settings.set(StrutsConstants.STRUTS_CONFIGURATION_XML_RELOAD, "true"); } diff --git a/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java index 74c409317..313abdfbf 100644 --- a/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java +++ b/core/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java @@ -48,7 +48,6 @@ import org.apache.velocity.context.Context; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** * diff --git a/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java b/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java index 5ea382056..53119682c 100644 --- a/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java +++ b/core/src/main/java/org/apache/struts2/util/InvocationSessionStore.java @@ -24,7 +24,6 @@ import java.util.Map; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/util/Sorter.java b/core/src/main/java/org/apache/struts2/util/Sorter.java index 789425628..c1e929e01 100644 --- a/core/src/main/java/org/apache/struts2/util/Sorter.java +++ b/core/src/main/java/org/apache/struts2/util/Sorter.java @@ -19,7 +19,6 @@ package org.apache.struts2.util; import java.util.Comparator; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index 58bf2fc57..0a3c8d88a 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -40,7 +40,6 @@ import org.apache.struts2.views.util.ContextUtil; import com.opensymphony.xwork2.util.FileManager; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.ObjectFactory; -import com.opensymphony.xwork2.util.ValueStack; import freemarker.cache.FileTemplateLoader; import freemarker.cache.MultiTemplateLoader; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java index 8510054ce..326073493 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java @@ -33,7 +33,6 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import freemarker.template.Configuration; import freemarker.template.ObjectWrapper; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java index e57b7f64c..fb9e28438 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/CheckboxListModel.java @@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.components.CheckboxList; import org.apache.struts2.components.Component; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java index 58416ada9..298a8388e 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java @@ -20,7 +20,6 @@ package org.apache.struts2.views.freemarker.tags; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java index f1fa6bf94..8b7b7e5ce 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/StrutsBodyTagSupport.java @@ -25,7 +25,6 @@ import org.apache.struts2.util.FastByteArrayOutputStream; import org.apache.struts2.views.util.ContextUtil; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java index 998b86345..cb7c1d778 100644 --- a/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java +++ b/core/src/main/java/org/apache/struts2/views/jsp/TagUtils.java @@ -37,7 +37,6 @@ import org.apache.struts2.util.AttributeMap; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java index 56764d2ba..e3cf24072 100644 --- a/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java +++ b/core/src/main/java/org/apache/struts2/views/util/ContextUtil.java @@ -31,7 +31,6 @@ import org.apache.struts2.views.jsp.ui.OgnlTool; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** * Value Stack's Context related Utilities. diff --git a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java index efa1507c3..62477a8b9 100644 --- a/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java +++ b/core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java @@ -93,7 +93,6 @@ import org.apache.velocity.tools.view.servlet.ServletToolboxManager; import com.opensymphony.xwork2.ObjectFactory; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java index 2799c12a7..fe3a5eb52 100644 --- a/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java +++ b/core/src/main/java/org/apache/struts2/views/xslt/StringAdapter.java @@ -17,19 +17,16 @@ */ package org.apache.struts2.views.xslt; -import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; import java.util.List; -import javax.xml.parsers.ParserConfigurationException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.StrutsException; + import org.w3c.dom.Node; + import org.xml.sax.InputSource; -import org.xml.sax.SAXException; import com.opensymphony.xwork2.util.DomHelper; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java index ec4cbfd14..9db513fbc 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java @@ -33,7 +33,6 @@ import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.config.entities.ActionConfig; import com.opensymphony.xwork2.config.entities.ResultConfig; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; /** diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java index 664abae71..a9f9c7638 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java @@ -37,7 +37,6 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.config.ConfigurationManager; import com.opensymphony.xwork2.config.entities.PackageConfig; import com.opensymphony.xwork2.mock.MockActionInvocation; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java index 65b92e37b..e32c0c625 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/SessionMapTest.java @@ -18,7 +18,6 @@ package org.apache.struts2.dispatcher; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; @@ -33,7 +32,6 @@ import junit.framework.TestCase; import com.mockobjects.constraint.Constraint; import com.mockobjects.constraint.IsAnything; import com.mockobjects.constraint.IsEqual; -import com.mockobjects.dynamic.ConstraintMatcher; import com.mockobjects.dynamic.Mock; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java index 245be7fee..a370a58e4 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java @@ -23,7 +23,6 @@ import org.easymock.EasyMock; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; /** diff --git a/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java b/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java index 9059255e5..bbc18c079 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java @@ -29,7 +29,6 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java index 99df87a1b..ff0dd57f2 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java @@ -25,7 +25,6 @@ import org.apache.struts2.StrutsTestCase; import org.apache.struts2.dispatcher.ServletRedirectResult; import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; -import com.mockobjects.dynamic.Mock; import com.mockobjects.servlet.MockHttpServletRequest; import com.opensymphony.xwork2.Result; import com.opensymphony.xwork2.config.Configuration; diff --git a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java index d1852253e..ad17bfe37 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/TokenInterceptorTest.java @@ -35,7 +35,6 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ActionProxyFactory; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java b/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java index d781643ba..0bcf9da8d 100644 --- a/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java +++ b/core/src/test/java/org/apache/struts2/portlet/util/StrutsUtilTest.java @@ -32,7 +32,6 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockRequestDispatcher; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java index 42c7f7ff5..8e142c992 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java @@ -32,7 +32,6 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java index 00188029b..704440bb2 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseIfTagTest.java @@ -27,7 +27,6 @@ import org.apache.struts2.components.If; import com.mockobjects.servlet.MockJspWriter; import com.mockobjects.servlet.MockPageContext; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; /** diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java index 94281c637..51f236eaf 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ElseTagTest.java @@ -27,7 +27,6 @@ import org.apache.struts2.components.If; import com.mockobjects.servlet.MockJspWriter; import com.mockobjects.servlet.MockPageContext; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java index c64842101..d9af1f091 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/TextTagTest.java @@ -37,7 +37,6 @@ import com.mockobjects.servlet.MockJspWriter; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java index 89ac0fa12..25d7d8b48 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/MockTag.java @@ -95,7 +95,7 @@ public class MockTag extends BodyTagSupport { } public Map getParameters() { - return this.params; + return MockTag.params; } public void setString(String s) { @@ -107,7 +107,7 @@ public class MockTag extends BodyTagSupport { } public void addParameter(String key, Object value) { - this.params.put(key, value); + MockTag.params.put(key, value); } /** diff --git a/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java b/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java index 67c066a0d..1bdab60ef 100755 --- a/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java +++ b/core/src/test/java/org/apache/struts2/views/util/ContextUtilTest.java @@ -22,7 +22,6 @@ import junit.framework.TestCase; import org.apache.struts2.StrutsConstants; import org.apache.struts2.config.Settings; -import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory;