From 6060d8f6ac81f6ecf918436fef58b9355e3a7b8a Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 22 Aug 2010 14:44:51 +0000 Subject: [PATCH] Fix import ordering - no functional change -javax.* packages git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@987914 13f79535-47bb-0310-9956-ffa450edef68 --- java/javax/persistence/PersistenceProperty.java | 2 +- java/javax/servlet/ServletInputStream.java | 2 +- java/javax/servlet/ServletOutputStream.java | 4 ++-- java/javax/servlet/http/HttpServlet.java | 2 +- java/javax/servlet/http/HttpServletRequest.java | 6 +++--- java/javax/servlet/http/HttpServletRequestWrapper.java | 6 +++--- java/javax/servlet/http/HttpSession.java | 1 + java/javax/servlet/http/HttpUtils.java | 5 +++-- java/javax/servlet/jsp/tagext/BodyContent.java | 2 +- java/javax/servlet/jsp/tagext/SimpleTagSupport.java | 3 ++- 10 files changed, 18 insertions(+), 15 deletions(-) diff --git a/java/javax/persistence/PersistenceProperty.java b/java/javax/persistence/PersistenceProperty.java index 372a870a4..20a42c54c 100644 --- a/java/javax/persistence/PersistenceProperty.java +++ b/java/javax/persistence/PersistenceProperty.java @@ -17,9 +17,9 @@ package javax.persistence; -import java.lang.annotation.Target; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Target({}) @Retention(RetentionPolicy.RUNTIME) diff --git a/java/javax/servlet/ServletInputStream.java b/java/javax/servlet/ServletInputStream.java index e54543094..247d37c50 100644 --- a/java/javax/servlet/ServletInputStream.java +++ b/java/javax/servlet/ServletInputStream.java @@ -16,8 +16,8 @@ */ package javax.servlet; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; /** * Provides an input stream for reading binary data from a client request, diff --git a/java/javax/servlet/ServletOutputStream.java b/java/javax/servlet/ServletOutputStream.java index c000eb729..85e9159ef 100644 --- a/java/javax/servlet/ServletOutputStream.java +++ b/java/javax/servlet/ServletOutputStream.java @@ -16,9 +16,9 @@ */ package javax.servlet; -import java.io.OutputStream; -import java.io.IOException; import java.io.CharConversionException; +import java.io.IOException; +import java.io.OutputStream; import java.text.MessageFormat; import java.util.ResourceBundle; diff --git a/java/javax/servlet/http/HttpServlet.java b/java/javax/servlet/http/HttpServlet.java index 14a8c5651..d41af02ef 100644 --- a/java/javax/servlet/http/HttpServlet.java +++ b/java/javax/servlet/http/HttpServlet.java @@ -17,8 +17,8 @@ package javax.servlet.http; import java.io.IOException; -import java.io.PrintWriter; import java.io.OutputStreamWriter; +import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.lang.reflect.Method; import java.text.MessageFormat; diff --git a/java/javax/servlet/http/HttpServletRequest.java b/java/javax/servlet/http/HttpServletRequest.java index 45e7cb07c..b1b0a7231 100644 --- a/java/javax/servlet/http/HttpServletRequest.java +++ b/java/javax/servlet/http/HttpServletRequest.java @@ -17,13 +17,13 @@ package javax.servlet.http; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; - import java.io.IOException; import java.util.Collection; import java.util.Enumeration; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; + /** * Extends the {@link javax.servlet.ServletRequest} interface to provide request * information for HTTP servlets. diff --git a/java/javax/servlet/http/HttpServletRequestWrapper.java b/java/javax/servlet/http/HttpServletRequestWrapper.java index c2c7274eb..1d3b3290e 100644 --- a/java/javax/servlet/http/HttpServletRequestWrapper.java +++ b/java/javax/servlet/http/HttpServletRequestWrapper.java @@ -16,13 +16,13 @@ */ package javax.servlet.http; -import javax.servlet.ServletException; -import javax.servlet.ServletRequestWrapper; - import java.io.IOException; import java.util.Collection; import java.util.Enumeration; +import javax.servlet.ServletException; +import javax.servlet.ServletRequestWrapper; + /** * Provides a convenient implementation of the HttpServletRequest interface that * can be subclassed by developers wishing to adapt the request to a Servlet. diff --git a/java/javax/servlet/http/HttpSession.java b/java/javax/servlet/http/HttpSession.java index 41e1c3850..60f98b16a 100644 --- a/java/javax/servlet/http/HttpSession.java +++ b/java/javax/servlet/http/HttpSession.java @@ -17,6 +17,7 @@ package javax.servlet.http; import java.util.Enumeration; + import javax.servlet.ServletContext; /** diff --git a/java/javax/servlet/http/HttpUtils.java b/java/javax/servlet/http/HttpUtils.java index 35794868c..955a7ef58 100644 --- a/java/javax/servlet/http/HttpUtils.java +++ b/java/javax/servlet/http/HttpUtils.java @@ -17,11 +17,12 @@ package javax.servlet.http; -import javax.servlet.ServletInputStream; +import java.io.IOException; import java.util.Hashtable; import java.util.ResourceBundle; import java.util.StringTokenizer; -import java.io.IOException; + +import javax.servlet.ServletInputStream; /** * @deprecated As of Java(tm) Servlet API 2.3. diff --git a/java/javax/servlet/jsp/tagext/BodyContent.java b/java/javax/servlet/jsp/tagext/BodyContent.java index a7a111089..4a294af44 100644 --- a/java/javax/servlet/jsp/tagext/BodyContent.java +++ b/java/javax/servlet/jsp/tagext/BodyContent.java @@ -16,9 +16,9 @@ */ package javax.servlet.jsp.tagext; +import java.io.IOException; import java.io.Reader; import java.io.Writer; -import java.io.IOException; import javax.servlet.jsp.JspWriter; diff --git a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java index 4c93621e8..43967ec25 100644 --- a/java/javax/servlet/jsp/tagext/SimpleTagSupport.java +++ b/java/javax/servlet/jsp/tagext/SimpleTagSupport.java @@ -16,9 +16,10 @@ */ package javax.servlet.jsp.tagext; +import java.io.IOException; + import javax.servlet.jsp.JspContext; import javax.servlet.jsp.JspException; -import java.io.IOException; /** * A base class for defining tag handlers implementing SimpleTag. -- 2.11.0