From 884365bb5253021968515395a77ebb61a279ffa7 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 23 Jul 2010 22:04:32 +0000 Subject: [PATCH] More tab police - misc packages git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@967284 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/Constants.java | 10 --- .../apache/catalina/connector/CoyoteAdapter.java | 5 +- .../apache/catalina/connector/CoyoteWriter.java | 2 +- .../org/apache/catalina/connector/InputBuffer.java | 4 +- .../apache/catalina/connector/OutputBuffer.java | 4 +- java/org/apache/catalina/connector/Request.java | 2 +- java/org/apache/catalina/deploy/FilterMap.java | 34 +++++----- java/org/apache/catalina/deploy/Injectable.java | 2 +- .../catalina/filters/RequestDumperFilter.java | 2 +- .../apache/catalina/filters/WebdavFixFilter.java | 74 +++++++++++----------- .../catalina/loader/StandardClassLoader.java | 2 +- java/org/apache/catalina/mbeans/MBeanFactory.java | 8 +-- java/org/apache/catalina/util/URLEncoder.java | 2 +- 13 files changed, 70 insertions(+), 81 deletions(-) diff --git a/java/org/apache/catalina/connector/Constants.java b/java/org/apache/catalina/connector/Constants.java index f401efa72..eebdfc16f 100644 --- a/java/org/apache/catalina/connector/Constants.java +++ b/java/org/apache/catalina/connector/Constants.java @@ -14,21 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.connector; - /** * Static constants for this package. */ - public final class Constants { - - // -------------------------------------------------------------- Constants - - public static final String Package = "org.apache.catalina.connector"; public static final int DEFAULT_CONNECTION_LINGER = -1; @@ -38,6 +30,4 @@ public final class Constants { public static final int PROCESSOR_IDLE = 0; public static final int PROCESSOR_ACTIVE = 1; - - } diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 7a81f85ed..708cd9d11 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -55,7 +55,6 @@ import org.apache.tomcat.util.net.SocketStatus; * @author Remy Maucherat * @version $Id$ */ - public class CoyoteAdapter implements Adapter { private static final Log log = LogFactory.getLog(CoyoteAdapter.class); @@ -355,7 +354,7 @@ public class CoyoteAdapter implements Adapter { * Service method. */ public void service(org.apache.coyote.Request req, - org.apache.coyote.Response res) + org.apache.coyote.Response res) throws Exception { Request request = (Request) req.getNote(ADAPTER_NOTES); @@ -500,7 +499,7 @@ public class CoyoteAdapter implements Adapter { */ protected boolean postParseRequest(org.apache.coyote.Request req, Request request, - org.apache.coyote.Response res, + org.apache.coyote.Response res, Response response) throws Exception { diff --git a/java/org/apache/catalina/connector/CoyoteWriter.java b/java/org/apache/catalina/connector/CoyoteWriter.java index 241467b50..fbf2d90e5 100644 --- a/java/org/apache/catalina/connector/CoyoteWriter.java +++ b/java/org/apache/catalina/connector/CoyoteWriter.java @@ -158,7 +158,7 @@ public class CoyoteWriter @Override public void write(char buf[]) { - write(buf, 0, buf.length); + write(buf, 0, buf.length); } diff --git a/java/org/apache/catalina/connector/InputBuffer.java b/java/org/apache/catalina/connector/InputBuffer.java index 8f07428b0..7f65f8084 100644 --- a/java/org/apache/catalina/connector/InputBuffer.java +++ b/java/org/apache/catalina/connector/InputBuffer.java @@ -177,7 +177,7 @@ public class InputBuffer extends Reader * @param coyoteRequest Associated Coyote request */ public void setRequest(Request coyoteRequest) { - this.coyoteRequest = coyoteRequest; + this.coyoteRequest = coyoteRequest; } @@ -273,7 +273,7 @@ public class InputBuffer extends Reader * @throws IOException An underlying IOException occurred */ public int realReadBytes(byte cbuf[], int off, int len) - throws IOException { + throws IOException { if (closed) return -1; diff --git a/java/org/apache/catalina/connector/OutputBuffer.java b/java/org/apache/catalina/connector/OutputBuffer.java index 085116394..db94c30a7 100644 --- a/java/org/apache/catalina/connector/OutputBuffer.java +++ b/java/org/apache/catalina/connector/OutputBuffer.java @@ -170,7 +170,7 @@ public class OutputBuffer extends Writer * @param coyoteResponse Associated Coyote response */ public void setResponse(Response coyoteResponse) { - this.coyoteResponse = coyoteResponse; + this.coyoteResponse = coyoteResponse; } @@ -341,7 +341,7 @@ public class OutputBuffer extends Writer * @throws IOException An underlying IOException occurred */ public void realWriteBytes(byte buf[], int off, int cnt) - throws IOException { + throws IOException { if (closed) return; diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index 728923505..f61839800 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -1436,7 +1436,7 @@ public class Request * @param value The associated value */ public void setAttribute(String name, Object value) { - + // Name cannot be null if (name == null) throw new IllegalArgumentException diff --git a/java/org/apache/catalina/deploy/FilterMap.java b/java/org/apache/catalina/deploy/FilterMap.java index 568395f3d..c8022904d 100644 --- a/java/org/apache/catalina/deploy/FilterMap.java +++ b/java/org/apache/catalina/deploy/FilterMap.java @@ -169,23 +169,23 @@ public class FilterMap implements Serializable { } public String[] getDispatcherNames() { - ArrayList result = new ArrayList(); - if ((dispatcherMapping & FORWARD) > 0) { - result.add(DispatcherType.FORWARD.name()); - } - if ((dispatcherMapping & INCLUDE) > 0) { - result.add(DispatcherType.INCLUDE.name()); - } - if ((dispatcherMapping & REQUEST) > 0) { - result.add(DispatcherType.REQUEST.name()); - } - if ((dispatcherMapping & ERROR) > 0) { - result.add(DispatcherType.ERROR.name()); - } - if ((dispatcherMapping & ASYNC) > 0) { - result.add(DispatcherType.ASYNC.name()); - } - return result.toArray(new String[result.size()]); + ArrayList result = new ArrayList(); + if ((dispatcherMapping & FORWARD) > 0) { + result.add(DispatcherType.FORWARD.name()); + } + if ((dispatcherMapping & INCLUDE) > 0) { + result.add(DispatcherType.INCLUDE.name()); + } + if ((dispatcherMapping & REQUEST) > 0) { + result.add(DispatcherType.REQUEST.name()); + } + if ((dispatcherMapping & ERROR) > 0) { + result.add(DispatcherType.ERROR.name()); + } + if ((dispatcherMapping & ASYNC) > 0) { + result.add(DispatcherType.ASYNC.name()); + } + return result.toArray(new String[result.size()]); } // --------------------------------------------------------- Public Methods diff --git a/java/org/apache/catalina/deploy/Injectable.java b/java/org/apache/catalina/deploy/Injectable.java index 78d5146b8..b620a3b22 100644 --- a/java/org/apache/catalina/deploy/Injectable.java +++ b/java/org/apache/catalina/deploy/Injectable.java @@ -23,7 +23,7 @@ package org.apache.catalina.deploy; import java.util.List; public interface Injectable { - public String getName(); + public String getName(); public void addInjectionTarget(String injectionTargetName, String jndiName); public List getInjectionTargets(); } diff --git a/java/org/apache/catalina/filters/RequestDumperFilter.java b/java/org/apache/catalina/filters/RequestDumperFilter.java index 23f15ec76..cf08fbf88 100644 --- a/java/org/apache/catalina/filters/RequestDumperFilter.java +++ b/java/org/apache/catalina/filters/RequestDumperFilter.java @@ -239,7 +239,7 @@ public class RequestDumperFilter implements Filter { doLog("END TIME ", getTimestamp()); doLog("==================", "============================================"); - } + } private void doLog(String attribute, String value) { StringBuilder sb = new StringBuilder(80); diff --git a/java/org/apache/catalina/filters/WebdavFixFilter.java b/java/org/apache/catalina/filters/WebdavFixFilter.java index b1296714e..be11454b5 100644 --- a/java/org/apache/catalina/filters/WebdavFixFilter.java +++ b/java/org/apache/catalina/filters/WebdavFixFilter.java @@ -78,51 +78,51 @@ public class WebdavFixFilter implements Filter { // NOOP } - public void destroy() { - // NOOP - } + public void destroy() { + // NOOP + } /** * Check for the broken MS WebDAV client and if detected issue a re-direct * that hopefully will cause the non-broken client to be used. */ - public void doFilter(ServletRequest request, ServletResponse response, - FilterChain chain) throws IOException, ServletException { - if (!(request instanceof HttpServletRequest) || - !(response instanceof HttpServletResponse)) { + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException { + if (!(request instanceof HttpServletRequest) || + !(response instanceof HttpServletResponse)) { chain.doFilter(request, response); return; } - HttpServletRequest httpRequest = ((HttpServletRequest) request); - HttpServletResponse httpResponse = ((HttpServletResponse) response); - String ua = httpRequest.getHeader("User-Agent"); - - if (ua == null || ua.length() == 0 || - !ua.startsWith(UA_MINIDIR_START)) { - // No UA or starts with non MS value - // Hope everything just works... - chain.doFilter(request, response); - } else if (ua.startsWith(UA_MINIDIR_5_1_2600)) { - // XP 32-bit SP3 - needs redirect with explicit port - httpResponse.sendRedirect(buildRedirect(httpRequest)); - } else if (ua.startsWith(UA_MINIDIR_5_2_3790)) { - // XP 64-bit SP2 - if (!"".equals(httpRequest.getContextPath())) { - log(request, - "XP-x64-SP2 clients only work with the root context"); - } - // Namespace issue maybe - // see http://greenbytes.de/tech/webdav/webdav-redirector-list.html - log(request, "XP-x64-SP2 is known not to work with WebDAV Servlet"); - - chain.doFilter(request, response); - } else { - // Don't know which MS client it is - try the redirect with an - // explicit port in the hope that it moves the client to a different - // WebDAV implementation that works - httpResponse.sendRedirect(buildRedirect(httpRequest)); - } - } + HttpServletRequest httpRequest = ((HttpServletRequest) request); + HttpServletResponse httpResponse = ((HttpServletResponse) response); + String ua = httpRequest.getHeader("User-Agent"); + + if (ua == null || ua.length() == 0 || + !ua.startsWith(UA_MINIDIR_START)) { + // No UA or starts with non MS value + // Hope everything just works... + chain.doFilter(request, response); + } else if (ua.startsWith(UA_MINIDIR_5_1_2600)) { + // XP 32-bit SP3 - needs redirect with explicit port + httpResponse.sendRedirect(buildRedirect(httpRequest)); + } else if (ua.startsWith(UA_MINIDIR_5_2_3790)) { + // XP 64-bit SP2 + if (!"".equals(httpRequest.getContextPath())) { + log(request, + "XP-x64-SP2 clients only work with the root context"); + } + // Namespace issue maybe + // see http://greenbytes.de/tech/webdav/webdav-redirector-list.html + log(request, "XP-x64-SP2 is known not to work with WebDAV Servlet"); + + chain.doFilter(request, response); + } else { + // Don't know which MS client it is - try the redirect with an + // explicit port in the hope that it moves the client to a different + // WebDAV implementation that works + httpResponse.sendRedirect(buildRedirect(httpRequest)); + } + } private String buildRedirect(HttpServletRequest request) { StringBuilder location = diff --git a/java/org/apache/catalina/loader/StandardClassLoader.java b/java/org/apache/catalina/loader/StandardClassLoader.java index 0e63346c2..a2261656e 100644 --- a/java/org/apache/catalina/loader/StandardClassLoader.java +++ b/java/org/apache/catalina/loader/StandardClassLoader.java @@ -34,7 +34,7 @@ public class StandardClassLoader extends URLClassLoader implements StandardClassLoaderMBean { - public StandardClassLoader(URL repositories[]) { + public StandardClassLoader(URL repositories[]) { super(repositories); } diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java b/java/org/apache/catalina/mbeans/MBeanFactory.java index 46ae950ae..76998ff26 100644 --- a/java/org/apache/catalina/mbeans/MBeanFactory.java +++ b/java/org/apache/catalina/mbeans/MBeanFactory.java @@ -313,8 +313,8 @@ public class MBeanFactory { * @exception Exception if an MBean cannot be created or registered */ public String createHttpConnector(String parent, String address, int port) - throws Exception { - return createConnector(parent, address, port, false, false); + throws Exception { + return createConnector(parent, address, port, false, false); } /** @@ -376,7 +376,7 @@ public class MBeanFactory { * @exception Exception if an MBean cannot be created or registered */ public String createJDBCRealm(String parent, String driverName, - String connectionName, String connectionPassword, String connectionURL) + String connectionName, String connectionPassword, String connectionURL) throws Exception { // Create a new JDBCRealm instance @@ -660,7 +660,7 @@ public class MBeanFactory { host.setDeployOnStartup(deployOnStartup); host.setDeployXML(deployXML); host.setUnpackWARs(unpackWARs); - + // add HostConfig for active reloading HostConfig hostConfig = new HostConfig(); host.addLifecycleListener(hostConfig); diff --git a/java/org/apache/catalina/util/URLEncoder.java b/java/org/apache/catalina/util/URLEncoder.java index 7e2a2b494..2a9ad43b5 100644 --- a/java/org/apache/catalina/util/URLEncoder.java +++ b/java/org/apache/catalina/util/URLEncoder.java @@ -54,7 +54,7 @@ public class URLEncoder { } public void addSafeCharacter( char c ) { - safeCharacters.set( c ); + safeCharacters.set( c ); } public String encode( String path ) { -- 2.11.0