Author: mgrigorov
Date: Thu Sep 22 13:33:12 2011
New Revision: 1174126
URL: http://svn.apache.org/viewvc?rev=1174126&view=rev
Log:
Remove unused private methods
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java?rev=1174126&r1=1174125&r2=1174126&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebResponse.java
Thu Sep 22 13:33:12 2011
@@ -17,18 +17,13 @@
package org.apache.wicket.protocol.http.servlet;
import java.io.IOException;
-import java.nio.charset.Charset;
import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.protocol.http.RequestUtils;
-import org.apache.wicket.request.Url;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Time;
/**
@@ -41,6 +36,8 @@ public class ServletWebResponse extends
private final HttpServletResponse httpServletResponse;
private final ServletWebRequest webRequest;
+ private boolean redirect = false;
+
/**
* Construct.
*
@@ -194,55 +191,6 @@ public class ServletWebResponse extends
}
}
- private String getAbsolutePrefix()
- {
- HttpServletRequest httpServletRequest =
webRequest.getContainerRequest();
-
- String port = "";
- if (("http".equals(httpServletRequest.getScheme()) &&
httpServletRequest.getServerPort() != 80) ||
- ("https".equals(httpServletRequest.getScheme()) &&
httpServletRequest.getServerPort() != 443))
- {
- port = ":" + httpServletRequest.getServerPort();
- }
- return httpServletRequest.getScheme() + "://" +
httpServletRequest.getServerName() + port;
- }
-
- private String getAbsoluteURL(String url)
- {
- if (url.startsWith("http://";) || url.startsWith("https://";))
- {
- return url;
- }
- else if (url.startsWith("/"))
- {
- return getAbsolutePrefix() + url;
- }
- else
- {
- HttpServletRequest httpServletRequest =
webRequest.getContainerRequest();
- Charset charset =
RequestUtils.getCharset(httpServletRequest);
-
- final Url current = webRequest.getClientUrl();
-
- Url append = Url.parse(url, charset);
- current.concatSegments(append.getSegments());
- Url result = new Url(current.getSegments(),
append.getQueryParameters());
-
- String path = result.toString();
-
- // replace redirect to empty path with '/'
- if (Strings.isEmpty(path))
- {
- path = "/";
- }
-
- return Strings.join("/", getAbsolutePrefix(),
httpServletRequest.getContextPath(),
- webRequest.getFilterPrefix(), path);
- }
- }
-
- private boolean redirect = false;
-
@Override
public String encodeRedirectURL(CharSequence url)
{
