jmitchell 2002/11/15 22:04:29
Modified: src/share/org/apache/struts/tiles DefaultTilesUtilImpl.java
DefinitionsFactory.java
DefinitionsFactoryConfig.java TilesUtil.java
TilesUtilInterface.java
contrib/tiles/src/share/org/apache/struts/tiles/actions
DefinitionDispatcherAction.java
src/share/org/apache/struts/upload MultipartIterator.java
contrib/tiles/src/share/org/apache/struts/tiles/definition
ReloadableDefinitionsFactory.java
contrib/tiles/src/share/org/apache/struts/tiles
TilesRequestProcessor.java
src/upload/org/apache/struts/webapp/upload UploadForm.java
contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition
XmlParser.java
Log:
Cleaning up imports - found a few more.
Revision Changes Path
1.2 +11 -7
jakarta-struts/src/share/org/apache/struts/tiles/DefaultTilesUtilImpl.java
Index: DefaultTilesUtilImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefaultTilesUtilImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultTilesUtilImpl.java 5 Nov 2002 14:16:41 -0000 1.1
+++ DefaultTilesUtilImpl.java 16 Nov 2002 06:04:28 -0000 1.2
@@ -61,13 +61,17 @@
package org.apache.struts.tiles;
-import org.apache.struts.tiles.definition.ComponentDefinitionsFactoryWrapper;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.struts.tiles.definition.ComponentDefinitionsFactoryWrapper;
/**
* Default implementation of TilesUtil.
1.2 +2 -8
jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsFactory.java
Index: DefinitionsFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefinitionsFactory.java 11 Jul 2002 16:20:32 -0000 1.1
+++ DefinitionsFactory.java 16 Nov 2002 06:04:28 -0000 1.2
@@ -62,16 +62,10 @@
package org.apache.struts.tiles;
-import org.apache.struts.tiles.*;
import java.io.Serializable;
-import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletRequest;
-
-import org.apache.struts.tiles.DefinitionsFactoryException;
-import org.apache.struts.tiles.NoSuchDefinitionException;
/**
* Tiles Definition factory.
1.5 +7 -8
jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsFactoryConfig.java
Index: DefinitionsFactoryConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/DefinitionsFactoryConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefinitionsFactoryConfig.java 9 Nov 2002 04:04:11 -0000 1.4
+++ DefinitionsFactoryConfig.java 16 Nov 2002 06:04:28 -0000 1.5
@@ -62,12 +62,11 @@
package org.apache.struts.tiles;
-import org.apache.struts.tiles.*;
-import java.util.Map;
+import java.io.Serializable;
import java.util.HashMap;
-import java.util.Set;
import java.util.Iterator;
-import java.io.Serializable;
+import java.util.Map;
+import java.util.Set;
import org.apache.commons.beanutils.BeanUtils;
1.2 +10 -5 jakarta-struts/src/share/org/apache/struts/tiles/TilesUtil.java
Index: TilesUtil.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TilesUtil.java 5 Nov 2002 14:16:41 -0000 1.1
+++ TilesUtil.java 16 Nov 2002 06:04:28 -0000 1.2
@@ -61,9 +61,14 @@
package org.apache.struts.tiles;
-import javax.servlet.*;
-import javax.servlet.http.*;
import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
1.2 +9 -7
jakarta-struts/src/share/org/apache/struts/tiles/TilesUtilInterface.java
Index: TilesUtilInterface.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/tiles/TilesUtilInterface.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TilesUtilInterface.java 5 Nov 2002 14:16:41 -0000 1.1
+++ TilesUtilInterface.java 16 Nov 2002 06:04:28 -0000 1.2
@@ -61,11 +61,13 @@
package org.apache.struts.tiles;
-import javax.servlet.*;
-import javax.servlet.http.*;
import java.io.IOException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* Class containing utilities for Tiles.
1.3 +8 -4
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java
Index: DefinitionDispatcherAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/actions/DefinitionDispatcherAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefinitionDispatcherAction.java 20 Jun 2002 16:14:13 -0000 1.2
+++ DefinitionDispatcherAction.java 16 Nov 2002 06:04:28 -0000 1.3
@@ -4,18 +4,22 @@
package org.apache.struts.tiles.actions;
-import org.apache.struts.tiles.*;
-
import java.io.IOException;
import java.io.PrintWriter;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.tiles.ComponentDefinition;
+import org.apache.struts.tiles.DefinitionsFactoryException;
+import org.apache.struts.tiles.DefinitionsUtil;
+import org.apache.struts.tiles.FactoryNotFoundException;
+import org.apache.struts.tiles.NoSuchDefinitionException;
/**
1.21 +10 -6
jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java
Index: MultipartIterator.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/upload/MultipartIterator.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- MultipartIterator.java 6 Jul 2002 04:44:07 -0000 1.20
+++ MultipartIterator.java 16 Nov 2002 06:04:28 -0000 1.21
@@ -61,9 +61,13 @@
package org.apache.struts.upload;
-import java.io.*;
-import java.util.Iterator;
-import javax.servlet.ServletInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
import javax.servlet.http.HttpServletRequest;
/**
1.3 +12 -9
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java
Index: ReloadableDefinitionsFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/definition/ReloadableDefinitionsFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReloadableDefinitionsFactory.java 18 Feb 2002 14:50:04 -0000 1.2
+++ ReloadableDefinitionsFactory.java 16 Nov 2002 06:04:28 -0000 1.3
@@ -9,16 +9,19 @@
package org.apache.struts.tiles.definition;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Enumeration;
-
-import org.apache.struts.tiles.*;
+import org.apache.struts.tiles.ComponentDefinition;
+import org.apache.struts.tiles.ComponentDefinitionsFactory;
+import org.apache.struts.tiles.DefinitionsFactoryException;
+import org.apache.struts.tiles.FactoryNotFoundException;
import org.apache.struts.tiles.xmlDefinition.I18nFactorySet;
/**
1.2 +8 -18
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/TilesRequestProcessor.java
Index: TilesRequestProcessor.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/TilesRequestProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TilesRequestProcessor.java 18 Feb 2002 14:50:04 -0000 1.1
+++ TilesRequestProcessor.java 16 Nov 2002 06:04:28 -0000 1.2
@@ -8,26 +8,16 @@
package org.apache.struts.tiles;
-import org.apache.struts.taglib.tiles.ComponentConstants;
+import java.io.IOException;
-import java.util.Locale;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.RequestProcessor;
import org.apache.struts.action.ActionServlet;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.Action;
+import org.apache.struts.action.RequestProcessor;
import org.apache.struts.config.ApplicationConfig;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import org.apache.struts.taglib.html.Constants;
-import org.apache.struts.upload.MultipartRequestWrapper;
/**
* <p><strong>RequestProcessor</strong> contains the processing logic that
1.6 +10 -7
jakarta-struts/src/upload/org/apache/struts/webapp/upload/UploadForm.java
Index: UploadForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/upload/org/apache/struts/webapp/upload/UploadForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UploadForm.java 27 Jul 2002 21:53:13 -0000 1.5
+++ UploadForm.java 16 Nov 2002 06:04:29 -0000 1.6
@@ -62,11 +62,14 @@
package org.apache.struts.webapp.upload;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionErrors;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionMapping;
import org.apache.struts.upload.FormFile;
import org.apache.struts.upload.MultipartRequestHandler;
-import org.apache.struts.action.*;
-
-import javax.servlet.http.HttpServletRequest;
/**
1.8 +3 -15
jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java
Index: XmlParser.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/tiles/src/share/org/apache/struts/tiles/xmlDefinition/XmlParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XmlParser.java 13 Jun 2002 16:53:56 -0000 1.7
+++ XmlParser.java 16 Nov 2002 06:04:29 -0000 1.8
@@ -2,26 +2,14 @@
package org.apache.struts.tiles.xmlDefinition;
-import java.util.Map;
-import java.util.Collection;
-import java.util.List;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.io.InputStream;
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
import java.io.IOException;
-import java.io.Serializable;
-import java.io.*;
+import java.io.InputStream;
import java.net.URL;
import org.apache.commons.digester.Digester;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.RequestDispatcher;
import org.xml.sax.SAXException;
-
-import org.apache.struts.tiles.NoSuchDefinitionException;
-
-import java.io.Reader;
/**
*Parse an XML definitions file.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
