jmitchell 2002/11/15 21:12:06
Modified: contrib/struts-el/src/test/org/apache/strutsel/taglib/utils
DOMHelper.java HashMapMessageResources.java
TestHelper.java
contrib/struts-el/src/test/org/apache/strutsel/taglib/html
TestELBaseTag.java TestELButtonTag.java
TestELCancelTag.java TestELCheckboxTag.java
TestELErrorsTag.java TestELFileTag.java
TestELFormTag.java TestELFrameTag.java
contrib/struts-el/src/test/org/apache/strutsel/taglib/logic
TestELMatchTag.java TestELNotMatchTag.java
Log:
Cleaning up imports - ok, I think I'm all finished now. I did this all
<snickering/> with Notepad.
Revision Changes Path
1.4 +16 -9
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/utils/DOMHelper.java
Index: DOMHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/utils/DOMHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DOMHelper.java 14 Oct 2002 03:21:34 -0000 1.3
+++ DOMHelper.java 16 Nov 2002 05:12:06 -0000 1.4
@@ -60,12 +60,19 @@
package org.apache.strutsel.taglib.utils;
-import java.util.*;
-import javax.xml.transform.*;
-import org.apache.xpath.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
-import org.apache.commons.logging.*;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.xml.transform.TransformerException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.xpath.CachedXPathAPI;
+import org.w3c.dom.Attr;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
public class DOMHelper {
1.3 +7 -7
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/utils/HashMapMessageResources.java
Index: HashMapMessageResources.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/utils/HashMapMessageResources.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HashMapMessageResources.java 28 Sep 2002 04:43:06 -0000 1.2
+++ HashMapMessageResources.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,11 +60,11 @@
package org.apache.strutsel.taglib.utils;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Locale;
-import org.apache.struts.util.*;
-
-import org.apache.strutsel.taglib.utils.*;
+import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.MessageResourcesFactory;
/**
1.3 +7 -7
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/utils/TestHelper.java
Index: TestHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/utils/TestHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestHelper.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestHelper.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,10 +60,10 @@
package org.apache.strutsel.taglib.utils;
-import java.io.*;
-import org.apache.cactus.*;
-import org.apache.commons.logging.*;
-import org.apache.strutsel.taglib.utils.*;
+import java.io.IOException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class TestHelper {
1.3 +15 -18
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELBaseTag.java
Index: TestELBaseTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELBaseTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELBaseTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELBaseTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,22 +60,19 @@
package org.apache.strutsel.taglib.html;
-import com.meterware.httpunit.*;
+import java.util.HashMap;
-import java.io.*;
-import java.util.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
-import junit.framework.*;
-
-import org.apache.cactus.*;
-import org.apache.struts.taglib.html.*;
-import org.apache.strutsel.taglib.utils.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
+import org.apache.strutsel.taglib.utils.TestHelper;
+import org.w3c.dom.Element;
public class TestELBaseTag
1.4 +12 -20
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELButtonTag.java
Index: TestELButtonTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELButtonTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestELButtonTag.java 12 Oct 2002 05:21:34 -0000 1.3
+++ TestELButtonTag.java 16 Nov 2002 05:12:06 -0000 1.4
@@ -60,26 +60,18 @@
package org.apache.strutsel.taglib.html;
-import com.meterware.httpunit.*;
+import java.util.HashMap;
-import java.io.*;
-import java.util.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.xml.transform.*;
-
-import junit.framework.*;
-
-import org.apache.cactus.*;
-import org.apache.struts.taglib.html.*;
-import org.apache.strutsel.taglib.utils.*;
-import org.apache.taglibs.standard.tag.common.core.*;
-import org.apache.taglibs.standard.tag.el.core.*;
import org.apache.struts.util.LabelValueBean;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
+import org.apache.strutsel.taglib.utils.TestHelper;
public class TestELButtonTag
1.3 +13 -21
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCancelTag.java
Index: TestELCancelTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCancelTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELCancelTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELCancelTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,25 +60,17 @@
package org.apache.strutsel.taglib.html;
-import com.meterware.httpunit.*;
+import java.util.HashMap;
-import java.io.*;
-import java.util.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.xml.transform.*;
-
-import junit.framework.*;
-
-import org.apache.cactus.*;
-import org.apache.struts.taglib.html.*;
-import org.apache.strutsel.taglib.utils.*;
-import org.apache.taglibs.standard.tag.common.core.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
+import org.apache.strutsel.taglib.utils.TestHelper;
public class TestELCancelTag
1.3 +12 -21
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCheckboxTag.java
Index: TestELCheckboxTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELCheckboxTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELCheckboxTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELCheckboxTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,27 +60,18 @@
package org.apache.strutsel.taglib.html;
-import com.meterware.httpunit.*;
+import java.util.HashMap;
-import java.io.*;
-import java.util.*;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.xml.transform.*;
-
-import junit.framework.*;
-
-import org.apache.cactus.*;
-import org.apache.struts.taglib.html.*;
-import org.apache.strutsel.taglib.utils.*;
-import org.apache.taglibs.standard.tag.common.core.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
import org.apache.strutsel.taglib.utils.TestFormBean;
+import org.apache.strutsel.taglib.utils.TestHelper;
public class TestELCheckboxTag
extends JspTagTestCase {
1.3 +19 -22
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELErrorsTag.java
Index: TestELErrorsTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELErrorsTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELErrorsTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELErrorsTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,25 +60,22 @@
package org.apache.strutsel.taglib.html;
-import com.meterware.httpunit.*;
-import java.io.*;
-import java.util.*;
-import java.util.logging.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.xml.transform.*;
-import junit.framework.*;
-import org.apache.cactus.*;
-import org.apache.commons.logging.*;
-import org.apache.commons.logging.impl.*;
-import org.apache.struts.action.*;
-import org.apache.struts.taglib.html.*;
-import org.apache.strutsel.taglib.utils.*;
-import org.apache.taglibs.standard.tag.common.core.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionErrors;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.HashMapMessageResources;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
+import org.apache.strutsel.taglib.utils.TestHelper;
public class TestELErrorsTag
1.3 +14 -21
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFileTag.java
Index: TestELFileTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFileTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELFileTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELFileTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,25 +60,18 @@
package org.apache.strutsel.taglib.html;
-import com.meterware.httpunit.*;
+import java.util.HashMap;
-import java.io.*;
-import java.util.*;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import junit.framework.Test;
+import junit.framework.TestSuite;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.xml.transform.*;
-
-import junit.framework.*;
-
-import org.apache.cactus.*;
-import org.apache.struts.taglib.html.*;
-import org.apache.strutsel.taglib.utils.*;
-import org.apache.taglibs.standard.tag.common.core.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
+import org.apache.strutsel.taglib.utils.TestFormBean;
+import org.apache.strutsel.taglib.utils.TestHelper;
public class TestELFileTag
1.3 +16 -19
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFormTag.java
Index: TestELFormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFormTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELFormTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELFormTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,30 +60,27 @@
package org.apache.strutsel.taglib.html;
-import java.util.Enumeration;
import java.util.HashMap;
-import org.apache.strutsel.taglib.utils.JspTagTestCase;
-import org.apache.strutsel.taglib.utils.TestHelper;
-import org.apache.strutsel.taglib.utils.DOMHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+
import javax.servlet.ServletException;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.GenericServlet;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.w3c.dom.Element;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionFormBean;
+import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.config.ApplicationConfig;
-import org.apache.struts.config.FormBeanConfig;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
+import org.apache.strutsel.taglib.utils.TestHelper;
+import org.w3c.dom.Element;
public class TestELFormTag extends JspTagTestCase
{
1.3 +15 -22
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFrameTag.java
Index: TestELFrameTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/html/TestELFrameTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELFrameTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELFrameTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,27 +60,20 @@
package org.apache.strutsel.taglib.html;
-import java.net.MalformedURLException;
-import org.apache.struts.action.ActionServlet;
-import org.apache.struts.config.ApplicationConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForward;
-
-import com.meterware.httpunit.*;
-import java.io.*;
-import java.util.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.xml.transform.*;
-import junit.framework.*;
-import org.apache.cactus.*;
-import org.apache.struts.taglib.html.*;
-import org.apache.strutsel.taglib.utils.*;
-import org.apache.taglibs.standard.tag.common.core.*;
-import org.apache.taglibs.standard.tag.el.core.*;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.apache.struts.action.ActionServlet;
+import org.apache.struts.config.ApplicationConfig;
+import org.apache.strutsel.taglib.utils.DOMHelper;
+import org.apache.strutsel.taglib.utils.JspTagTestCase;
+import org.apache.strutsel.taglib.utils.TestHelper;
public class TestELFrameTag
1.3 +10 -10
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELMatchTag.java
Index: TestELMatchTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELMatchTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELMatchTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELMatchTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,14 +60,14 @@
package org.apache.strutsel.taglib.logic;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import junit.framework.*;
-import org.apache.cactus.*;
-import org.apache.struts.taglib.logic.*;
+import javax.servlet.ServletException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.Tag;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.cactus.JspTestCase;
+import org.apache.cactus.WebRequest;
import org.apache.strutsel.taglib.utils.TestFormBean;
public class TestELMatchTag
1.3 +10 -10
jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELNotMatchTag.java
Index: TestELNotMatchTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/test/org/apache/strutsel/taglib/logic/TestELNotMatchTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestELNotMatchTag.java 28 Sep 2002 04:43:06 -0000 1.2
+++ TestELNotMatchTag.java 16 Nov 2002 05:12:06 -0000 1.3
@@ -60,14 +60,14 @@
package org.apache.strutsel.taglib.logic;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import junit.framework.*;
-import org.apache.cactus.*;
-import org.apache.struts.taglib.logic.*;
+import javax.servlet.ServletException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.Tag;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import org.apache.cactus.JspTestCase;
+import org.apache.cactus.WebRequest;
import org.apache.strutsel.taglib.utils.TestFormBean;
public class TestELNotMatchTag
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
