You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/15 23:23:31 UTC
svn commit: r584925 [13/34] - in /wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/
main/java/org/apache/wicket/ajax/calldecorator/
main/java/org/apache/wicket/ajax/form/ main/java/org/apache/wicket/ajax/ma...
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketFilterPortletContext.java Mon Oct 15 14:21:25 2007
@@ -39,97 +39,116 @@
public class WicketFilterPortletContext
{
private static final String SERVLET_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX = "/ps:";
-
- public void initFilter(FilterConfig filterConfig, WebApplication webApplication) throws ServletException
- {
- webApplication.getRequestCycleSettings().setRenderStrategy(IRequestCycleSettings.REDIRECT_TO_RENDER);
- webApplication.getRequestCycleSettings().addResponseFilter(new PortletInvalidMarkupFilter());
- }
-
- public boolean setupFilter(FilterConfig config, FilterRequestContext filterRequestContext, String filterPath) throws IOException, ServletException
- {
- boolean inPortletContext = false;
- PortletConfig portletConfig = (PortletConfig)filterRequestContext.getRequest().getAttribute("javax.portlet.config");
- if ( portletConfig != null )
- {
- inPortletContext = true;
- WicketResponseState responseState = (WicketResponseState)filterRequestContext.getRequest().getAttribute(WicketPortlet.RESPONSE_STATE_ATTR);
- filterRequestContext.setRequest(new PortletServletRequestWrapper(config.getServletContext(),filterRequestContext.getRequest(), ServletPortletSessionProxy.createProxy(filterRequestContext.getRequest()), filterPath));
- if ( WicketPortlet.ACTION_REQUEST.equals(filterRequestContext.getRequest().getAttribute(WicketPortlet.REQUEST_TYPE_ATTR)))
- {
- filterRequestContext.setResponse(new PortletActionServletResponseWrapper(filterRequestContext.getResponse(), responseState));
- }
- else
- {
- filterRequestContext.setResponse(new PortletRenderServletResponseWrapper(filterRequestContext.getResponse(), (RenderResponse)filterRequestContext.getRequest().getAttribute("javax.portlet.response"),responseState));
- }
- }
- else
- {
- ServletContext context = config.getServletContext();
- HttpServletRequest request = filterRequestContext.getRequest();
- String pathInfo = request.getRequestURI().substring(request.getContextPath().length()+filterPath.length());
- String portletWindowId = decodePortletWindowId(pathInfo);
- if (portletWindowId != null)
- {
- HttpSession proxiedSession = ServletPortletSessionProxy.createProxy(request, portletWindowId);
- pathInfo = stripWindowIdFromPathInfo(pathInfo);
- filterRequestContext.setRequest(new PortletServletRequestWrapper(context,request,proxiedSession, filterPath, pathInfo));
- }
- }
- return inPortletContext;
- }
-
- public boolean createPortletRequestContext(WebRequest request, WebResponse response)
- {
- if (request.getHttpServletRequest().getAttribute("javax.portlet.config") != null)
- {
- newPortletRequestContext((ServletWebRequest)request, response);
- return true;
- }
- return false;
- }
-
- public String getServletResourceUrlPortletWindowIdPrefix()
- {
- return SERVLET_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX;
- }
- public String decodePortletWindowId(String pathInfo)
- {
+ public void initFilter(FilterConfig filterConfig, WebApplication webApplication)
+ throws ServletException
+ {
+ webApplication.getRequestCycleSettings().setRenderStrategy(
+ IRequestCycleSettings.REDIRECT_TO_RENDER);
+ webApplication.getRequestCycleSettings()
+ .addResponseFilter(new PortletInvalidMarkupFilter());
+ }
+
+ public boolean setupFilter(FilterConfig config, FilterRequestContext filterRequestContext,
+ String filterPath) throws IOException, ServletException
+ {
+ boolean inPortletContext = false;
+ PortletConfig portletConfig = (PortletConfig)filterRequestContext.getRequest()
+ .getAttribute("javax.portlet.config");
+ if (portletConfig != null)
+ {
+ inPortletContext = true;
+ WicketResponseState responseState = (WicketResponseState)filterRequestContext
+ .getRequest().getAttribute(WicketPortlet.RESPONSE_STATE_ATTR);
+ filterRequestContext.setRequest(new PortletServletRequestWrapper(config
+ .getServletContext(), filterRequestContext.getRequest(),
+ ServletPortletSessionProxy.createProxy(filterRequestContext.getRequest()),
+ filterPath));
+ if (WicketPortlet.ACTION_REQUEST.equals(filterRequestContext.getRequest().getAttribute(
+ WicketPortlet.REQUEST_TYPE_ATTR)))
+ {
+ filterRequestContext.setResponse(new PortletActionServletResponseWrapper(
+ filterRequestContext.getResponse(), responseState));
+ }
+ else
+ {
+ filterRequestContext
+ .setResponse(new PortletRenderServletResponseWrapper(filterRequestContext
+ .getResponse(), (RenderResponse)filterRequestContext.getRequest()
+ .getAttribute("javax.portlet.response"), responseState));
+ }
+ }
+ else
+ {
+ ServletContext context = config.getServletContext();
+ HttpServletRequest request = filterRequestContext.getRequest();
+ String pathInfo = request.getRequestURI().substring(
+ request.getContextPath().length() + filterPath.length());
+ String portletWindowId = decodePortletWindowId(pathInfo);
+ if (portletWindowId != null)
+ {
+ HttpSession proxiedSession = ServletPortletSessionProxy.createProxy(request,
+ portletWindowId);
+ pathInfo = stripWindowIdFromPathInfo(pathInfo);
+ filterRequestContext.setRequest(new PortletServletRequestWrapper(context, request,
+ proxiedSession, filterPath, pathInfo));
+ }
+ }
+ return inPortletContext;
+ }
+
+ public boolean createPortletRequestContext(WebRequest request, WebResponse response)
+ {
+ if (request.getHttpServletRequest().getAttribute("javax.portlet.config") != null)
+ {
+ newPortletRequestContext((ServletWebRequest)request, response);
+ return true;
+ }
+ return false;
+ }
+
+ public String getServletResourceUrlPortletWindowIdPrefix()
+ {
+ return SERVLET_RESOURCE_URL_PORTLET_WINDOW_ID_PREFIX;
+ }
+
+ public String decodePortletWindowId(String pathInfo)
+ {
String portletWindowId = null;
- if (pathInfo != null && pathInfo.startsWith(getServletResourceUrlPortletWindowIdPrefix()))
- {
- int nextPath = pathInfo.indexOf('/',1);
- if (nextPath > -1)
- {
- portletWindowId = pathInfo.substring(getServletResourceUrlPortletWindowIdPrefix().length(),nextPath);
- }
- else
- {
- portletWindowId = pathInfo.substring(getServletResourceUrlPortletWindowIdPrefix().length());
- }
- }
- return portletWindowId;
- }
-
- public String stripWindowIdFromPathInfo(String pathInfo)
- {
- if (pathInfo != null && pathInfo.startsWith(getServletResourceUrlPortletWindowIdPrefix()))
- {
- int nextPath = pathInfo.indexOf('/',1);
- pathInfo = nextPath > -1 ? pathInfo.substring(nextPath) : null;
- }
- return pathInfo;
- }
-
- public String encodeWindowIdInPath(String windowId, CharSequence path)
- {
+ if (pathInfo != null && pathInfo.startsWith(getServletResourceUrlPortletWindowIdPrefix()))
+ {
+ int nextPath = pathInfo.indexOf('/', 1);
+ if (nextPath > -1)
+ {
+ portletWindowId = pathInfo.substring(getServletResourceUrlPortletWindowIdPrefix()
+ .length(), nextPath);
+ }
+ else
+ {
+ portletWindowId = pathInfo.substring(getServletResourceUrlPortletWindowIdPrefix()
+ .length());
+ }
+ }
+ return portletWindowId;
+ }
+
+ public String stripWindowIdFromPathInfo(String pathInfo)
+ {
+ if (pathInfo != null && pathInfo.startsWith(getServletResourceUrlPortletWindowIdPrefix()))
+ {
+ int nextPath = pathInfo.indexOf('/', 1);
+ pathInfo = nextPath > -1 ? pathInfo.substring(nextPath) : null;
+ }
+ return pathInfo;
+ }
+
+ public String encodeWindowIdInPath(String windowId, CharSequence path)
+ {
return (getServletResourceUrlPortletWindowIdPrefix().substring(1) + windowId + "/" + path);
- }
+ }
- protected void newPortletRequestContext(ServletWebRequest request, WebResponse response)
- {
+ protected void newPortletRequestContext(ServletWebRequest request, WebResponse response)
+ {
new PortletRequestContext(this, request, response);
- }
+ }
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketPortlet.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketPortlet.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketPortlet.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketPortlet.java Mon Oct 15 14:21:25 2007
@@ -59,34 +59,38 @@
public static final String EDIT_REQUEST = "EDIT";
public static final String HELP_REQUEST = "HELP";
public static final String REQUEST_TYPE_ATTR = WicketPortlet.class.getName() + ".REQUEST_TYPE";
- public static final String WICKET_URL_PORTLET_PARAMETER_ATTR = WicketPortlet.class.getName() + ".WICKET_URL_PORTLET_PARAMETER";
+ public static final String WICKET_URL_PORTLET_PARAMETER_ATTR = WicketPortlet.class.getName() +
+ ".WICKET_URL_PORTLET_PARAMETER";
public static final String CONFIG_PARAM_PREFIX = WicketPortlet.class.getName() + ".";
public static final String RESPONSE_STATE_ATTR = WicketResponseState.class.getName();
- public static final String RESOURCE_URL_FACTORY_ATTR = PortletResourceURLFactory.class.getName();
- public static final String WICKET_PORTLET_PROPERTIES = WicketPortlet.class.getName().replace('.', '/')+".properties";
+ public static final String RESOURCE_URL_FACTORY_ATTR = PortletResourceURLFactory.class
+ .getName();
+ public static final String WICKET_PORTLET_PROPERTIES = WicketPortlet.class.getName().replace(
+ '.', '/') +
+ ".properties";
public static final String WICKET_FILTER_PATH = WicketPortlet.class.getName() + ".FILTERPATH";
public static final String WICKET_FILTER_QUERY = WicketPortlet.class.getName() + ".FILTERQUERY";
- /**
- * Name of portlet init parameter for Action page
- */
- public static final String PARAM_ACTION_PAGE = "actionPage";
- /**
- * Name of portlet init parameter for Custom page
- */
- public static final String PARAM_CUSTOM_PAGE = "customPage";
- /**
- * Name of portlet init parameter for Edit page
- */
- public static final String PARAM_EDIT_PAGE = "editPage";
- /**
- * Name of portlet init parameter for Edit page
- */
- public static final String PARAM_HELP_PAGE = "helpPage";
- /**
- * Name of portlet init parameter for View page
- */
- public static final String PARAM_VIEW_PAGE = "viewPage";
+ /**
+ * Name of portlet init parameter for Action page
+ */
+ public static final String PARAM_ACTION_PAGE = "actionPage";
+ /**
+ * Name of portlet init parameter for Custom page
+ */
+ public static final String PARAM_CUSTOM_PAGE = "customPage";
+ /**
+ * Name of portlet init parameter for Edit page
+ */
+ public static final String PARAM_EDIT_PAGE = "editPage";
+ /**
+ * Name of portlet init parameter for Edit page
+ */
+ public static final String PARAM_HELP_PAGE = "helpPage";
+ /**
+ * Name of portlet init parameter for View page
+ */
+ public static final String PARAM_VIEW_PAGE = "viewPage";
private ServletContextProvider servletContextProvider;
private PortletResourceURLFactory resourceURLFactory;
@@ -107,14 +111,16 @@
if (contextProviderClassName == null)
{
wicketPortletProperties = getWicketPortletProperties(wicketPortletProperties);
- contextProviderClassName = wicketPortletProperties.getProperty(ServletContextProvider.class.getName());
+ contextProviderClassName = wicketPortletProperties
+ .getProperty(ServletContextProvider.class.getName());
}
if (contextProviderClassName == null)
{
- throw new PortletException("Portlet " + config.getPortletName()
- + " is incorrectly configured. Init parameter "
- + PARAM_SERVLET_CONTEXT_PROVIDER + " not specified, nor as context parameter "
- + ServletContextProvider.class.getName() + " or as property in "+WICKET_PORTLET_PROPERTIES + " in the classpath.");
+ throw new PortletException("Portlet " + config.getPortletName() +
+ " is incorrectly configured. Init parameter " + PARAM_SERVLET_CONTEXT_PROVIDER +
+ " not specified, nor as context parameter " +
+ ServletContextProvider.class.getName() + " or as property in " +
+ WICKET_PORTLET_PROPERTIES + " in the classpath.");
}
try
{
@@ -139,14 +145,17 @@
if (resourceURLFactoryClassName == null)
{
wicketPortletProperties = getWicketPortletProperties(wicketPortletProperties);
- resourceURLFactoryClassName = wicketPortletProperties.getProperty(PortletResourceURLFactory.class.getName());
+ resourceURLFactoryClassName = wicketPortletProperties
+ .getProperty(PortletResourceURLFactory.class.getName());
}
if (resourceURLFactoryClassName == null)
{
- throw new PortletException("Portlet " + config.getPortletName()
- + " is incorrectly configured. Init parameter "
- + PARAM_PORTLET_RESOURCE_URL_FACTORY + " not specified, nor as context parameter "
- + PortletResourceURLFactory.class.getName() + " or as property in "+WICKET_PORTLET_PROPERTIES + " in the classpath.");
+ throw new PortletException("Portlet " + config.getPortletName() +
+ " is incorrectly configured. Init parameter " +
+ PARAM_PORTLET_RESOURCE_URL_FACTORY +
+ " not specified, nor as context parameter " +
+ PortletResourceURLFactory.class.getName() + " or as property in " +
+ WICKET_PORTLET_PROPERTIES + " in the classpath.");
}
try
{
@@ -165,11 +174,11 @@
wicketFilterPath = buildWicketFilterPath(config.getInitParameter(WICKET_FILTER_PATH_PARAM));
wicketFilterQuery = buildWicketFilterQuery(wicketFilterPath);
- defaultPages.put(PARAM_VIEW_PAGE,config.getInitParameter(PARAM_VIEW_PAGE));
- defaultPages.put(PARAM_ACTION_PAGE,config.getInitParameter(PARAM_ACTION_PAGE));
- defaultPages.put(PARAM_CUSTOM_PAGE,config.getInitParameter(PARAM_CUSTOM_PAGE));
- defaultPages.put(PARAM_HELP_PAGE,config.getInitParameter(PARAM_HELP_PAGE));
- defaultPages.put(PARAM_EDIT_PAGE,config.getInitParameter(PARAM_EDIT_PAGE));
+ defaultPages.put(PARAM_VIEW_PAGE, config.getInitParameter(PARAM_VIEW_PAGE));
+ defaultPages.put(PARAM_ACTION_PAGE, config.getInitParameter(PARAM_ACTION_PAGE));
+ defaultPages.put(PARAM_CUSTOM_PAGE, config.getInitParameter(PARAM_CUSTOM_PAGE));
+ defaultPages.put(PARAM_HELP_PAGE, config.getInitParameter(PARAM_HELP_PAGE));
+ defaultPages.put(PARAM_EDIT_PAGE, config.getInitParameter(PARAM_EDIT_PAGE));
validateDefaultPages(defaultPages, wicketFilterPath, wicketFilterQuery);
}
@@ -218,7 +227,7 @@
}
else
{
- return wicketFilterPath.substring(0,wicketFilterPath.length()-1)+"?";
+ return wicketFilterPath.substring(0, wicketFilterPath.length() - 1) + "?";
}
}
@@ -230,9 +239,10 @@
}
else if (!url.startsWith(wicketFilterPath))
{
- if ((url+"/").equals(wicketFilterPath))
+ if ((url + "/").equals(wicketFilterPath))
{
- // hack around "old" style wicket home url's without trailing '/' which would lead to a redirect to the real home path anyway
+ // hack around "old" style wicket home url's without trailing '/' which would lead
+ // to a redirect to the real home path anyway
url = wicketFilterPath;
}
else if (url.startsWith(wicketFilterQuery))
@@ -244,10 +254,14 @@
return url;
}
- protected void validateDefaultPages(Map defaultPages, String wicketFilterPath, String wicketFilterQuery)
+ protected void validateDefaultPages(Map defaultPages, String wicketFilterPath,
+ String wicketFilterQuery)
{
- String viewPage = fixWicketUrl((String)defaultPages.get(PARAM_VIEW_PAGE), wicketFilterPath, wicketFilterQuery);
- defaultPages.put(PARAM_VIEW_PAGE, viewPage.startsWith(wicketFilterPath) ? viewPage : wicketFilterPath);
+ String viewPage = fixWicketUrl((String)defaultPages.get(PARAM_VIEW_PAGE), wicketFilterPath,
+ wicketFilterQuery);
+ defaultPages.put(PARAM_VIEW_PAGE, viewPage.startsWith(wicketFilterPath)
+ ? viewPage
+ : wicketFilterPath);
String defaultPage = (String)defaultPages.get(PARAM_ACTION_PAGE);
if (defaultPage == null)
@@ -257,7 +271,9 @@
else
{
defaultPage = fixWicketUrl(defaultPage, wicketFilterPath, wicketFilterQuery);
- defaultPages.put(PARAM_ACTION_PAGE, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage);
+ defaultPages.put(PARAM_ACTION_PAGE, defaultPage.startsWith(wicketFilterPath)
+ ? defaultPage
+ : viewPage);
}
defaultPage = (String)defaultPages.get(PARAM_CUSTOM_PAGE);
@@ -268,7 +284,9 @@
else
{
defaultPage = fixWicketUrl(defaultPage, wicketFilterPath, wicketFilterQuery);
- defaultPages.put(PARAM_CUSTOM_PAGE, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage);
+ defaultPages.put(PARAM_CUSTOM_PAGE, defaultPage.startsWith(wicketFilterPath)
+ ? defaultPage
+ : viewPage);
}
defaultPage = (String)defaultPages.get(PARAM_HELP_PAGE);
@@ -279,7 +297,9 @@
else
{
defaultPage = fixWicketUrl(defaultPage, wicketFilterPath, wicketFilterQuery);
- defaultPages.put(PARAM_HELP_PAGE, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage);
+ defaultPages.put(PARAM_HELP_PAGE, defaultPage.startsWith(wicketFilterPath)
+ ? defaultPage
+ : viewPage);
}
defaultPage = (String)defaultPages.get(PARAM_EDIT_PAGE);
@@ -290,7 +310,9 @@
else
{
defaultPage = fixWicketUrl(defaultPage, wicketFilterPath, wicketFilterQuery);
- defaultPages.put(PARAM_EDIT_PAGE, defaultPage.startsWith(wicketFilterPath) ? defaultPage : viewPage);
+ defaultPages.put(PARAM_EDIT_PAGE, defaultPage.startsWith(wicketFilterPath)
+ ? defaultPage
+ : viewPage);
}
}
@@ -300,7 +322,8 @@
{
properties = new Properties();
}
- InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(WICKET_PORTLET_PROPERTIES);
+ InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(
+ WICKET_PORTLET_PROPERTIES);
if (is != null)
{
try
@@ -309,7 +332,8 @@
}
catch (IOException e)
{
- throw new PortletException("Failed to load WicketPortlet.properties from classpath", e);
+ throw new PortletException(
+ "Failed to load WicketPortlet.properties from classpath", e);
}
}
return properties;
@@ -348,7 +372,8 @@
return getServletContextProvider().getHttpServletResponse(portlet, response);
}
- protected String getWicketConfigParameter(PortletRequest request, String paramName, String defaultValue)
+ protected String getWicketConfigParameter(PortletRequest request, String paramName,
+ String defaultValue)
{
return defaultValue;
}
@@ -368,17 +393,21 @@
String wicketURL = null;
if (request instanceof ActionRequest)
{
- wicketURL = request.getParameter((String)request.getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR));
+ wicketURL = request.getParameter((String)request
+ .getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR));
}
else
{
- wicketURL = request.getParameter((String)request.getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR)+request.getPortletMode().toString());
+ wicketURL = request.getParameter((String)request
+ .getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR) +
+ request.getPortletMode().toString());
}
- if (wicketURL == null)
- {
- wicketURL = getWicketConfigParameter(request, CONFIG_PARAM_PREFIX+pageType, defaultPage);
- }
- return wicketURL;
+ if (wicketURL == null)
+ {
+ wicketURL = getWicketConfigParameter(request, CONFIG_PARAM_PREFIX + pageType,
+ defaultPage);
+ }
+ return wicketURL;
}
protected void doView(RenderRequest request, RenderResponse response) throws PortletException,
@@ -399,8 +428,8 @@
processRequest(request, response, HELP_REQUEST, PARAM_HELP_PAGE);
}
- protected void doCustom(RenderRequest request, RenderResponse response) throws PortletException,
- IOException
+ protected void doCustom(RenderRequest request, RenderResponse response)
+ throws PortletException, IOException
{
processRequest(request, response, CUSTOM_REQUEST, PARAM_CUSTOM_PAGE);
}
@@ -418,11 +447,14 @@
String wicketFilterPath = null;
String wicketFilterQuery = null;
- request.setAttribute(WICKET_URL_PORTLET_PARAMETER_ATTR, getWicketUrlPortletParameter(request));
+ request.setAttribute(WICKET_URL_PORTLET_PARAMETER_ATTR,
+ getWicketUrlPortletParameter(request));
wicketURL = getWicketURL(request, pageType, getDefaultPage(pageType));
- wicketFilterPath = getWicketConfigParameter(request, WICKET_FILTER_PATH, this.wicketFilterPath);
- wicketFilterQuery = getWicketConfigParameter(request, WICKET_FILTER_QUERY, this.wicketFilterQuery);
+ wicketFilterPath = getWicketConfigParameter(request, WICKET_FILTER_PATH,
+ this.wicketFilterPath);
+ wicketFilterQuery = getWicketConfigParameter(request, WICKET_FILTER_QUERY,
+ this.wicketFilterQuery);
boolean actionRequest = ACTION_REQUEST.equals(requestType);
@@ -434,7 +466,7 @@
String portletResourceURL = request.getParameter(PORTLET_RESOURCE_URL_PARAMETER);
if (portletResourceURL != null)
{
- request.setAttribute(PORTLET_RESOURCE_URL_ATTR,portletResourceURL);
+ request.setAttribute(PORTLET_RESOURCE_URL_ATTR, portletResourceURL);
}
if (actionRequest)
@@ -466,7 +498,8 @@
try
{
rd.include(req, res);
- processActionResponseState(wicketURL, wicketFilterPath, wicketFilterQuery, (ActionRequest)request, (ActionResponse)response, responseState);
+ processActionResponseState(wicketURL, wicketFilterPath, wicketFilterQuery,
+ (ActionRequest)request, (ActionResponse)response, responseState);
}
catch (ServletException e)
{
@@ -487,20 +520,31 @@
String redirectLocation = responseState.getRedirectLocation();
if (redirectLocation != null)
{
- redirectLocation = fixWicketUrl(redirectLocation, wicketFilterPath, wicketFilterQuery);
+ redirectLocation = fixWicketUrl(redirectLocation, wicketFilterPath,
+ wicketFilterQuery);
boolean validWicketUrl = redirectLocation.startsWith(wicketFilterPath);
if (portletResourceURL != null)
{
if (validWicketUrl)
{
HashMap parameters = new HashMap(2);
- parameters.put((String)request.getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR)+request.getPortletMode().toString(), new String[]{redirectLocation});
- parameters.put(PORTLET_RESOURCE_URL_PARAMETER, new String[]{"true"});
- redirectLocation = resourceURLFactory.createResourceURL(getPortletConfig(), (RenderRequest)request, (RenderResponse)response, parameters);
+ parameters
+ .put(
+ (String)request
+ .getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR) +
+ request.getPortletMode().toString(),
+ new String[] { redirectLocation });
+ parameters.put(PORTLET_RESOURCE_URL_PARAMETER,
+ new String[] { "true" });
+ redirectLocation = resourceURLFactory.createResourceURL(
+ getPortletConfig(), (RenderRequest)request,
+ (RenderResponse)response, parameters);
}
- getHttpServletResponse(this, request, response).sendRedirect(redirectLocation);
+ getHttpServletResponse(this, request, response).sendRedirect(
+ redirectLocation);
}
- else if (validWicketUrl && ((previousURL == null || previousURL != redirectLocation)))
+ else if (validWicketUrl &&
+ ((previousURL == null || previousURL != redirectLocation)))
{
previousURL = wicketURL;
wicketURL = redirectLocation;
@@ -519,14 +563,19 @@
}
}
- protected void processActionResponseState(String wicketURL, String wicketFilterPath, String wicketFilterQuery, ActionRequest request, ActionResponse response, WicketResponseState responseState) throws PortletException, IOException
+ protected void processActionResponseState(String wicketURL, String wicketFilterPath,
+ String wicketFilterQuery, ActionRequest request, ActionResponse response,
+ WicketResponseState responseState) throws PortletException, IOException
{
- if ( responseState.getRedirectLocation() != null )
+ if (responseState.getRedirectLocation() != null)
{
- wicketURL = fixWicketUrl(responseState.getRedirectLocation(), wicketFilterPath, wicketFilterQuery);
+ wicketURL = fixWicketUrl(responseState.getRedirectLocation(), wicketFilterPath,
+ wicketFilterQuery);
if (wicketURL.startsWith(wicketFilterPath))
{
- response.setRenderParameter((String)request.getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR)+request.getPortletMode().toString(), wicketURL);
+ response.setRenderParameter((String)request
+ .getAttribute(WicketPortlet.WICKET_URL_PORTLET_PARAMETER_ATTR) +
+ request.getPortletMode().toString(), wicketURL);
}
else
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketResponseState.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketResponseState.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketResponseState.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/portlet/WicketResponseState.java Mon Oct 15 14:21:25 2007
@@ -28,6 +28,7 @@
/**
* Gets errorCode.
+ *
* @return errorCode
*/
public int getErrorCode()
@@ -37,67 +38,78 @@
/**
* Sets errorCode.
- * @param errorCode errorCode
+ *
+ * @param errorCode
+ * errorCode
*/
public void setErrorCode(int errorCode)
{
this.errorCode = errorCode;
}
-
+
/**
* Gets errorMessage.
+ *
* @return errorMessage
*/
public String getErrorMessage()
{
return errorMessage;
}
-
+
/**
* Sets errorMessage.
- * @param errorMessage errorMessage
+ *
+ * @param errorMessage
+ * errorMessage
*/
public void setErrorMessage(String errorMessage)
{
this.errorMessage = errorMessage;
}
-
+
/**
* Gets redirectLocation.
+ *
* @return redirectLocation
*/
public String getRedirectLocation()
{
return redirectLocation;
}
-
+
/**
* Sets redirectLocation.
- * @param redirectLocation redirectLocation
+ *
+ * @param redirectLocation
+ * redirectLocation
*/
public void setRedirectLocation(String redirectLocation)
{
this.redirectLocation = redirectLocation;
}
-
+
/**
* Gets statusCode.
+ *
* @return statusCode
*/
public int getStatusCode()
{
return statusCode;
}
-
+
/**
* Sets statusCode.
- * @param statusCode statusCode
+ *
+ * @param statusCode
+ * statusCode
*/
public void setStatusCode(int statusCode)
{
this.statusCode = statusCode;
}
-
+
public void reset()
{
errorCode = 0;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/CryptedUrlWebRequestCodingStrategy.java Mon Oct 15 14:21:25 2007
@@ -42,15 +42,14 @@
/**
- * This is a request coding strategy which encrypts the URL and hence makes it
- * impossible for users to guess what is in the url and rebuild it manually. It
- * uses the CryptFactory registered with the application to encode and decode
- * the URL. Hence, the coding algorithm must be a two-way one (reversible).
- * Because the algorithm is reversible, URLs which were bookmarkable before will
+ * This is a request coding strategy which encrypts the URL and hence makes it impossible for users
+ * to guess what is in the url and rebuild it manually. It uses the CryptFactory registered with the
+ * application to encode and decode the URL. Hence, the coding algorithm must be a two-way one
+ * (reversible). Because the algorithm is reversible, URLs which were bookmarkable before will
* remain bookmarkable.
* <p>
* To register the request coding strategy to need to do the following:
- *
+ *
* <pre>
* protected IRequestCycleProcessor newRequestCycleProcessor()
* {
@@ -63,24 +62,25 @@
* };
* }
* </pre>
- *
- * <b>Note:</b> When trying to hack urls in the browser an exception might be
- * caught while decoding the URL. By default, for safety reasons a very simple
- * WicketRuntimeException is thrown. The original stack trace is only logged.
- *
+ *
+ * <b>Note:</b> When trying to hack urls in the browser an exception might be caught while decoding
+ * the URL. By default, for safety reasons a very simple WicketRuntimeException is thrown. The
+ * original stack trace is only logged.
+ *
* @author Juergen Donnerstag
*/
public class CryptedUrlWebRequestCodingStrategy implements IRequestCodingStrategy
{
/** log. */
- private static final Logger log = LoggerFactory.getLogger(CryptedUrlWebRequestCodingStrategy.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(CryptedUrlWebRequestCodingStrategy.class);
/** The default request coding strategy most of the methods are delegated to */
private final IRequestCodingStrategy defaultStrategy;
/**
* Construct.
- *
+ *
* @param defaultStrategy
* The default strategy most requests are forwarded to
*/
@@ -91,7 +91,7 @@
/**
* Decode the querystring of the URL
- *
+ *
* @see org.apache.wicket.request.IRequestCodingStrategy#decode(org.apache.wicket.Request)
*/
public RequestParameters decode(final Request request)
@@ -112,7 +112,7 @@
/**
* Encode the querystring of the URL
- *
+ *
* @see org.apache.wicket.request.IRequestCodingStrategy#encode(org.apache.wicket.RequestCycle,
* org.apache.wicket.IRequestTarget)
*/
@@ -125,7 +125,7 @@
/**
* @see org.apache.wicket.request.IRequestTargetMounter#mount(
- org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy)
+ * org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy)
*/
public void mount(IRequestTargetUrlCodingStrategy urlCodingStrategy)
{
@@ -166,7 +166,7 @@
/**
* Returns the given url encoded.
- *
+ *
* @param url
* The URL to encode
* @return The encoded url
@@ -225,7 +225,7 @@
/**
* Decode the "x" parameter of the querystring
- *
+ *
* @param url
* The encoded URL
* @return The decoded 'x' parameter of the querystring
@@ -274,7 +274,7 @@
/**
* @param ex
- *
+ *
* @return decoded URL
*/
protected String onError(final Exception ex)
@@ -285,9 +285,9 @@
}
/**
- * Try to shorten the querystring without loosing information. Note:
- * WebRequestWithCryptedUrl must implement exactly the opposite logic.
- *
+ * Try to shorten the querystring without loosing information. Note: WebRequestWithCryptedUrl
+ * must implement exactly the opposite logic.
+ *
* @param queryString
* The original query string
* @return The shortened querystring
@@ -327,10 +327,10 @@
}
/**
- * In case the query string has been shortened prior to encryption, than
- * rebuild (lengthen) the query string now. Note: This implementation must
- * exactly match the reverse one implemented in WebResponseWithCryptedUrl.
- *
+ * In case the query string has been shortened prior to encryption, than rebuild (lengthen) the
+ * query string now. Note: This implementation must exactly match the reverse one implemented in
+ * WebResponseWithCryptedUrl.
+ *
* @param queryString
* The URL's query string
* @return The lengthened query string
@@ -356,10 +356,9 @@
}
/**
- * IRequestCodingStrategy.decode(Request) requires a Request parameter and
- * not a URL. Hence, based on the original URL and the decoded 'x' parameter
- * a new Request object must be created to serve the default coding strategy
- * as input for analyzing the URL.
+ * IRequestCodingStrategy.decode(Request) requires a Request parameter and not a URL. Hence,
+ * based on the original URL and the decoded 'x' parameter a new Request object must be created
+ * to serve the default coding strategy as input for analyzing the URL.
*/
private static class DecodedUrlRequest extends Request
{
@@ -370,14 +369,13 @@
private final String url;
/**
- * The new parameter map with the 'x' param removed and the 'new' one
- * included
+ * The new parameter map with the 'x' param removed and the 'new' one included
*/
private final Map parameterMap;
/**
* Construct.
- *
+ *
* @param request
* @param url
* @param encodedParamReplacement
@@ -416,8 +414,8 @@
}
int pos2 = url.indexOf("&");
- AppendingStringBuffer urlBuf = new AppendingStringBuffer(url.length()
- + encodedParamReplacement.length());
+ AppendingStringBuffer urlBuf = new AppendingStringBuffer(url.length() +
+ encodedParamReplacement.length());
urlBuf.append(url.subSequence(0, pos1 + 1));
urlBuf.append(encodedParamReplacement);
if (pos2 != -1)
@@ -429,7 +427,7 @@
/**
* Delegate to the original request
- *
+ *
* @see org.apache.wicket.Request#getLocale()
*/
public Locale getLocale()
@@ -535,7 +533,7 @@
}
/**
- *
+ *
*/
public class HackAttackException extends WicketRuntimeException
{
@@ -543,7 +541,7 @@
/**
* Construct.
- *
+ *
* @param msg
*/
public HackAttackException(final String msg)
@@ -552,9 +550,8 @@
}
/**
- * No stack trace. We won't tell the hackers about the internals of
- * wicket
- *
+ * No stack trace. We won't tell the hackers about the internals of wicket
+ *
* @see java.lang.Throwable#getStackTrace()
*/
public StackTraceElement[] getStackTrace()
@@ -563,9 +560,8 @@
}
/**
- * No additional information. We won't tell the hackers about the
- * internals of wicket
- *
+ * No additional information. We won't tell the hackers about the internals of wicket
+ *
* @see java.lang.Throwable#toString()
*/
public String toString()
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebClientInfo.java Mon Oct 15 14:21:25 2007
@@ -38,10 +38,10 @@
private static final Logger log = LoggerFactory.getLogger(WebClientInfo.class);
/**
- * The user agent string from the User-Agent header, app. Theoretically,
- * this might differ from {@link ClientProperties#isJavaEnabled()} property,
- * which is not set until an actual reply from a browser (e.g. using
- * {@link org.apache.wicket.markup.html.pages.BrowserInfoPage} is set.
+ * The user agent string from the User-Agent header, app. Theoretically, this might differ from
+ * {@link ClientProperties#isJavaEnabled()} property, which is not set until an actual reply
+ * from a browser (e.g. using {@link org.apache.wicket.markup.html.pages.BrowserInfoPage} is
+ * set.
*/
private final String userAgent;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseTarget.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseTarget.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebErrorCodeResponseTarget.java Mon Oct 15 14:21:25 2007
@@ -28,9 +28,9 @@
/**
- * Response target that is to be used in a servlet environment to send an error
- * code and optionally a message. NOTE: this target can only be used in a
- * servlet environment with {@link org.apache.wicket.protocol.http.WebRequestCycle}s.
+ * Response target that is to be used in a servlet environment to send an error code and optionally
+ * a message. NOTE: this target can only be used in a servlet environment with
+ * {@link org.apache.wicket.protocol.http.WebRequestCycle}s.
*
* @author Eelco Hillenius
*/
@@ -72,8 +72,7 @@
}
/**
- * Respond by sending the set errorCode and optionally the message to the
- * browser.
+ * Respond by sending the set errorCode and optionally the message to the browser.
*
* @see org.apache.wicket.IRequestTarget#respond(org.apache.wicket.RequestCycle)
*/
@@ -165,7 +164,7 @@
*/
public String toString()
{
- return "[WebErrorCodeResponseTarget@" + hashCode() + " errorCode=" + getErrorCode()
- + ((message != null) ? " (" + message + ")" : "" + "]");
+ return "[WebErrorCodeResponseTarget@" + hashCode() + " errorCode=" + getErrorCode() +
+ ((message != null) ? " (" + message + ")" : "" + "]");
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebExternalResourceRequestTarget.java Mon Oct 15 14:21:25 2007
@@ -24,10 +24,9 @@
/**
- * Request target that is not a Wicket resource. For example, such a resource
- * could denote an image in the web application directory (not mapped to a
- * Wicket servlet). NOTE: this target can only be used in a servlet environment
- * with {@link org.apache.wicket.protocol.http.WebRequestCycle}s.
+ * Request target that is not a Wicket resource. For example, such a resource could denote an image
+ * in the web application directory (not mapped to a Wicket servlet). NOTE: this target can only be
+ * used in a servlet environment with {@link org.apache.wicket.protocol.http.WebRequestCycle}s.
*
* <p>
* <b>NOTE:</b> this class is a wrapper around
@@ -40,7 +39,8 @@
public class WebExternalResourceRequestTarget extends ResourceStreamRequestTarget
{
/** log. */
- private static final Logger log = LoggerFactory.getLogger(WebExternalResourceRequestTarget.class);
+ private static final Logger log = LoggerFactory
+ .getLogger(WebExternalResourceRequestTarget.class);
/** the relative url of the external resource. */
private final String uri;
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java Mon Oct 15 14:21:25 2007
@@ -65,7 +65,7 @@
/**
* Request parameters factory implementation that uses http request parameters and path info to
* construct the request parameters object.
- *
+ *
* @author Eelco Hillenius
* @author Jonathan Locke
*/
@@ -88,7 +88,7 @@
/**
* Url name of the default pagemap
- *
+ *
* When we encode the default pagemap name in a url we cannot always use null or "" because it
* breaks urls which are encoded with /param1/value1/ eg /product/14/wicket:pageMapName/ split
* on / will split into {product,14,wicket:pageMapName}
@@ -108,7 +108,7 @@
/**
* Various settings used to configure this strategy
- *
+ *
* @author ivaynberg
*/
public static class Settings
@@ -125,7 +125,7 @@
/**
* Sets mountsCaseSensitive.
- *
+ *
* @param mountsCaseSensitive
* mountsCaseSensitive
*/
@@ -136,7 +136,7 @@
/**
* Gets caseSensitive.
- *
+ *
* @return caseSensitive
*/
public boolean areMountsCaseSensitive()
@@ -174,7 +174,7 @@
/**
* Construct.
- *
+ *
* @param settings
*/
public WebRequestCodingStrategy(Settings settings)
@@ -225,7 +225,7 @@
* {@link #doEncode(RequestCycle, IRequestTarget)}, which will be called after the defaults
* have been tried. When that doesn't provide a url either, an exception will be thrown saying
* that encoding could not be done.
- *
+ *
* @see org.apache.wicket.request.IRequestCodingStrategy#encode(org.apache.wicket.RequestCycle,
* org.apache.wicket.IRequestTarget)
*/
@@ -360,7 +360,7 @@
/**
* Returns the given url encoded.
- *
+ *
* @param url
* The URL to encode
* @return The encoded url
@@ -501,11 +501,11 @@
* Adds bookmarkable page related parameters (page alias and optionally page parameters). Any
* bookmarkable page alias mount will override this method; hence if a mount is found, this
* method will not be called.
- *
+ *
* If you override this method to behave differently then
* {@link #encode(RequestCycle, IBookmarkablePageRequestTarget)} should also be overridden to be
* in sync with that behavior.
- *
+ *
* @param request
* the incoming request
* @param parameters
@@ -539,11 +539,11 @@
/**
* Adds page related parameters (path and pagemap and optionally version and interface).
- *
+ *
* If you override this method to behave different then also
* {@link #encode(RequestCycle, IListenerInterfaceRequestTarget)} should be overridden to be in
* sync with that behavior.
- *
+ *
* @param request
* the incoming request
* @param parameters
@@ -557,7 +557,7 @@
/**
* Analyzes the passed in interfaceParameter for the relevant parts and puts the parts as
* parameters in the provided request parameters object.
- *
+ *
* @param interfaceParameter
* The format of the interfaceParameter is: <code>
* page-map-name:path:version:interface:behaviourId:urlDepth
@@ -642,11 +642,11 @@
/**
* Adds (shared) resource related parameters (resource key). Any shared resource key mount will
* override this method; hence if a mount is found, this method will not be called.
- *
+ *
* If you override this method to behave different then also
* {@link #encode(RequestCycle, ISharedResourceRequestTarget)} should be overridden to be in
* sync with that behavior.
- *
+ *
* @param request
* the incoming request
* @param parameters
@@ -682,10 +682,10 @@
* need to override this method, which will be called after the defaults have been tried. When
* this doesn't provide a url either (returns null), an exception will be thrown by the encode
* method saying that encoding could not be done.
- *
+ *
* @param requestCycle
* the current request cycle (for efficient access)
- *
+ *
* @param requestTarget
* the request target
* @return the url to the provided target, as a relative path from the filter root.
@@ -697,11 +697,11 @@
/**
* Encode a page class target.
- *
+ *
* If you override this method to behave different then also
* {@link #addBookmarkablePageParameters(Request, RequestParameters)} should be overridden to be
* in sync with that behavior.
- *
+ *
* @param requestCycle
* the current request cycle
* @param requestTarget
@@ -749,10 +749,10 @@
{
/*
* Add <page-map-name>:<bookmarkable-page-class>
- *
+ *
* Encode the url so it is correct even for class names containing non ASCII characters,
* like ä, æ, ø, å etc.
- *
+ *
* The reason for this is that when redirecting to these bookmarkable pages, we need to
* have the url encoded correctly because we can't rely on the browser to interpret the
* unencoded url correctly.
@@ -792,11 +792,11 @@
/**
* Encode a shared resource target.
- *
+ *
* If you override this method to behave different then also
* {@link #addResourceParameters(Request, RequestParameters)} should be overridden to be in sync
* with that behavior.
- *
+ *
* @param requestCycle
* the current request cycle
* @param requestTarget
@@ -840,11 +840,11 @@
/**
* Encode a listener interface target.
- *
+ *
* If you override this method to behave different then also
* {@link #addInterfaceParameters(Request, RequestParameters)} should be overridden to be in
* sync with that behavior.
- *
+ *
* @param requestCycle
* the current request cycle
* @param requestTarget
@@ -922,7 +922,7 @@
/**
* Encode a page target.
- *
+ *
* @param requestCycle
* the current request cycle
* @param requestTarget
@@ -946,7 +946,7 @@
/**
* Gets the mount encoder for the given request target if any.
- *
+ *
* @param requestTarget
* the request target to match
* @return the mount encoder if any
@@ -973,7 +973,7 @@
* Gets the request info path. This is an overridable method in order to provide users with a
* means to implement e.g. a path encryption scheme. This method by default returns
* {@link Request#getPath()}.
- *
+ *
* @param request
* the request
* @return the path info object, possibly processed
@@ -985,7 +985,7 @@
/**
* Map used to store mount paths and their corresponding url coding strategies.
- *
+ *
* @author ivaynberg
*/
private static class MountsMap
@@ -1000,7 +1000,7 @@
/**
* Constructor
- *
+ *
* @param caseSensitiveMounts
* whether or not keys of this map are case-sensitive
*/
@@ -1013,9 +1013,9 @@
/**
* Checks if the specified path matches any mount, and if so returns the coding strategy for
* that mount. Returns null if the path doesn't match any mounts.
- *
+ *
* NOTE: path here is not the mount - it is the full url path
- *
+ *
* @param path
* non-null url path
* @return coding strategy or null
@@ -1067,7 +1067,7 @@
/**
* Removes mount from the map
- *
+ *
* @param mount
*/
public void unmount(String mount)
@@ -1083,7 +1083,7 @@
/**
* Gets the coding strategy for the specified mount path
- *
+ *
* @param mount
* mount path
* @return associated coding strategy or null if none
@@ -1100,7 +1100,7 @@
/**
* Associates a mount with a coding strategy
- *
+ *
* @param mount
* @param encoder
* @return previous coding strategy associated with the mount, or null if none
@@ -1146,11 +1146,11 @@
/**
* Makes page map name url safe.
- *
+ *
* Since the default page map name in wicket is null and null does not encode well into urls
* this method will substitute null for a known token. If the <code>pageMapName</code> passed
* in is not null it is returned without modification.
- *
+ *
* @param pageMapName
* page map name
* @return encoded pagemap name
@@ -1169,7 +1169,7 @@
/**
* Undoes the effect of {@link #encodePageMapName(String)}
- *
+ *
* @param pageMapName
* page map name
* @return decoded page map name
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java Mon Oct 15 14:21:25 2007
@@ -31,10 +31,9 @@
/**
- * Use this CodingStategy with the
- * {@link UrlCompressingWebRequestProcessor} to minimize the
- * wicket:interface urls. The component path and the interface name will be
- * removed from the url and only an uid will be inserted into the url.
+ * Use this CodingStategy with the {@link UrlCompressingWebRequestProcessor} to minimize the
+ * wicket:interface urls. The component path and the interface name will be removed from the url and
+ * only an uid will be inserted into the url.
*
* Use it like this:
*
@@ -126,7 +125,7 @@
url.append(params.getBehaviorId());
}
url.append(Component.PATH_SEPARATOR);
-
+
// Add URL depth
if (params != null && params.getUrlDepth() != 0)
{
@@ -134,7 +133,8 @@
}
if (IActivePageBehaviorListener.INTERFACE.getName().equals(listenerName))
{
- url.append(url.indexOf("?") > -1 ? "&" : "?").append(IGNORE_IF_NOT_ACTIVE_PARAMETER_NAME).append("=true");
+ url.append(url.indexOf("?") > -1 ? "&" : "?").append(
+ IGNORE_IF_NOT_ACTIVE_PARAMETER_NAME).append("=true");
}
return requestCycle.getOriginalResponse().encodeURL(url);
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java Mon Oct 15 14:21:25 2007
@@ -35,16 +35,14 @@
import org.apache.wicket.util.string.Strings;
/**
- * Use this processor to minimize the wicket:interface urls. The component path
- * and the interface name will be removed from the url and only an uid will be
- * inserted into the url.
- *
- * To use this url compressing behavior you must override the
- * {@link Application}'s newRequestCycleProcessor() method and return an
- * instance of this.
- *
+ * Use this processor to minimize the wicket:interface urls. The component path and the interface
+ * name will be removed from the url and only an uid will be inserted into the url.
+ *
+ * To use this url compressing behavior you must override the {@link Application}'s
+ * newRequestCycleProcessor() method and return an instance of this.
+ *
* @author jcompagner
- *
+ *
* @since 1.3
*/
public class UrlCompressingWebRequestProcessor extends WebRequestCycleProcessor
@@ -125,9 +123,8 @@
if (component == null)
{
// still null? that's not right
- throw new WicketRuntimeException("cannot resolve component with path '"
- + pageRelativeComponentPath + "', listener " + listener + " on page "
- + page);
+ throw new WicketRuntimeException("cannot resolve component with path '" +
+ pageRelativeComponentPath + "', listener " + listener + " on page " + page);
}
if (!component.isEnableAllowed())
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressor.java Mon Oct 15 14:21:25 2007
@@ -28,8 +28,8 @@
/**
- * This class generates UID for Component/Interface combinations when used in
- * conjunction with {@link UrlCompressingWebCodingStrategy}
+ * This class generates UID for Component/Interface combinations when used in conjunction with
+ * {@link UrlCompressingWebCodingStrategy}
*
* Use it like this:
*
@@ -66,8 +66,7 @@
}
/**
- * @return Component The component that should be used to call the
- * interface
+ * @return Component The component that should be used to call the interface
*/
public Component getComponent()
{
@@ -75,8 +74,7 @@
}
/**
- * @return String The interface name which should be called on the
- * component
+ * @return String The interface name which should be called on the component
*/
public String getInterfaceName()
{
@@ -135,9 +133,8 @@
}
/**
- * Returns a uid for the combination component and the to call interface.
- * Will return the same uid if it was already called for this specific
- * combination.
+ * Returns a uid for the combination component and the to call interface. Will return the same
+ * uid if it was already called for this specific combination.
*
* @param component
* The Component
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java Mon Oct 15 14:21:25 2007
@@ -27,8 +27,8 @@
/**
* Causes Wicket to abort processing and set the specified HTTP status code. An
- * {@link IllegalStateException} will be thrown if HTTP status code could not be
- * set and the optional parameter is specified as false.
+ * {@link IllegalStateException} will be thrown if HTTP status code could not be set and the
+ * optional parameter is specified as false.
*
* This exception can be thrown from a page or a resource.
*
@@ -47,8 +47,7 @@
* @param status
* The http response status code
* @param statusCodeOptional
- * If true and http status could not be set, an
- * IllegalStateException will be thrown
+ * If true and http status could not be set, an IllegalStateException will be thrown
*/
public AbortWithHttpStatusException(int status, boolean statusCodeOptional)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithWebErrorCodeException.java Mon Oct 15 14:21:25 2007
@@ -24,8 +24,8 @@
import org.apache.wicket.protocol.http.request.WebErrorCodeResponseTarget;
/**
- * Causes Wicket to abort processing and set the specified HTTP error code, with
- * the provided message if provided.
+ * Causes Wicket to abort processing and set the specified HTTP error code, with the provided
+ * message if provided.
*
* @author Eelco Hillenius
*
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequest.java Mon Oct 15 14:21:25 2007
@@ -38,7 +38,7 @@
/**
* Servlet specific WebRequest subclass for multipart content uploads.
- *
+ *
* @author Jonathan Locke
* @author Eelco Hillenius
* @author Cameron Braid
@@ -55,8 +55,7 @@
/**
- * total bytes uploaded (downloaded from server's pov) so far. used for
- * upload notifications
+ * total bytes uploaded (downloaded from server's pov) so far. used for upload notifications
*/
private int bytesUploaded;
@@ -66,7 +65,7 @@
/**
* Constructor
- *
+ *
* @param maxSize
* the maximum size allowed for this request
* @param request
@@ -79,7 +78,8 @@
{
super(request);
- if (maxSize == null) {
+ if (maxSize == null)
+ {
throw new IllegalArgumentException("argument maxSize must be not null");
}
@@ -170,7 +170,7 @@
/**
* Adds a parameter to the parameters value map
- *
+ *
* @param name
* parameter name
* @param value
@@ -207,7 +207,7 @@
/**
* Gets the file that was uploaded using the given field name.
- *
+ *
* @param fieldName
* the field name that was used for the upload
* @return the upload with the given field name
@@ -244,7 +244,7 @@
/**
* Subclasses that want to receive upload notifications should return true
- *
+ *
* @return true if upload status update event should be invoked
*/
protected boolean wantUploadProgressUpdates()
@@ -254,7 +254,7 @@
/**
* Upload start callback
- *
+ *
* @param totalBytes
*/
protected void onUploadStarted(int totalBytes)
@@ -264,7 +264,7 @@
/**
* Upload status update callback
- *
+ *
* @param bytesUploaded
* @param total
*/
@@ -283,7 +283,7 @@
/**
* An {@link InputStream} that updates total number of bytes read
- *
+ *
* @author Igor Vaynberg (ivaynberg)
*/
private class CountingInputStream extends InputStream
@@ -293,7 +293,7 @@
/**
* Constructs a new CountingInputStream.
- *
+ *
* @param in
* InputStream to delegate to
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/ServletWebRequest.java Mon Oct 15 14:21:25 2007
@@ -154,9 +154,9 @@
if (RequestContext.get().isPortletRequest())
{
- return relativePathPrefixToContextRoot = getHttpServletRequest().getContextPath()+"/";
+ return relativePathPrefixToContextRoot = getHttpServletRequest().getContextPath() + "/";
}
-
+
// Prepend to get back to the wicket handler.
String tmp = getRelativePathPrefixToWicketHandler();
PrependingStringBuffer prepender = new PrependingStringBuffer(tmp);
@@ -227,7 +227,7 @@
}
boolean portletRequest = RequestContext.get().isPortletRequest();
-
+
PrependingStringBuffer prepender = new PrependingStringBuffer();
// For AJAX requests, we need to make the URLs relative to the
@@ -317,7 +317,7 @@
lastPathPos = i;
if (depth == ajaxUrlDepth)
{
- return relativeUrl.substring(0,lastPathPos+1);
+ return relativeUrl.substring(0, lastPathPos + 1);
}
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/AbstractRequestCycleProcessor.java Mon Oct 15 14:21:25 2007
@@ -50,7 +50,7 @@
/**
* Default abstract implementation of {@link IRequestCycleProcessor}.
- *
+ *
* @author eelcohillenius
*/
public abstract class AbstractRequestCycleProcessor implements IRequestCycleProcessor
@@ -171,7 +171,7 @@
/**
* Creates a new request coding strategy instance. this is (typically) called once at the first
* time {@link #getRequestCodingStrategy()} is called.
- *
+ *
* @return a new request coding strategy
*/
protected abstract IRequestCodingStrategy newRequestCodingStrategy();
@@ -182,7 +182,7 @@
* {@link RequestCycle#onRuntimeException(Page, RuntimeException)}. Note that if you override
* this method {@link RequestCycle#onRuntimeException(Page, RuntimeException)} will not be
* supported.
- *
+ *
* @param page
* Any page context where the exception was thrown
* @param e
@@ -196,7 +196,7 @@
/**
* Resolves to a bookmarkable page target.
- *
+ *
* @param requestCycle
* the current request cycle
* @param requestParameters
@@ -256,7 +256,7 @@
/**
* Resolves to an external resource.
- *
+ *
* @param requestCycle
* The current request cycle
* @return The external resource request target
@@ -278,7 +278,7 @@
/**
* Resolves to a home page target.
- *
+ *
* @param requestCycle
* the current request cycle.
* @param requestParameters
@@ -330,7 +330,7 @@
/**
* Resolves the RequestTarget for the given interface. This method can be overridden if some
* special interface needs to resolve to its own target.
- *
+ *
* @param requestCycle
* The current RequestCycle object
* @param page
@@ -410,7 +410,7 @@
* Resolves to a page target that was previously rendered. Optionally resolves to a component
* call target, which is a specialization of a page target. If no corresponding page could be
* found, a expired page target will be returned.
- *
+ *
* @param requestCycle
* the current request cycle
* @param requestParameters
@@ -449,7 +449,7 @@
/**
* Resolves to a shared resource target.
- *
+ *
* @param requestCycle
* the current request cycle
* @param requestParameters
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCodingStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCodingStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCodingStrategy.java Mon Oct 15 14:21:25 2007
@@ -21,17 +21,16 @@
import org.apache.wicket.RequestCycle;
/**
- * Implementations of this interface are responsible for digesting the incoming
- * request and creating a suitable {@link org.apache.wicket.request.RequestParameters} object
- * for it, as well as creating url representations for request targets.
+ * Implementations of this interface are responsible for digesting the incoming request and creating
+ * a suitable {@link org.apache.wicket.request.RequestParameters} object for it, as well as creating
+ * url representations for request targets.
*
* @author Eelco Hillenius
*/
public interface IRequestCodingStrategy extends IRequestTargetMounter
{
/**
- * Analyze the request and create a corresponding request parameters object
- * for it.
+ * Analyze the request and create a corresponding request parameters object for it.
*
* @param request
* the incoming request
@@ -44,8 +43,8 @@
* Gets the url that will point to the provided request target.
* </p>
* <p>
- * If an implementation supports mounting, it should return the mounted path
- * for the provided request target if any.
+ * If an implementation supports mounting, it should return the mounted path for the provided
+ * request target if any.
* </p>
*
* @param requestCycle
@@ -53,7 +52,7 @@
*
* @param requestTarget
* the request target
- *
+ *
* @return the url to the provided target
*/
CharSequence encode(RequestCycle requestCycle, IRequestTarget requestTarget);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestCycleProcessor.java Mon Oct 15 14:21:25 2007
@@ -22,30 +22,26 @@
/**
* <p>
- * The request cycle processor is responsible for handling the steps of a
- * request cycle. It's methods are called in a pre-defined order:
+ * The request cycle processor is responsible for handling the steps of a request cycle. It's
+ * methods are called in a pre-defined order:
* <ul>
- * <li> {@link #resolve(RequestCycle, RequestParameters)} is called to get the
- * request target. A request might refer to e.g. a bookmarkable page, a listener
- * interface call on a component on a previously rendered page, a shared
- * resource or e.g. a non-wicket resource that resides in the web application
- * folder. </li>
- * <li> {@link #processEvents(RequestCycle)} is called after the target is
- * resolved. It is meant to handle/ distribute events like e.g. listener
- * interface calls on components. During this processing, the request target may
- * be changed (e.g. by calling setResponsePage). What actually happens is that
- * {@link org.apache.wicket.RequestCycle} holds a stack of targets, of which it will take
- * to last addition as the recent one, but walks the whole stack in order to do
- * cleaning up after the request is handled.</li>
- * <li> {@link #respond(RequestCycle)} is called to create a response to the
- * requesting client. Typically, the actual response handling is to be (or
- * delegated) by the request target implementation, but different strategies
- * might do as they seem fit. </li>
- * <li> {@link #respond(RuntimeException, RequestCycle)} is called whenever an
- * uncaught exception occurs during the event handling or response phase so that
- * an appropriate exception response can be generated. This method is guaranteed
- * to be called whenever such an exception happens, but will never be called
- * otherwise. </li>
+ * <li> {@link #resolve(RequestCycle, RequestParameters)} is called to get the request target. A
+ * request might refer to e.g. a bookmarkable page, a listener interface call on a component on a
+ * previously rendered page, a shared resource or e.g. a non-wicket resource that resides in the web
+ * application folder. </li>
+ * <li> {@link #processEvents(RequestCycle)} is called after the target is resolved. It is meant to
+ * handle/ distribute events like e.g. listener interface calls on components. During this
+ * processing, the request target may be changed (e.g. by calling setResponsePage). What actually
+ * happens is that {@link org.apache.wicket.RequestCycle} holds a stack of targets, of which it will
+ * take to last addition as the recent one, but walks the whole stack in order to do cleaning up
+ * after the request is handled.</li>
+ * <li> {@link #respond(RequestCycle)} is called to create a response to the requesting client.
+ * Typically, the actual response handling is to be (or delegated) by the request target
+ * implementation, but different strategies might do as they seem fit. </li>
+ * <li> {@link #respond(RuntimeException, RequestCycle)} is called whenever an uncaught exception
+ * occurs during the event handling or response phase so that an appropriate exception response can
+ * be generated. This method is guaranteed to be called whenever such an exception happens, but will
+ * never be called otherwise. </li>
* </ul>
* </p>
*
@@ -57,8 +53,8 @@
public interface IRequestCycleProcessor
{
/**
- * Gets the object that is responsible for encoding request targets (like
- * url's in links etc) and decoding urls and request parameters etc into
+ * Gets the object that is responsible for encoding request targets (like url's in links etc)
+ * and decoding urls and request parameters etc into
* {@link org.apache.wicket.request.RequestParameters} objects.
*
* @return the request encoder
@@ -67,14 +63,12 @@
/**
* <p>
- * Resolves the request and returns the request target. Typically, the
- * resolver uses the {@link org.apache.wicket.request.RequestParameters} object that is
- * passed in.
+ * Resolves the request and returns the request target. Typically, the resolver uses the
+ * {@link org.apache.wicket.request.RequestParameters} object that is passed in.
* </p>
* <p>
- * Implementors of this method should be careful not to mix this code with
- * event handling code; method {@link #processEvents(RequestCycle)} is meant
- * for that purpose.
+ * Implementors of this method should be careful not to mix this code with event handling code;
+ * method {@link #processEvents(RequestCycle)} is meant for that purpose.
* </p>
*
* @param requestCycle
@@ -87,12 +81,11 @@
IRequestTarget resolve(RequestCycle requestCycle, RequestParameters requestParameters);
/**
- * After a page is restored, this method is responsible for calling any
- * event handling code based on the request. For example, when a link is
- * clicked, {@link #resolve(RequestCycle, RequestParameters)} should return
- * the page that that link resides on, and this method should call the
- * {@link org.apache.wicket.markup.html.link.ILinkListener} interface on that
- * component.
+ * After a page is restored, this method is responsible for calling any event handling code
+ * based on the request. For example, when a link is clicked,
+ * {@link #resolve(RequestCycle, RequestParameters)} should return the page that that link
+ * resides on, and this method should call the
+ * {@link org.apache.wicket.markup.html.link.ILinkListener} interface on that component.
*
* @param requestCycle
* the current request cycle
@@ -100,10 +93,9 @@
void processEvents(RequestCycle requestCycle);
/**
- * After the target is resolved and the request events are handled, it is
- * time to respond to the request. This method is responsible for executing
- * the proper response sequence given the current request target and
- * response.
+ * After the target is resolved and the request events are handled, it is time to respond to the
+ * request. This method is responsible for executing the proper response sequence given the
+ * current request target and response.
*
* @param requestCycle
* the current request cycle
@@ -111,9 +103,8 @@
void respond(RequestCycle requestCycle);
/**
- * Whenever a unhandled exception is encountered during the processing of a
- * request cycle, this method is called to respond to the request in a
- * proper way.
+ * Whenever a unhandled exception is encountered during the processing of a request cycle, this
+ * method is called to respond to the request in a proper way.
*
* @param e
* any unhandled exception
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMounter.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMounter.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMounter.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMounter.java Mon Oct 15 14:21:25 2007
@@ -48,8 +48,7 @@
*
* @param requestParameters
* the request parameters
- * @return the request target or null if nothing was mounted with the given
- * request parameters
+ * @return the request target or null if nothing was mounted with the given request parameters
*/
IRequestTarget targetForRequest(RequestParameters requestParameters);
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java Mon Oct 15 14:21:25 2007
@@ -19,8 +19,8 @@
import org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy;
/**
- * Optional interface that can be implemented by implementations of
- * {@link IRequestTargetMounter} to provide management extensions.
+ * Optional interface that can be implemented by implementations of {@link IRequestTargetMounter} to
+ * provide management extensions.
*
* @author eelcohillenius
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/RequestParameters.java Mon Oct 15 14:21:25 2007
@@ -28,17 +28,16 @@
/**
* <p>
- * Object that abstracts common request parameters. It consists of possible
- * optional parameters that can be translated from e.g. servlet request
- * parameters and serves as a strongly typed variant of these that is to be
- * created by the {@link org.apache.wicket.request.IRequestCycleProcessor}'s
+ * Object that abstracts common request parameters. It consists of possible optional parameters that
+ * can be translated from e.g. servlet request parameters and serves as a strongly typed variant of
+ * these that is to be created by the {@link org.apache.wicket.request.IRequestCycleProcessor}'s
* {@link org.apache.wicket.request.IRequestCodingStrategy}.
* </p>
* <p>
- * Though this object can be extended and hence more parameter options can be
- * used, anything other than in this implementation must be supported by
- * specific {@link org.apache.wicket.request.IRequestCycleProcessor}
- * implementations and thus are not supported by default implementations.
+ * Though this object can be extended and hence more parameter options can be used, anything other
+ * than in this implementation must be supported by specific
+ * {@link org.apache.wicket.request.IRequestCycleProcessor} implementations and thus are not
+ * supported by default implementations.
* </p>
*
* @author Eelco Hillenius
@@ -62,8 +61,8 @@
private String interfaceName;
/**
- * in case this request points to a dispatched call to a behavior that is
- * coupled to a component, this is the registration id of the behavior.
+ * in case this request points to a dispatched call to a behavior that is coupled to a
+ * component, this is the registration id of the behavior.
*/
private String behaviorId;
@@ -202,8 +201,8 @@
}
/**
- * Tells wicket whether this request should only be processed if the page +
- * version specified are pointing to the last page the user accessed.
+ * Tells wicket whether this request should only be processed if the page + version specified
+ * are pointing to the last page the user accessed.
*
* @see WebRequestCodingStrategy#IGNORE_IF_NOT_ACTIVE_PARAMETER_NAME
*
@@ -353,8 +352,7 @@
* Sets the depth for relative URLs. Used in AJAX requests.
*
* @param urlDepth
- * Number of slashes deep the page is that an AJAX request is
- * made from.
+ * Number of slashes deep the page is that an AJAX request is made from.
*/
public void setUrlDepth(int urlDepth)
{
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/IEventProcessor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/IEventProcessor.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/IEventProcessor.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/IEventProcessor.java Mon Oct 15 14:21:25 2007
@@ -19,9 +19,8 @@
import org.apache.wicket.RequestCycle;
/**
- * Targets that implement this interface announce that they can process events.
- * This interface is not meant to be used on its own, but rather to be mixed in
- * with other interfaces, like
+ * Targets that implement this interface announce that they can process events. This interface is
+ * not meant to be used on its own, but rather to be mixed in with other interfaces, like
* {@link org.apache.wicket.request.target.component.listener.IListenerInterfaceRequestTarget}.
*
* @author Eelco Hillenius
@@ -29,8 +28,8 @@
public interface IEventProcessor
{
/**
- * After a page is restored, this method is responsible for calling any
- * event handling code based on the request.
+ * After a page is restored, this method is responsible for calling any event handling code
+ * based on the request.
*
* @param requestCycle
* the current request cycle
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/EmptyRequestTarget.java Mon Oct 15 14:21:25 2007
@@ -20,9 +20,8 @@
import org.apache.wicket.RequestCycle;
/**
- * The empty request target does nothing in itself but instead relies on some
- * other source to generate a response. It can be regarded as a dummy
- * implementation.
+ * The empty request target does nothing in itself but instead relies on some other source to
+ * generate a response. It can be regarded as a dummy implementation.
*
* @author Eelco Hillenius
*/
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/RedirectRequestTarget.java Mon Oct 15 14:21:25 2007
@@ -24,13 +24,13 @@
import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
/**
- * A RequestTarget that will sent a redirect url to the browser. Use this if you
- * want to direct the browser to some external URL, like Google etc, immediately.
- * or if you want to redirect to a Wicket page.
- *
- * If you want to redirect with a delay the {@link RedirectPage} will do a meta
- * tag redirect with a delay.
- *
+ * A RequestTarget that will sent a redirect url to the browser. Use this if you want to direct the
+ * browser to some external URL, like Google etc, immediately. or if you want to redirect to a
+ * Wicket page.
+ *
+ * If you want to redirect with a delay the {@link RedirectPage} will do a meta tag redirect with a
+ * delay.
+ *
* @author jcompagner
*/
public class RedirectRequestTarget implements IRequestTarget
@@ -45,8 +45,9 @@
* <li>Relative to the Wicket filter/servlet, e.g. "?wicket:interface=foo", "mounted_page"</li>
* <li>Absolute within your web application's context root, e.g. "/foo.html"</li>
* </ul>
- *
- * @param redirectUrl URL to redirect to.
+ *
+ * @param redirectUrl
+ * URL to redirect to.
*/
public RedirectRequestTarget(String redirectUrl)
{
@@ -78,7 +79,9 @@
}
else
{
- response.redirect(RequestCycle.get().getRequest().getRelativePathPrefixToContextRoot() + redirectUrl.substring(1));
+ response.redirect(RequestCycle.get().getRequest()
+ .getRelativePathPrefixToContextRoot() +
+ redirectUrl.substring(1));
}
}
else if (redirectUrl.startsWith("http://") || redirectUrl.startsWith("https://"))
@@ -87,7 +90,9 @@
}
else
{
- response.redirect(RequestCycle.get().getRequest().getRelativePathPrefixToWicketHandler() + redirectUrl);
+ response.redirect(RequestCycle.get().getRequest()
+ .getRelativePathPrefixToWicketHandler() +
+ redirectUrl);
}
}
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java?rev=584925&r1=584924&r2=584925&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/basic/URIRequestTargetUrlCodingStrategy.java Mon Oct 15 14:21:25 2007
@@ -30,19 +30,17 @@
import org.apache.wicket.request.RequestParameters;
import org.apache.wicket.request.target.coding.AbstractRequestTargetUrlCodingStrategy;
import org.apache.wicket.request.target.coding.BookmarkablePageRequestTargetUrlCodingStrategy;
-import org.apache.wicket.request.target.coding.QueryStringUrlCodingStrategy;
import org.apache.wicket.request.target.coding.WebRequestEncoder;
import org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.value.ValueMap;
/**
- * Request coding strategy that uses a simple URI by putting the remaining path
- * in the <tt>uri</tt> page parameter. Override the decode() method to return
- * the appropriate request target, calling getURI(requestParameters) to get
- * requested uri. Note that this request coding strategy takes other page
- * parameters from the query string directly, it does not use hierarchical path
- * for parameters.
+ * Request coding strategy that uses a simple URI by putting the remaining path in the <tt>uri</tt>
+ * page parameter. Override the decode() method to return the appropriate request target, calling
+ * getURI(requestParameters) to get requested uri. Note that this request coding strategy takes
+ * other page parameters from the query string directly, it does not use hierarchical path for
+ * parameters.
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
@@ -84,8 +82,7 @@
}
/**
- * Copied from
- * {@link BookmarkablePageRequestTargetUrlCodingStrategy#encode(IRequestTarget)}
+ * Copied from {@link BookmarkablePageRequestTargetUrlCodingStrategy#encode(IRequestTarget)}
* without pageMapName field
*
* @see org.apache.wicket.request.target.coding.IRequestTargetUrlCodingStrategy#encode(org.apache.wicket.IRequestTarget)
@@ -127,9 +124,9 @@
}
/**
- * Gets the encoded URL for the request target. The "uri" parameter is
- * appended first with a slash, then the remaining parameters are handled
- * like in {@link org.apache.wicket.request.target.coding.QueryStringUrlCodingStrategy#appendParameters(org.apache.wicket.util.string.AppendingStringBuffer, java.util.Map)}
+ * Gets the encoded URL for the request target. The "uri" parameter is appended first with a
+ * slash, then the remaining parameters are handled like in
+ * {@link org.apache.wicket.request.target.coding.QueryStringUrlCodingStrategy#appendParameters(org.apache.wicket.util.string.AppendingStringBuffer, java.util.Map)}
*
* @param url
* the relative reference URL
@@ -182,8 +179,7 @@
* Decodes parameters object from the provided url fragment
*
* @param urlFragment
- * fragment of the url after the decoded path and before the
- * query string
+ * fragment of the url after the decoded path and before the query string
* @param urlParameters
* query string parameters
* @return Parameters created from the url fragment and query string
@@ -208,9 +204,9 @@
}
/**
- * Calls decodeParameters() and retrieves the <tt>uri</tt> parameter. If
- * you need to access multiple parameters in the request, call
- * {@link #decodeParameters(RequestParameters)} directly.
+ * Calls decodeParameters() and retrieves the <tt>uri</tt> parameter. If you need to access
+ * multiple parameters in the request, call {@link #decodeParameters(RequestParameters)}
+ * directly.
*
* <p>
* <b>NOTE. </b> the returned URI is kept URL-encoded as per the