Author: markt
Date: Mon May 17 17:45:53 2010
New Revision: 945271
URL: http://svn.apache.org/viewvc?rev=945271&view=rev
Log:
Fix Eclipse warnings.
Reduce line length.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Modified:
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java?rev=945271&r1=945270&r2=945271&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamFilter.java
Mon May 17 17:45:53 2010
@@ -39,6 +39,7 @@ public class DuplicateMappingParamFilter
public void init(FilterConfig filterConfig) throws ServletException {
+ // NO-OP
}
public void doFilter(ServletRequest req, ServletResponse res,
Modified:
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java?rev=945271&r1=945270&r2=945271&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/DuplicateMappingParamServlet.java
Mon May 17 17:45:53 2010
@@ -37,6 +37,9 @@ import javax.servlet.http.HttpServletRes
@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();
Modified:
tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java?rev=945271&r1=945270&r2=945271&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/NoMappingParamServlet.java
Mon May 17 17:45:53 2010
@@ -36,6 +36,9 @@ import javax.servlet.http.HttpServletRes
@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();
Modified: tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java?rev=945271&r1=945270&r2=945271&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/ParamServlet.java Mon May 17
17:45:53 2010
@@ -36,6 +36,9 @@ import javax.servlet.http.HttpServletRes
@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();
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=945271&r1=945270&r2=945271&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java
Mon May 17 17:45:53 2010
@@ -40,7 +40,8 @@ public class TestContextConfigAnnotation
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
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
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
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
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
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
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
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
if (eclipseFile.exists()) {
if (antFile.lastModified() >= eclipseFile.lastModified()) {
return antFile;
- } else {
- return eclipseFile;
}
- } else {
- return antFile;
}
- } else {
- return eclipseFile;
}
+ return eclipseFile;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
