From e5669770da37d5af3075c102fb607fd23ff8f38b Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 26 Jun 2010 13:50:32 +0000 Subject: [PATCH] Better way to keep Eclipse happy git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@958226 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/examples/WEB-INF/classes/CookieExample.java | 20 ++++++++++---------- .../WEB-INF/classes/RequestHeaderExample.java | 4 ++-- .../examples/WEB-INF/classes/RequestInfoExample.java | 14 +++++++------- .../WEB-INF/classes/RequestParamExample.java | 16 ++++++++-------- webapps/examples/WEB-INF/classes/SessionExample.java | 20 ++++++++++---------- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/webapps/examples/WEB-INF/classes/CookieExample.java b/webapps/examples/WEB-INF/classes/CookieExample.java index 214259fac..e99e9a9b4 100644 --- a/webapps/examples/WEB-INF/classes/CookieExample.java +++ b/webapps/examples/WEB-INF/classes/CookieExample.java @@ -35,7 +35,7 @@ public class CookieExample extends HttpServlet { private static final long serialVersionUID = 1L; - private transient ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + private static final ResourceBundle RB = ResourceBundle.getBundle("LocalStrings"); @Override public void doGet(HttpServletRequest request, @@ -49,7 +49,7 @@ public class CookieExample extends HttpServlet { out.println(""); out.println(""); - String title = rb.getString("cookies.title"); + String title = RB.getString("cookies.title"); out.println("" + title + ""); out.println(""); out.println(""); @@ -71,7 +71,7 @@ public class CookieExample extends HttpServlet { Cookie[] cookies = request.getCookies(); if ((cookies != null) && (cookies.length > 0)) { - out.println(rb.getString("cookies.cookies") + "
"); + out.println(RB.getString("cookies.cookies") + "
"); for (int i = 0; i < cookies.length; i++) { Cookie cookie = cookies[i]; out.print("Cookie Name: " + HTMLFilter.filter(cookie.getName()) @@ -81,7 +81,7 @@ public class CookieExample extends HttpServlet { + "

"); } } else { - out.println(rb.getString("cookies.no-cookies")); + out.println(RB.getString("cookies.no-cookies")); } String cookieName = request.getParameter("cookiename"); @@ -90,20 +90,20 @@ public class CookieExample extends HttpServlet { Cookie cookie = new Cookie(cookieName, cookieValue); response.addCookie(cookie); out.println("

"); - out.println(rb.getString("cookies.set") + "
"); - out.print(rb.getString("cookies.name") + " " + out.println(RB.getString("cookies.set") + "
"); + out.print(RB.getString("cookies.name") + " " + HTMLFilter.filter(cookieName) + "
"); - out.print(rb.getString("cookies.value") + " " + out.print(RB.getString("cookies.value") + " " + HTMLFilter.filter(cookieValue)); } out.println("

"); - out.println(rb.getString("cookies.make-cookie") + "
"); + out.println(RB.getString("cookies.make-cookie") + "
"); out.print("

"); - out.print(rb.getString("cookies.name") + " "); + out.print(RB.getString("cookies.name") + " "); out.println("
"); - out.print(rb.getString("cookies.value") + " "); + out.print(RB.getString("cookies.value") + " "); out.println("
"); out.println("
"); diff --git a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java index 55fa6e760..3d0be7c68 100644 --- a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java +++ b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java @@ -35,7 +35,7 @@ public class RequestHeaderExample extends HttpServlet { private static final long serialVersionUID = 1L; - private transient ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + private static final ResourceBundle RB = ResourceBundle.getBundle("LocalStrings"); @Override public void doGet(HttpServletRequest request, @@ -49,7 +49,7 @@ public class RequestHeaderExample extends HttpServlet { out.println(""); out.println(""); - String title = rb.getString("requestheader.title"); + String title = RB.getString("requestheader.title"); out.println("" + title + ""); out.println(""); out.println(""); diff --git a/webapps/examples/WEB-INF/classes/RequestInfoExample.java b/webapps/examples/WEB-INF/classes/RequestInfoExample.java index 241d713e9..256a5ed69 100644 --- a/webapps/examples/WEB-INF/classes/RequestInfoExample.java +++ b/webapps/examples/WEB-INF/classes/RequestInfoExample.java @@ -35,7 +35,7 @@ public class RequestInfoExample extends HttpServlet { private static final long serialVersionUID = 1L; - private transient ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + private static final ResourceBundle RB = ResourceBundle.getBundle("LocalStrings"); @Override public void doGet(HttpServletRequest request, @@ -49,7 +49,7 @@ public class RequestInfoExample extends HttpServlet { out.println(""); out.println(""); - String title = rb.getString("requestinfo.title"); + String title = RB.getString("requestinfo.title"); out.println("" + title + ""); out.println(""); out.println(""); @@ -70,23 +70,23 @@ public class RequestInfoExample extends HttpServlet { out.println("

" + title + "

"); out.println("
"); - out.println(rb.getString("requestinfo.label.method")); + out.println(RB.getString("requestinfo.label.method")); out.println(""); out.println(request.getMethod()); out.println("
"); - out.println(rb.getString("requestinfo.label.requesturi")); + out.println(RB.getString("requestinfo.label.requesturi")); out.println(""); out.println(HTMLFilter.filter(request.getRequestURI())); out.println("
"); - out.println(rb.getString("requestinfo.label.protocol")); + out.println(RB.getString("requestinfo.label.protocol")); out.println(""); out.println(request.getProtocol()); out.println("
"); - out.println(rb.getString("requestinfo.label.pathinfo")); + out.println(RB.getString("requestinfo.label.pathinfo")); out.println(""); out.println(HTMLFilter.filter(request.getPathInfo())); out.println("
"); - out.println(rb.getString("requestinfo.label.remoteaddr")); + out.println(RB.getString("requestinfo.label.remoteaddr")); String cipherSuite= (String)request.getAttribute("javax.servlet.request.cipher_suite"); diff --git a/webapps/examples/WEB-INF/classes/RequestParamExample.java b/webapps/examples/WEB-INF/classes/RequestParamExample.java index eaf924f8c..984de8e0e 100644 --- a/webapps/examples/WEB-INF/classes/RequestParamExample.java +++ b/webapps/examples/WEB-INF/classes/RequestParamExample.java @@ -35,7 +35,7 @@ public class RequestParamExample extends HttpServlet { private static final long serialVersionUID = 1L; - private transient ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + private static final ResourceBundle RB = ResourceBundle.getBundle("LocalStrings"); @Override public void doGet(HttpServletRequest request, @@ -49,7 +49,7 @@ public class RequestParamExample extends HttpServlet { out.println(""); out.println(""); - String title = rb.getString("requestparams.title"); + String title = RB.getString("requestparams.title"); out.println("" + title + ""); out.println(""); out.println(""); @@ -72,23 +72,23 @@ public class RequestParamExample extends HttpServlet { out.println("

" + title + "

"); String firstName = request.getParameter("firstname"); String lastName = request.getParameter("lastname"); - out.println(rb.getString("requestparams.params-in-req") + "
"); + out.println(RB.getString("requestparams.params-in-req") + "
"); if (firstName != null || lastName != null) { - out.println(rb.getString("requestparams.firstname")); + out.println(RB.getString("requestparams.firstname")); out.println(" = " + HTMLFilter.filter(firstName) + "
"); - out.println(rb.getString("requestparams.lastname")); + out.println(RB.getString("requestparams.lastname")); out.println(" = " + HTMLFilter.filter(lastName)); } else { - out.println(rb.getString("requestparams.no-params")); + out.println(RB.getString("requestparams.no-params")); } out.println("

"); out.print("

"); - out.println(rb.getString("requestparams.firstname")); + out.println(RB.getString("requestparams.firstname")); out.println(""); out.println("
"); - out.println(rb.getString("requestparams.lastname")); + out.println(RB.getString("requestparams.lastname")); out.println(""); out.println("
"); out.println(""); diff --git a/webapps/examples/WEB-INF/classes/SessionExample.java b/webapps/examples/WEB-INF/classes/SessionExample.java index a43d03fec..da3b85b5a 100644 --- a/webapps/examples/WEB-INF/classes/SessionExample.java +++ b/webapps/examples/WEB-INF/classes/SessionExample.java @@ -35,7 +35,7 @@ public class SessionExample extends HttpServlet { private static final long serialVersionUID = 1L; - private transient ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + private static final ResourceBundle RB = ResourceBundle.getBundle("LocalStrings"); @Override public void doGet(HttpServletRequest request, @@ -49,7 +49,7 @@ public class SessionExample extends HttpServlet { out.println(""); out.println(""); - String title = rb.getString("sessions.title"); + String title = RB.getString("sessions.title"); out.println("" + title + ""); out.println(""); out.println(""); @@ -71,11 +71,11 @@ public class SessionExample extends HttpServlet { out.println("

" + title + "

"); HttpSession session = request.getSession(true); - out.println(rb.getString("sessions.id") + " " + session.getId()); + out.println(RB.getString("sessions.id") + " " + session.getId()); out.println("
"); - out.println(rb.getString("sessions.created") + " "); + out.println(RB.getString("sessions.created") + " "); out.println(new Date(session.getCreationTime()) + "
"); - out.println(rb.getString("sessions.lastaccessed") + " "); + out.println(RB.getString("sessions.lastaccessed") + " "); out.println(new Date(session.getLastAccessedTime())); String dataName = request.getParameter("dataname"); @@ -85,7 +85,7 @@ public class SessionExample extends HttpServlet { } out.println("

"); - out.println(rb.getString("sessions.data") + "
"); + out.println(RB.getString("sessions.data") + "
"); Enumeration names = session.getAttributeNames(); while (names.hasMoreElements()) { String name = names.nextElement(); @@ -99,10 +99,10 @@ public class SessionExample extends HttpServlet { out.print(response.encodeURL("SessionExample")); out.print("\" "); out.println("method=POST>"); - out.println(rb.getString("sessions.dataname")); + out.println(RB.getString("sessions.dataname")); out.println(""); out.println("
"); - out.println(rb.getString("sessions.datavalue")); + out.println(RB.getString("sessions.datavalue")); out.println(""); out.println("
"); out.println(""); @@ -113,10 +113,10 @@ public class SessionExample extends HttpServlet { out.print(response.encodeURL("SessionExample")); out.print("\" "); out.println("method=GET>"); - out.println(rb.getString("sessions.dataname")); + out.println(RB.getString("sessions.dataname")); out.println(""); out.println("
"); - out.println(rb.getString("sessions.datavalue")); + out.println(RB.getString("sessions.datavalue")); out.println(""); out.println("
"); out.println(""); -- 2.11.0