From 7982f8b503028e857937cc7871b90f845a0c0018 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 17 May 2010 17:45:53 +0000 Subject: [PATCH] Fix Eclipse warnings. Reduce line length. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@945271 13f79535-47bb-0310-9956-ffa450edef68 --- .../startup/DuplicateMappingParamFilter.java | 1 + .../startup/DuplicateMappingParamServlet.java | 3 ++ .../catalina/startup/NoMappingParamServlet.java | 3 ++ test/org/apache/catalina/startup/ParamServlet.java | 3 ++ .../startup/TestContextConfigAnnotation.java | 41 ++++++++++++---------- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java b/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java index 1d15e6be7..09691d15a 100644 --- a/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java +++ b/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java @@ -39,6 +39,7 @@ public class DuplicateMappingParamFilter implements Filter { public void init(FilterConfig filterConfig) throws ServletException { + // NO-OP } public void doFilter(ServletRequest req, ServletResponse res, diff --git a/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java b/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java index a16452deb..b01bb35ec 100644 --- a/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java +++ b/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java @@ -37,6 +37,9 @@ import javax.servlet.http.HttpServletResponse; @WebInitParam(name = "bar", value = "World!") }) public class DuplicateMappingParamServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + @Override public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { PrintWriter out = res.getWriter(); diff --git a/test/org/apache/catalina/startup/NoMappingParamServlet.java b/test/org/apache/catalina/startup/NoMappingParamServlet.java index 5e8f9685b..730582170 100644 --- a/test/org/apache/catalina/startup/NoMappingParamServlet.java +++ b/test/org/apache/catalina/startup/NoMappingParamServlet.java @@ -36,6 +36,9 @@ import javax.servlet.http.HttpServletResponse; @WebInitParam(name = "bar", value = "World!") }) public class NoMappingParamServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + @Override public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { PrintWriter out = res.getWriter(); diff --git a/test/org/apache/catalina/startup/ParamServlet.java b/test/org/apache/catalina/startup/ParamServlet.java index 7303341f8..4075ea3ca 100644 --- a/test/org/apache/catalina/startup/ParamServlet.java +++ b/test/org/apache/catalina/startup/ParamServlet.java @@ -36,6 +36,9 @@ import javax.servlet.http.HttpServletResponse; @WebInitParam(name = "bar", value = "World!") }, displayName = "param", description = "param", largeIcon = "paramLarge.png", smallIcon = "paramSmall.png", loadOnStartup = 0, asyncSupported = false) public class ParamServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + + @Override public void doGet(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException { PrintWriter out = res.getWriter(); diff --git a/test/org/apache/catalina/startup/TestContextConfigAnnotation.java b/test/org/apache/catalina/startup/TestContextConfigAnnotation.java index 07d490f1e..ac6b3b9fb 100644 --- a/test/org/apache/catalina/startup/TestContextConfigAnnotation.java +++ b/test/org/apache/catalina/startup/TestContextConfigAnnotation.java @@ -40,7 +40,8 @@ public class TestContextConfigAnnotation extends TestCase { public void testAnnotation() throws Exception { WebXml webxml = new WebXml(); ContextConfig config = new ContextConfig(); - File pFile = paramClassResource("org/apache/catalina/startup/ParamServlet"); + File pFile = paramClassResource( + "org/apache/catalina/startup/ParamServlet"); assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml); ServletDef servletDef = webxml.getServlets().get("param"); @@ -77,7 +78,8 @@ public class TestContextConfigAnnotation extends TestCase { webxml.addServlet(servletDef); webxml.addServletMapping("/param", "param"); ContextConfig config = new ContextConfig(); - File pFile = paramClassResource("org/apache/catalina/startup/ParamServlet"); + File pFile = paramClassResource( + "org/apache/catalina/startup/ParamServlet"); assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml); @@ -102,7 +104,8 @@ public class TestContextConfigAnnotation extends TestCase { public void testNoMapping() throws Exception { WebXml webxml = new WebXml(); ContextConfig config = new ContextConfig(); - File pFile = paramClassResource("org/apache/catalina/startup/NoMappingParamServlet"); + File pFile = paramClassResource( + "org/apache/catalina/startup/NoMappingParamServlet"); assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml); ServletDef servletDef = webxml.getServlets().get("param1"); @@ -119,14 +122,15 @@ public class TestContextConfigAnnotation extends TestCase { WebXml webxml = new WebXml(); ServletDef servletDef = new ServletDef(); servletDef.setServletName("param1"); - servletDef - .setServletClass("org.apache.catalina.startup.NoMappingParamServlet"); + servletDef.setServletClass( + "org.apache.catalina.startup.NoMappingParamServlet"); servletDef.addInitParameter("foo", "tomcat"); webxml.addServlet(servletDef); webxml.addServletMapping("/param", "param1"); ContextConfig config = new ContextConfig(); - File pFile = paramClassResource("org/apache/catalina/startup/NoMappingParamServlet"); + File pFile = paramClassResource( + "org/apache/catalina/startup/NoMappingParamServlet"); assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml); assertEquals("tomcat", servletDef.getParameterMap().get("foo")); @@ -139,7 +143,8 @@ public class TestContextConfigAnnotation extends TestCase { public void testDuplicateMapping() throws Exception { WebXml webxml = new WebXml(); ContextConfig config = new ContextConfig(); - File pFile = paramClassResource("org/apache/catalina/startup/DuplicateMappingParamServlet"); + File pFile = paramClassResource( + "org/apache/catalina/startup/DuplicateMappingParamServlet"); assertTrue(pFile.exists()); try { config.processAnnotationsFile(pFile, webxml); @@ -154,9 +159,11 @@ public class TestContextConfigAnnotation extends TestCase { public void testFilterMapping() throws Exception { WebXml webxml = new WebXml(); ContextConfig config = new ContextConfig(); - File sFile = paramClassResource("org/apache/catalina/startup/ParamServlet"); + File sFile = paramClassResource( + "org/apache/catalina/startup/ParamServlet"); config.processAnnotationsFile(sFile, webxml); - File fFile = paramClassResource("org/apache/catalina/startup/ParamFilter"); + File fFile = paramClassResource( + "org/apache/catalina/startup/ParamFilter"); config.processAnnotationsFile(fFile, webxml); FilterDef fdef = webxml.getFilters().get("paramFilter"); assertNotNull(fdef); @@ -183,9 +190,11 @@ public class TestContextConfigAnnotation extends TestCase { webxml.addFilterMapping(filterMap); ContextConfig config = new ContextConfig(); - File sFile = paramClassResource("org/apache/catalina/startup/ParamServlet"); + File sFile = paramClassResource( + "org/apache/catalina/startup/ParamServlet"); config.processAnnotationsFile(sFile, webxml); - File fFile = paramClassResource("org/apache/catalina/startup/ParamFilter"); + File fFile = paramClassResource( + "org/apache/catalina/startup/ParamFilter"); config.processAnnotationsFile(fFile, webxml); FilterDef fdef = webxml.getFilters().get("paramFilter"); assertNotNull(fdef); @@ -218,7 +227,8 @@ public class TestContextConfigAnnotation extends TestCase { public void testDuplicateFilterMapping() throws Exception { WebXml webxml = new WebXml(); ContextConfig config = new ContextConfig(); - File pFile = paramClassResource("org/apache/catalina/startup/DuplicateMappingParamFilter"); + File pFile = paramClassResource( + "org/apache/catalina/startup/DuplicateMappingParamFilter"); assertTrue(pFile.exists()); try { config.processAnnotationsFile(pFile, webxml); @@ -243,14 +253,9 @@ public class TestContextConfigAnnotation extends TestCase { if (eclipseFile.exists()) { if (antFile.lastModified() >= eclipseFile.lastModified()) { return antFile; - } else { - return eclipseFile; } - } else { - return antFile; } - } else { - return eclipseFile; } + return eclipseFile; } } -- 2.11.0