Revision: 579
http://svn.sourceforge.net/stripes/?rev=579&view=rev
Author: bengunter
Date: 2007-06-13 15:10:57 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
OnwardResolution has been reverted to its previous form. LinkTagSupport is
almost the same as before, but the context path is prepended *after* the URL
has been completely built so that UrlBinding lookup is not broken. The changes
to UrlBuilder so that it looks up UrlBindings by path instead of by ActionBean
class allow for these two classes to go back to their previous, simpler forms.
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
trunk/stripes/src/net/sourceforge/stripes/tag/LinkTagSupport.java
Modified: trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
2007-06-13 22:05:25 UTC (rev 578)
+++ trunk/stripes/src/net/sourceforge/stripes/action/OnwardResolution.java
2007-06-13 22:10:57 UTC (rev 579)
@@ -36,7 +36,6 @@
* @author Tim Fennell
*/
public abstract class OnwardResolution<T extends OnwardResolution<T>> {
- private Class<? extends ActionBean> beanType;
private String path;
private Map<String,Object> parameters = new HashMap<String,Object>();
@@ -56,7 +55,6 @@
*/
public OnwardResolution(Class<? extends ActionBean> beanType) {
this(StripesFilter.getConfiguration().getActionResolver().getUrlBinding(beanType));
- this.beanType = beanType;
}
/**
@@ -88,12 +86,9 @@
*/
@Override
public String toString() {
- if (beanType == null) {
- return getClass().getSimpleName() + "{path='" + path + "'}";
- }
- else {
- return getClass().getSimpleName() + "{beanType='" +
beanType.getName() + "'}";
- }
+ return getClass().getSimpleName() + "{" +
+ "path='" + path + "'" +
+ "}";
}
/**
@@ -177,13 +172,7 @@
* @param locale the locale to be used by [EMAIL PROTECTED] Formatter}s
when formatting parameters
*/
public String getUrl(Locale locale) {
- UrlBuilder builder;
- if (beanType == null) {
- builder = new UrlBuilder(locale, path, false);
- }
- else {
- builder = new UrlBuilder(locale, beanType, false);
- }
+ UrlBuilder builder = new UrlBuilder(locale, path, false);
builder.addParameters(this.parameters);
return builder.toString();
}
Modified: trunk/stripes/src/net/sourceforge/stripes/tag/LinkTagSupport.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/LinkTagSupport.java
2007-06-13 22:05:25 UTC (rev 578)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/LinkTagSupport.java
2007-06-13 22:10:57 UTC (rev 579)
@@ -16,7 +16,6 @@
import net.sourceforge.stripes.exception.StripesJspException;
import net.sourceforge.stripes.util.UrlBuilder;
-import net.sourceforge.stripes.action.ActionBean;
import net.sourceforge.stripes.controller.StripesConstants;
import javax.servlet.http.HttpServletRequest;
@@ -154,18 +153,11 @@
HttpServletRequest request = (HttpServletRequest)
getPageContext().getRequest();
HttpServletResponse response = (HttpServletResponse)
getPageContext().getResponse();
- UrlBuilder builder;
- Class<? extends ActionBean> beanclass =
getActionBeanType(this.beanclass);
- if (beanclass == null) {
- String base = getPreferredBaseUrl();
- builder = new UrlBuilder(pageContext.getRequest().getLocale(),
base, false);
- }
- else {
- builder = new UrlBuilder(pageContext.getRequest().getLocale(),
beanclass, false);
- }
// Add all the parameters and reset the href attribute; pass to false
here because
// the HtmlTagSupport will HtmlEncode the ampersands for us
+ String base = getPreferredBaseUrl();
+ UrlBuilder builder = new
UrlBuilder(pageContext.getRequest().getLocale(), base, false);
if (this.event != null) {
builder.addParameter(this.event);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
