Author: jcompagner
Date: Sun Dec 16 09:42:31 2007
New Revision: 604662
URL: http://svn.apache.org/viewvc?rev=604662&view=rev
Log:
code cleanup: WICKET-830
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletRequestWrapper.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java?rev=604662&r1=604661&r2=604662&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/Border.java
Sun Dec 16 09:42:31 2007
@@ -126,7 +126,7 @@
private boolean transparentResolver = false;
/** Must be the same as the id automatically assigned to <wicket:body>
*/
- private final String BODY_ID = "_body";
+ private static final String BODY_ID = "_body";
/** The body component associated with <wicket:body> */
private BorderBodyContainer body;
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?rev=604662&r1=604661&r2=604662&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
Sun Dec 16 09:42:31 2007
@@ -99,13 +99,13 @@
* The name of the optional filter parameter indicating it may/can only
be accessed from within
* a Portlet context. Value should be true
*/
- private final String PORTLET_ONLY_FILTER = "portletOnlyFilter";
+ private static final String PORTLET_ONLY_FILTER = "portletOnlyFilter";
/**
* The name of the optional filter parameter indicating a
javax.portlet.PortletContext class
* should be looked up to determine if portlet support should be
provided.
*/
- private final String DETECT_PORTLET_CONTEXT = "detectPortletContext";
+ private static final String DETECT_PORTLET_CONTEXT =
"detectPortletContext";
/**
* The name of the optional web.xml context parameter indicating if a
portlet context is to be
@@ -115,12 +115,12 @@
* resource will be looked up through the classpath which, if found, is
queried for a property
* with the same name.
*/
- private final String DETECT_PORTLET_CONTEXT_FULL_NAME =
"org.apache.wicket.detectPortletContext";
+ private static final String DETECT_PORTLET_CONTEXT_FULL_NAME =
"org.apache.wicket.detectPortletContext";
/**
* The classpath resource name of an optional WicketPortlet.properties
file.
*/
- private final String WICKET_PORTLET_PROPERTIES =
"org/apache/wicket/protocol/http/portlet/WicketPortlet.properties";
+ private static final String WICKET_PORTLET_PROPERTIES =
"org/apache/wicket/protocol/http/portlet/WicketPortlet.properties";
/*
* Delegate for handling Portlet specific filtering. Not instantiated
if not running in a
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletRequestWrapper.java?rev=604662&r1=604661&r2=604662&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletRequestWrapper.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/PortletServletRequestWrapper.java
Sun Dec 16 09:42:31 2007
@@ -26,7 +26,6 @@
*/
public class PortletServletRequestWrapper extends HttpServletRequestWrapper
{
- private ServletContext context;
private String contextPath;
private String servletPath;
private String pathInfo;
@@ -50,7 +49,6 @@
HttpServletRequest request, String filterPath)
{
super(request);
- this.context = context;
this.session = proxiedSession;
if (proxiedSession == null)
{
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?rev=604662&r1=604661&r2=604662&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
Sun Dec 16 09:42:31 2007
@@ -104,8 +104,6 @@
/** log. */
private static final Logger log =
LoggerFactory.getLogger(WicketSessionFilter.class);
- private FilterConfig filterConfig;
-
/** the filter name/ application key. */
private String filterName;
@@ -124,8 +122,6 @@
*/
public void init(FilterConfig filterConfig) throws ServletException
{
- this.filterConfig = filterConfig;
-
filterName = filterConfig.getInitParameter("filterName");
if (filterName == null)
