You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2010/01/08 22:48:56 UTC
svn commit: r897330 [2/3] - in /wicket/trunk:
wicket-auth-roles/src/main/java/org/apache/wicket/authentication/
wicket-examples/src/main/java/org/apache/wicket/examples/
wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/
wicket-exam...
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/staticpages/Application.java Fri Jan 8 21:48:50 2010
@@ -16,17 +16,8 @@
*/
package org.apache.wicket.examples.staticpages;
-import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Page;
import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.http.request.WebExternalResourceRequestTarget;
-import org.apache.wicket.request.ObsoleteRequestParameters;
-import org.apache.wicket.request.target.basic.URIRequestTargetUrlCodingStrategy;
-import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
-import org.apache.wicket.util.resource.IResourceStream;
-import org.apache.wicket.util.resource.PackageResourceStream;
-import org.apache.wicket.util.resource.WebExternalResourceStream;
-import org.apache.wicket.util.resource.XSLTResourceStream;
/**
* Examples for serving static files
@@ -51,34 +42,36 @@
getDebugSettings().setDevelopmentUtilitiesEnabled(true);
- // Hello World as a Static Page
- mount(new URIRequestTargetUrlCodingStrategy("/docs")
- {
- @Override
- public IRequestHandler decode(ObsoleteRequestParameters requestParameters)
- {
- String path = "/staticpages/" + getURI(requestParameters);
- return new WebExternalResourceRequestTarget(path);
- }
- });
-
- // Hello World as a Static Page with XSLT layout
- mount(new URIRequestTargetUrlCodingStrategy("/xsldocs")
- {
- @Override
- public IRequestHandler decode(ObsoleteRequestParameters requestParameters)
- {
- String path = "/staticpages/" + getURI(requestParameters);
- IResourceStream xslStream = new PackageResourceStream(Application.class,
- "layout.xsl");
- IResourceStream docStream = new WebExternalResourceStream(path);
- return new ResourceStreamRequestHandler(new XSLTResourceStream(xslStream, docStream));
- }
- });
-
- // All requests to bookmarkable page "Page" will be captured, and the
- // "Sent" page is shown instead
- mount(new CapturingBookmarkablePageRequestTargetUrlCodingStrategy("/capturedpage",
- EmailPage.class, Sent.class));
+ // TODO NG
+// // Hello World as a Static Page
+// mount(new URIRequestTargetUrlCodingStrategy("/docs")
+// {
+// @Override
+// public IRequestHandler decode(ObsoleteRequestParameters requestParameters)
+// {
+// String path = "/staticpages/" + getURI(requestParameters);
+// return new WebExternalResourceRequestTarget(path);
+// }
+// });
+//
+// // Hello World as a Static Page with XSLT layout
+// mount(new URIRequestTargetUrlCodingStrategy("/xsldocs")
+// {
+// @Override
+// public IRequestHandler decode(ObsoleteRequestParameters requestParameters)
+// {
+// String path = "/staticpages/" + getURI(requestParameters);
+// IResourceStream xslStream = new PackageResourceStream(Application.class,
+// "layout.xsl");
+// IResourceStream docStream = new WebExternalResourceStream(path);
+// return new ResourceStreamRequestHandler(
+// new XSLTResourceStream(xslStream, docStream));
+// }
+// });
+//
+// // All requests to bookmarkable page "Page" will be captured, and the
+// // "Sent" page is shown instead
+// mount(new CapturingBookmarkablePageRequestTargetUrlCodingStrategy("/capturedpage",
+// EmailPage.class, Sent.class));
}
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java Fri Jan 8 21:48:50 2010
@@ -16,12 +16,8 @@
*/
package org.apache.wicket.examples.upload;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
-import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadWebRequest;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.util.file.Folder;
@@ -81,9 +77,10 @@
/**
* @see org.apache.wicket.protocol.http.WebApplication#newWebRequest(javax.servlet.http.HttpServletRequest)
*/
- @Override
- protected WebRequest newWebRequest(HttpServletRequest servletRequest)
- {
- return new UploadWebRequest(servletRequest);
- }
+ // TODO NG
+// @Override
+// protected WebRequest newWebRequest(HttpServletRequest servletRequest)
+// {
+// return new UploadWebRequest(servletRequest);
+// }
}
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java Fri Jan 8 21:48:50 2010
@@ -20,10 +20,10 @@
import java.util.List;
import java.util.Map;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.util.MapModel;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.resource.IStringResourceStream;
import org.apache.wicket.util.resource.PackageResourceStream;
import org.apache.wicket.velocity.markup.html.VelocityPanel;
@@ -51,7 +51,7 @@
map.put("fields", fields);
VelocityPanel panel;
- add(panel = new VelocityPanel("templatePanel", new MapModel<String,List<Field>>(map))
+ add(panel = new VelocityPanel("templatePanel", new MapModel<String, List<Field>>(map))
{
@Override
protected IStringResourceStream getTemplateResource()
Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java Fri Jan 8 21:48:50 2010
@@ -20,7 +20,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea;
@@ -28,6 +27,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.util.resource.IStringResourceStream;
import org.apache.wicket.util.resource.PackageResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableChoiceLabel.java Fri Jan 8 21:48:50 2010
@@ -207,10 +207,10 @@
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- final String saveCall = "{wicketAjaxGet('" + getCallbackUrl(true) +
+ final String saveCall = "{wicketAjaxGet('" + getCallbackUrl() +
"&save=true&'+this.name+'='+wicketEncode(this.value)); return true;}";
- final String cancelCall = "{wicketAjaxGet('" + getCallbackUrl(true) +
+ final String cancelCall = "{wicketAjaxGet('" + getCallbackUrl() +
"&save=false'); return false;}";
tag.put("onchange", saveCall);
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableLabel.java Fri Jan 8 21:48:50 2010
@@ -20,7 +20,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -31,6 +30,7 @@
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.JavascriptUtils;
import org.apache.wicket.validation.IValidator;
@@ -96,12 +96,12 @@
{
super.onComponentTag(tag);
final String saveCall = "{" +
- generateCallbackScript("wicketAjaxGet('" + getCallbackUrl(true) +
+ generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() +
"&save=true&'+this.name+'='+wicketEncode(this.value)") + "; return false;}";
final String cancelCall = "{" +
- generateCallbackScript("wicketAjaxGet('" + getCallbackUrl(true) + "&save=false'") +
+ generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() + "&save=false'") +
"; return false;}";
@@ -118,7 +118,10 @@
protected void respond(AjaxRequestTarget target)
{
RequestCycle requestCycle = RequestCycle.get();
- boolean save = Boolean.valueOf(requestCycle.getRequest().getParameter("save"));
+ boolean save = Boolean.valueOf(requestCycle.getRequest()
+ .getRequestParameters()
+ .getParameterValue("save")
+ .toBoolean(false));
if (save)
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.java Fri Jan 8 21:48:50 2010
@@ -167,10 +167,10 @@
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- final String saveCall = "{wicketAjaxPost('" + getCallbackUrl(true) +
+ final String saveCall = "{wicketAjaxPost('" + getCallbackUrl() +
"&save=true', " + "wicketSerialize(this)); return true;}";
- final String cancelCall = "{wicketAjaxGet('" + getCallbackUrl(true) +
+ final String cancelCall = "{wicketAjaxGet('" + getCallbackUrl() +
"&save=false');this.onblur='';return false;}";
final String keypress = "var kc=wicketKeyCode(event); if (kc==27) " + cancelCall +
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxIndicatorAppender.java Fri Jan 8 21:48:50 2010
@@ -17,13 +17,15 @@
package org.apache.wicket.extensions.ajax.markup.html;
import org.apache.wicket.Component;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Response;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.IAjaxIndicatorAware;
import org.apache.wicket.behavior.AbstractHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
/**
* A behavior that adds a span with wicket's default indicator gif to the end of the component's
@@ -97,7 +99,9 @@
*/
protected CharSequence getIndicatorUrl()
{
- return RequestCycle.get().urlFor(AbstractDefaultAjaxBehavior.INDICATOR);
+ IRequestHandler handler = new ResourceReferenceRequestHandler(
+ AbstractDefaultAjaxBehavior.INDICATOR);
+ return RequestCycle.get().renderUrlFor(handler);
}
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxLazyLoadPanel.java Fri Jan 8 21:48:50 2010
@@ -17,13 +17,15 @@
package org.apache.wicket.extensions.ajax.markup.html;
import org.apache.wicket.Component;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
/**
* A panel where you can lazy load another panel. This can be used if you have a panel/component
@@ -146,8 +148,10 @@
*/
public Component getLoadingComponent(final String markupId)
{
- return new Label(markupId, "<img src=\"" +
- RequestCycle.get().urlFor(AbstractDefaultAjaxBehavior.INDICATOR) + "\"/>").setEscapeModelStrings(false);
+ IRequestHandler handler = new ResourceReferenceRequestHandler(
+ AbstractDefaultAjaxBehavior.INDICATOR);
+ return new Label(markupId, "<img src=\"" + RequestCycle.get().renderUrlFor(handler) +
+ "\"/>").setEscapeModelStrings(false);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AbstractAutoCompleteBehavior.java Fri Jan 8 21:48:50 2010
@@ -17,12 +17,12 @@
package org.apache.wicket.extensions.ajax.markup.html.autocomplete;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.string.Strings;
/**
@@ -72,7 +72,7 @@
}
String initJS = String.format("new Wicket.AutoComplete('%s','%s',%s,%s);", id,
- getCallbackUrl(true), constructSettingsJS(), indicatorId);
+ getCallbackUrl(), constructSettingsJS(), indicatorId);
response.renderOnDomReadyJavascript(initJS);
}
@@ -131,7 +131,10 @@
protected void respond(AjaxRequestTarget target)
{
final RequestCycle requestCycle = RequestCycle.get();
- final String val = requestCycle.getRequest().getParameter("q");
+ final String val = requestCycle.getRequest()
+ .getRequestParameters()
+ .getParameterValue("q")
+ .toOptionalString();
onRequest(val, requestCycle);
}
}
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/AutoCompleteBehavior.java Fri Jan 8 21:48:50 2010
@@ -20,7 +20,7 @@
import org.apache.wicket.Application;
import org.apache.wicket.IRequestHandler;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
@@ -106,7 +106,6 @@
final String encoding = Application.get()
.getRequestCycleSettings()
.getResponseRequestEncoding();
- r.setCharacterEncoding(encoding);
r.setContentType("text/xml; charset=" + encoding);
// Make sure it is not cached by a
@@ -129,7 +128,7 @@
}
};
- requestCycle.setRequestTarget(target);
+ requestCycle.scheduleRequestHandlerAfterCurrent(target);
}
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Fri Jan 8 21:48:50 2010
@@ -18,9 +18,8 @@
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Page;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -30,10 +29,14 @@
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.html.resources.CompressedResourceReference;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.request.handler.DefaultPageProvider;
+import org.apache.wicket.ng.request.handler.impl.RenderPageRequestHandler;
+import org.apache.wicket.ng.resource.CompressedResourceReference;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.settings.IPageSettings;
import org.apache.wicket.util.lang.EnumeratedType;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -985,9 +988,11 @@
{
throw new WicketRuntimeException("Error creating page for modal dialog.");
}
- RequestCycle.get().setUrlForNewWindowEncoding();
+ // TODO (NG)
+// RequestCycle.get().setUrlForNewWindowEncoding();
- appendAssignment(buffer, "settings.src", RequestCycle.get().urlFor(page));
+ IRequestHandler handler = new RenderPageRequestHandler(new DefaultPageProvider(page));
+ appendAssignment(buffer, "settings.src", RequestCycle.get().renderUrlFor(handler));
}
else
{
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/captcha/kittens/KittenCaptchaPanel.java Fri Jan 8 21:48:50 2010
@@ -27,14 +27,13 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import java.util.Random;
import javax.imageio.ImageIO;
import javax.imageio.stream.MemoryCacheImageInputStream;
import org.apache.wicket.IResourceListener;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Request;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
@@ -43,7 +42,7 @@
import org.apache.wicket.markup.html.image.resource.DynamicImageResource;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.util.time.Time;
@@ -169,7 +168,7 @@
// Call-back script shows loading indicator and makes wicket
// ajax request passing in mouse co-ordinates
return generateCallbackScript("showLoadingIndicator(); wicketAjaxGet('" +
- getCallbackUrl(onlyTargetActivePage) +
+ getCallbackUrl() +
"&x=' + getEventX(this, event) + '&y=' + getEventY(this, event)");
}
@@ -177,10 +176,9 @@
protected void onEvent(final AjaxRequestTarget target)
{
// Get clicked cursor position
- final WebRequest request = (WebRequest)RequestCycle.get().getRequest();
- final Map<String, String[]> parameters = request.getParameterMap();
- final int x = Integer.parseInt(parameters.get("x")[0]);
- final int y = Integer.parseInt(parameters.get("y")[0]);
+ final Request request = RequestCycle.get().getRequest();
+ final int x = request.getRequestParameters().getParameterValue("x").toInt(0);
+ final int y = request.getRequestParameters().getParameterValue("y").toInt(0);
// Force refresh
imageResource.clearData();
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java Fri Jan 8 21:48:50 2010
@@ -22,7 +22,6 @@
import java.util.Map;
import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.extensions.markup.html.form.palette.component.Choices;
import org.apache.wicket.extensions.markup.html.form.palette.component.Recorder;
import org.apache.wicket.extensions.markup.html.form.palette.component.Selection;
@@ -35,10 +34,10 @@
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.html.resources.StyleSheetReference;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
@@ -229,16 +228,6 @@
}
/**
- * Can be overridden by clients for custom style sheet
- *
- * @return the style sheet reference
- */
- protected StyleSheetReference getStyleSheet()
- {
- return new StyleSheetReference("paletteCSS", getClass(), "palette.css");
- }
-
- /**
* Return true if the palette is enabled, false otherwise
*
* @return true if the palette is enabled, false otherwise
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java Fri Jan 8 21:48:50 2010
@@ -21,9 +21,8 @@
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.Response;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
@@ -36,6 +35,9 @@
import org.apache.wicket.markup.html.tree.AbstractTree;
import org.apache.wicket.markup.html.tree.WicketTreeModel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.lang.EnumeratedType;
/**
@@ -531,8 +533,9 @@
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
+ IRequestHandler handler = new ResourceReferenceRequestHandler(getNodeIcon(node));
tag.put("style", "background-image: url('" +
- RequestCycle.get().urlFor(getNodeIcon(node)) + "')");
+ RequestCycle.get().renderUrlFor(handler) + "')");
}
};
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/MiddleColumnsView.java Fri Jan 8 21:48:50 2010
@@ -26,10 +26,10 @@
import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.Response;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.response.NullResponse;
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/SideColumnsView.java Fri Jan 8 21:48:50 2010
@@ -22,11 +22,11 @@
import javax.swing.tree.TreeNode;
import org.apache.wicket.Component;
-import org.apache.wicket.RequestCycle;
import org.apache.wicket.Response;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/TreeTable.java Fri Jan 8 21:48:50 2010
@@ -22,7 +22,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree;
import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
@@ -34,6 +33,7 @@
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java Fri Jan 8 21:48:50 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.extensions.rating;
import org.apache.wicket.Component;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.IRequestHandler;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
import org.apache.wicket.behavior.HeaderContributor;
@@ -30,6 +30,8 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
+import org.apache.wicket.ng.request.handler.resource.ResourceReferenceRequestHandler;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
* Rating component that generates a number of stars where a user can click on to rate something.
@@ -375,7 +377,8 @@
*/
protected String getActiveStarUrl(int iteration)
{
- return getRequestCycle().urlFor(STAR1).toString();
+ IRequestHandler handler = new ResourceReferenceRequestHandler(STAR1);
+ return getRequestCycle().renderUrlFor(handler).toString();
}
/**
@@ -388,7 +391,8 @@
*/
protected String getInactiveStarUrl(int iteration)
{
- return getRequestCycle().urlFor(STAR0).toString();
+ IRequestHandler handler = new ResourceReferenceRequestHandler(STAR0);
+ return getRequestCycle().renderUrlFor(handler).toString();
}
/**
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java Fri Jan 8 21:48:50 2010
@@ -21,8 +21,10 @@
import javax.servlet.ServletContext;
-import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Application;
+import org.apache.wicket.Session;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.protocol.http.WebApplication;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +67,7 @@
final ServletContext context = application.getServletContext();
final InputStream inputStream = context.getResourceAsStream("/WEB-INF/" +
- CharSetMap.CHARSET_RESOURCE);
+ CharSetMap.CHARSET_RESOURCE);
if (inputStream == null)
{
@@ -99,9 +101,9 @@
{
if (charSetMap == null)
{
- initialize((WebApplication)cycle.getApplication());
+ initialize((WebApplication)Application.get());
}
- return charSetMap.getCharSet(cycle.getSession().getLocale());
+ return charSetMap.getCharSet(Session.get().getLocale());
}
}
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/ResourceReference.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/ResourceReference.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/ResourceReference.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/ResourceReference.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/ResourceReference.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/ResourceReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/ResourceReference.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/SharedResources.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/SharedResources.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/SharedResources.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/SharedResources.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/SharedResources.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/SharedResources.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/CompressedPackageResource.java (from r895520, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/CompressedPackageResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/CompressedPackageResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/CompressedPackageResource.java&r1=895520&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/CompressedPackageResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/JavascriptPackageResource.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/JavascriptPackageResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/JavascriptPackageResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/JavascriptPackageResource.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/JavascriptPackageResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/PackageResource.java (from r895520, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/PackageResource.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/PackageResource.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/PackageResource.java&r1=895520&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/PackageResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/PackageResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/CompressedResourceReference.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/CompressedResourceReference.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/CompressedResourceReference.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/CompressedResourceReference.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/CompressedResourceReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavaScriptReference.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavaScriptReference.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavaScriptReference.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavaScriptReference.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavaScriptReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavaScriptReference.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/JavascriptResourceReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/PackagedResourceReference.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/PackagedResourceReference.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/PackagedResourceReference.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/PackagedResourceReference.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/PackagedResourceReference.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/StyleSheetReference.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/StyleSheetReference.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/StyleSheetReference.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/StyleSheetReference.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/StyleSheetReference.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/StyleSheetReference.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/package.html (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/package.html)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/package.html?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/package.html&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/resources/package.html&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/package.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/markup/html/resources/package.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/request/IRequestTargetMountsInfo.java (from r895517, wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java)
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/disabled/org/apache/wicket/request/IRequestTargetMountsInfo.java?p2=wicket/trunk/wicket/src/main/disabled/org/apache/wicket/request/IRequestTargetMountsInfo.java&p1=wicket/trunk/wicket/src/main/java/org/apache/wicket/request/IRequestTargetMountsInfo.java&r1=895517&r2=897330&rev=897330&view=diff
==============================================================================
(empty)
Propchange: wicket/trunk/wicket/src/main/disabled/org/apache/wicket/request/IRequestTargetMountsInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Application.java Fri Jan 8 21:48:50 2010
@@ -67,8 +67,8 @@
import org.apache.wicket.pageStore.IPageManagerContext;
import org.apache.wicket.pageStore.IPageStore;
import org.apache.wicket.pageStore.PersistentPageManager;
+import org.apache.wicket.protocol.http.DummyRequestLogger;
import org.apache.wicket.protocol.http.IRequestLogger;
-import org.apache.wicket.protocol.http.RequestLogger;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.session.DefaultPageFactory;
@@ -200,9 +200,6 @@
/** can the settings object be set/used. */
private boolean settingsAccessible;
- /** Shared resources for this application */
- private final SharedResources sharedResources;
-
/**
* Checks if the <code>Application</code> threadlocal is set in this thread
*
@@ -272,9 +269,6 @@
*/
public Application()
{
- // Create shared resources repository
- sharedResources = new SharedResources(this);
-
// Install default component instantiation listener that uses
// authorization strategy to check component instantiations.
addComponentInstantiationListener(new IComponentInstantiationListener()
@@ -621,16 +615,6 @@
/**
- * Gets the shared resources.
- *
- * @return The SharedResources for this application.
- */
- public final SharedResources getSharedResources()
- {
- return sharedResources;
- }
-
- /**
* THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL.
*
* Initializes wicket components.
@@ -928,6 +912,8 @@
// set up default request mapper
setRootRequestMapper(new SystemMapper());
+
+ pageFactory = newPageFactory();
}
/**
@@ -948,7 +934,7 @@
*/
protected IRequestLogger newRequestLogger()
{
- return new RequestLogger();
+ return new DummyRequestLogger();
}
/**
@@ -1483,4 +1469,5 @@
{
return URLConnection.getFileNameMap().getContentTypeFor(fileName);
}
+
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/IInitializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/IInitializer.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/IInitializer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/IInitializer.java Fri Jan 8 21:48:50 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket;
-import org.apache.wicket.markup.html.PackageResource;
+import org.apache.wicket.ng.resource.PackageResource;
/**
* Initializes something when application loads.
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Initializer.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Initializer.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Initializer.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Initializer.java Fri Jan 8 21:48:50 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket;
-import org.apache.wicket.behavior.IActivePageBehaviorListener;
import org.apache.wicket.behavior.IBehaviorListener;
import org.apache.wicket.markup.html.form.IFormSubmitListener;
import org.apache.wicket.markup.html.form.IOnChangeListener;
@@ -43,7 +42,6 @@
IOnChangeListener.INTERFACE.register();
IRedirectListener.INTERFACE.register();
IResourceListener.INTERFACE.register();
- IActivePageBehaviorListener.INTERFACE.register();
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Page.java Fri Jan 8 21:48:50 2010
@@ -220,10 +220,6 @@
*/
private transient Boolean stateless = null;
- /** The page parameters object hat constructed this page */
- private PageParameters parameters;
-
-
/** Page parameters used to construct this page */
private final PageParameters pageParameters;
@@ -267,8 +263,14 @@
protected Page(final PageParameters parameters)
{
super(null);
- this.parameters = parameters;
- pageParameters = new PageParameters();
+ if (parameters == null)
+ { // TODO WICKET-NG is this necessary or can we keep the field as null to save space?
+ pageParameters = new PageParameters();
+ }
+ else
+ {
+ pageParameters = parameters;
+ }
init();
}
@@ -294,7 +296,7 @@
*/
public PageParameters getPageParameters()
{
- return parameters;
+ return pageParameters;
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestContext.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestContext.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestContext.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestContext.java Fri Jan 8 21:48:50 2010
@@ -18,7 +18,6 @@
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
-import org.apache.wicket.request.target.resource.ISharedResourceRequestTarget;
/**
* Handles url rewriting, provides access to the namespace for markup Ids and isolated session
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/RequestListenerInterface.java Fri Jan 8 21:48:50 2010
@@ -25,6 +25,7 @@
import org.apache.wicket.authorization.AuthorizationException;
import org.apache.wicket.behavior.IBehavior;
import org.apache.wicket.ng.request.component.IRequestableComponent;
+import org.apache.wicket.ng.request.cycle.RequestHandlerStack.ReplaceHandlerException;
import org.apache.wicket.util.lang.Classes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -183,7 +184,7 @@
catch (InvocationTargetException e)
{
// Honor redirect exception contract defined in IPageFactory
- if (e.getTargetException() instanceof AbstractRestartResponseException ||
+ if (e.getTargetException() instanceof ReplaceHandlerException ||
e.getTargetException() instanceof AuthorizationException ||
e.getTargetException() instanceof WicketRuntimeException)
{
@@ -228,7 +229,7 @@
}
catch (InvocationTargetException e)
{
- if (e.getTargetException() instanceof AbstractRestartResponseException ||
+ if (e.getTargetException() instanceof ReplaceHandlerException ||
e.getTargetException() instanceof AuthorizationException ||
e.getTargetException() instanceof WicketRuntimeException)
{
Added: wicket/trunk/wicket/src/main/java/org/apache/wicket/Resource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Resource.java?rev=897330&view=auto
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Resource.java (added)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Resource.java Fri Jan 8 21:48:50 2010
@@ -0,0 +1,198 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket;
+
+import java.util.Map;
+
+import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.request.target.resource.ResourceStreamRequestHandler;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.value.IValueMap;
+import org.apache.wicket.util.value.ValueMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * A Resource is something that implements IResourceListener and provides a getResourceStream()
+ * method which returns the raw IResourceStream to be rendered back to the client browser.
+ * <p>
+ * Resources themselves do not currently have URLs. Instead, they are referred to by components that
+ * have URLs.
+ * <p>
+ * Resources can be shared throughout an application by adding them to Application with
+ * addResource(Class scope, String name) or addResource(String name). A resource added in such a way
+ * is a named resource and is accessible throughout the application via
+ * Application.getResource(Class scope, String name) or Application.getResource(String name). The
+ * ResourceReference class enables easy access to such resources in a way that is light on clusters.
+ * <p>
+ * While resources can be shared between components, it is important to emphasize that components
+ * <i>cannot </i> be shared among containers. For example, you can create a button image resource
+ * with new DefaultButtonImageResource(...) and store that in the Application with addResource().
+ * You can then assign that logical resource via ResourceReference to several ImageButton
+ * components. While the button image resource can be shared between components like this, the
+ * ImageButton components in this example are like all other components in Wicket and cannot be
+ * shared.
+ *
+ * @see SharedResources
+ * @author Jonathan Locke
+ * @author Johan Compagner
+ * @author Gili Tzabari
+ * @author Igor Vaynberg
+ */
+public abstract class Resource implements IResourceListener
+{
+ private static final long serialVersionUID = 1L;
+
+ /** Logger */
+ private static final Logger log = LoggerFactory.getLogger(Resource.class);
+
+ /** True if this resource can be cached */
+ private boolean cacheable;
+
+ /**
+ * ThreadLocal to keep any parameters associated with the request for this resource
+ */
+ private static final ThreadLocal<IValueMap> parameters = new ThreadLocal<IValueMap>();
+
+ /**
+ * Constructor
+ */
+ protected Resource()
+ {
+ // By default all resources are cacheable
+ cacheable = true;
+ }
+
+ /**
+ * @return Gets the resource to render to the requester
+ */
+ public abstract IResourceStream getResourceStream();
+
+ /**
+ * @return boolean True or False if this resource is cacheable
+ */
+ public final boolean isCacheable()
+ {
+ return cacheable;
+ }
+
+ /**
+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT CALL IT.
+ *
+ * Called when a resource is requested.
+ */
+ public final void onResourceRequested()
+ {
+ try
+ {
+ // Get request cycle
+ final RequestCycle cycle = RequestCycle.get();
+
+ // Fetch resource from subclass if necessary
+ IResourceStream resourceStream = init();
+
+ // Get servlet response to use when responding with resource
+ final WebResponse response = (WebResponse)cycle.getResponse();
+
+ // FIXME WICKET-385 Move HTTP caching features out of org.apache.wicket.Resource
+ if (isCacheable())
+ {
+ response.setLastModifiedTime(resourceStream.lastModifiedTime().getMilliseconds());
+ }
+ else
+ {
+ response.setLastModifiedTime(-1);
+ }
+ configureResponse(response);
+
+ cycle.scheduleRequestHandlerAfterCurrent(new ResourceStreamRequestHandler(
+ resourceStream));
+ }
+ finally
+ {
+ // Really really really make sure parameters are cleared
+ parameters.set(null);
+ }
+ }
+
+ /**
+ * Should this resource be cacheable, so will it set the last modified and the some cache
+ * headers in the response.
+ *
+ * @param cacheable
+ * boolean if the lastmodified and cache headers must be set.
+ * @return this
+ */
+ public final Resource setCacheable(boolean cacheable)
+ {
+ this.cacheable = cacheable;
+ return this;
+ }
+
+ /**
+ * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT!
+ *
+ * @param parameters
+ * Map of query parameters that parameterize this resource
+ */
+ public final void setParameters(final Map<String, ?> parameters)
+ {
+ if (parameters == null)
+ {
+ Resource.parameters.set(null);
+ }
+ else
+ {
+ Resource.parameters.set(new ValueMap(parameters));
+ }
+ }
+
+ /**
+ * Allows implementations to do configure the response, like setting headers etc.
+ *
+ * @param response
+ * the response
+ */
+ protected void configureResponse(final Response response)
+ {
+ }
+
+ /**
+ * Sets any loaded resource to null, thus forcing a reload on the next request.
+ */
+ protected void invalidate()
+ {
+ }
+
+ /**
+ * Set resource field by calling subclass
+ *
+ * @return The resource stream for the current request
+ */
+ private final IResourceStream init()
+ {
+ IResourceStream stream = getResourceStream();
+
+ if (stream == null)
+ {
+ throw new WicketRuntimeException("Could not get resource stream");
+ }
+ return stream;
+ }
+}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java Fri Jan 8 21:48:50 2010
@@ -124,7 +124,7 @@
@Override
protected CharSequence getCallbackScript()
{
- return generateCallbackScript("wicketAjaxGet('" + getCallbackUrl(onlyTargetActivePage()) +
+ return generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() +
"'");
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Fri Jan 8 21:48:50 2010
@@ -20,12 +20,12 @@
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.RequestContext;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.WicketEventReference;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.util.string.AppendingStringBuffer;
@@ -113,7 +113,7 @@
*/
protected CharSequence getCallbackScript(boolean onlyTargetActivePage)
{
- return generateCallbackScript("wicketAjaxGet('" + getCallbackUrl(onlyTargetActivePage) +
+ return generateCallbackScript("wicketAjaxGet('" + getCallbackUrl() +
"'");
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/WicketAjaxReference.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.ajax;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
* Resource reference for Wicket AJAX javascript implementation
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java Fri Jan 8 21:48:50 2010
@@ -149,7 +149,7 @@
protected final CharSequence getEventHandler()
{
return generateCallbackScript(new AppendingStringBuffer("wicketAjaxPost('").append(
- getCallbackUrl(true)).append(
+ getCallbackUrl()).append(
"', wicketSerializeForm(document.getElementById('" + getComponent().getMarkupId() +
"',false))"));
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java Fri Jan 8 21:48:50 2010
@@ -92,7 +92,7 @@
protected final CharSequence getEventHandler()
{
return generateCallbackScript(new AppendingStringBuffer("wicketAjaxPost('").append(
- getCallbackUrl(false)).append(
+ getCallbackUrl()).append(
"', wicketSerialize(Wicket.$('" + getComponent().getMarkupId() + "'))"));
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java Fri Jan 8 21:48:50 2010
@@ -114,7 +114,7 @@
protected CharSequence getEventHandler()
{
final String formId = getForm().getMarkupId();
- final CharSequence url = getCallbackUrl(true);
+ final CharSequence url = getCallbackUrl();
AppendingStringBuffer call = new AppendingStringBuffer("wicketSubmitFormById('").append(
formId).append("', '").append(url).append("', ");
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/authorization/strategies/page/SimplePageAuthorizationStrategy.java Fri Jan 8 21:48:50 2010
@@ -21,7 +21,6 @@
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.authorization.IUnauthorizedComponentInstantiationListener;
import org.apache.wicket.authorization.UnauthorizedInstantiationException;
@@ -93,7 +92,8 @@
if (component instanceof Page)
{
// Redirect to page to let the user sign in
- throw new RestartResponseAtInterceptPageException(signInPageClass);
+ // TODO (NG)
+ // throw new RestartResponseAtInterceptPageException(signInPageClass);
}
else
{
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/AbstractAjaxBehavior.java Fri Jan 8 21:48:50 2010
@@ -76,26 +76,9 @@
* Gets the url that references this handler.
*
* @return the url that references this handler
- * @see #getCallbackUrl(boolean)
*/
- @Deprecated
- // TODO 1.6 Remove
public CharSequence getCallbackUrl()
{
- return getCallbackUrl(true);
- }
-
- /**
- * Gets the url that references this handler.
- *
- * @param onlyTargetActivePage
- * if true the callback to this behavior will be ignore if the page is not the last
- * one the user accessed
- *
- * @return the url that references this handler
- */
- public CharSequence getCallbackUrl(final boolean onlyTargetActivePage)
- {
if (getComponent() == null)
{
throw new IllegalArgumentException(
@@ -104,14 +87,7 @@
final RequestListenerInterface rli;
- if (onlyTargetActivePage)
- {
- rli = IActivePageBehaviorListener.INTERFACE;
- }
- else
- {
- rli = IBehaviorListener.INTERFACE;
- }
+ rli = IBehaviorListener.INTERFACE;
return getComponent().urlFor(this, rli);
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssHeaderContributor.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssHeaderContributor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssHeaderContributor.java Fri Jan 8 21:48:50 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.resources.CompressedResourceReference;
+import org.apache.wicket.ng.resource.CompressedResourceReference;
/**
* @author Juergen Donnerstag
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssReferenceHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssReferenceHeaderContributor.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssReferenceHeaderContributor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/CssReferenceHeaderContributor.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.behavior;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
* @author Juergen Donnerstag
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/HeaderContributor.java Fri Jan 8 21:48:50 2010
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.behavior;
-import org.apache.wicket.ResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
* A bunch of static helper methods to add CSS and Javascript to the markup headers
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptHeaderContributor.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptHeaderContributor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptHeaderContributor.java Fri Jan 8 21:48:50 2010
@@ -17,7 +17,7 @@
package org.apache.wicket.behavior;
import org.apache.wicket.markup.html.IHeaderResponse;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
/**
* @author Juergen Donnerstag
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptReferenceHeaderContributor.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptReferenceHeaderContributor.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptReferenceHeaderContributor.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/behavior/JavascriptReferenceHeaderContributor.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.behavior;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.html.IHeaderResponse;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
* @author Juergen Donnerstag
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WebPage.java Fri Jan 8 21:48:50 2010
@@ -20,7 +20,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.Page;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.Response;
import org.apache.wicket.behavior.AbstractBehavior;
import org.apache.wicket.markup.MarkupType;
@@ -30,6 +29,7 @@
import org.apache.wicket.model.IModel;
import org.apache.wicket.ng.request.component.PageParameters;
import org.apache.wicket.ng.request.handler.IPageRequestHandler;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.protocol.http.WebResponse;
import org.apache.wicket.response.StringResponse;
import org.slf4j.Logger;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/WicketEventReference.java Fri Jan 8 21:48:50 2010
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.markup.html;
-import org.apache.wicket.ResourceReference;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
/**
* Resource reference to wicket-event.js which is used to allow events via javascript
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/ImageButton.java Fri Jan 8 21:48:50 2010
@@ -18,11 +18,11 @@
import org.apache.wicket.IResourceListener;
import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.image.resource.LocalizedImageResource;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.value.ValueMap;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/upload/MultiFileUploadField.java Fri Jan 8 21:48:50 2010
@@ -24,7 +24,6 @@
import java.util.Map.Entry;
import org.apache.wicket.Request;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.IHeaderContributor;
import org.apache.wicket.markup.html.IHeaderResponse;
@@ -33,10 +32,11 @@
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.protocol.http.IMultipartWebRequest;
import org.apache.wicket.util.convert.ConversionException;
import org.apache.wicket.util.string.Strings;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/Image.java Fri Jan 8 21:48:50 2010
@@ -19,13 +19,13 @@
import org.apache.wicket.Component;
import org.apache.wicket.IResourceListener;
import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.image.resource.LocalizedImageResource;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.value.ValueMap;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/NonCachingImage.java Fri Jan 8 21:48:50 2010
@@ -17,9 +17,9 @@
package org.apache.wicket.markup.html.image;
import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.value.ValueMap;
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/image/resource/LocalizedImageResource.java Fri Jan 8 21:48:50 2010
@@ -25,11 +25,11 @@
import org.apache.wicket.IResourceListener;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Resource;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.PackageResource;
import org.apache.wicket.ng.request.cycle.RequestCycle;
+import org.apache.wicket.ng.resource.PackageResource;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.parse.metapattern.Group;
import org.apache.wicket.util.parse.metapattern.MetaPattern;
@@ -389,8 +389,8 @@
@Override
protected Resource newResource()
{
- PackageResource pr = PackageResource.get(getScope(), getName(),
- LocalizedImageResource.this.locale, style, variation);
+ PackageResource pr = PackageResource.get(getScope(), getName(), locale, style,
+ variation);
locale = pr.getLocale();
return pr;
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java Fri Jan 8 21:48:50 2010
@@ -147,25 +147,26 @@
IResourceStream resourceStream = new FileResourceStream(
new org.apache.wicket.util.file.File(file));
- getRequestCycle().setRequestTarget(new ResourceStreamRequestHandler(resourceStream)
- {
- @Override
- public String getFileName()
+ getRequestCycle().scheduleRequestHandlerAfterCurrent(
+ new ResourceStreamRequestHandler(resourceStream)
{
- return fn;
- }
-
- @Override
- public void respond(RequestCycle requestCycle)
- {
- super.respond(requestCycle);
+ @Override
+ public String getFileName()
+ {
+ return fn;
+ }
- if (deleteAfter)
+ @Override
+ public void respond(RequestCycle requestCycle)
{
- file.delete();
+ super.respond(requestCycle);
+
+ if (deleteAfter)
+ {
+ file.delete();
+ }
}
- }
- });
+ });
}
/**
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java Fri Jan 8 21:48:50 2010
@@ -110,7 +110,7 @@
{
Attributes a = new Attributes(RequestCycle.get().getRequest(), RequestCycle.get()
- .getResponse(), getLocale(), getStyle(), getVariation(), null);
+ .getResponse(), null);
resource.respond(a);
onClick();
}
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Fri Jan 8 21:48:50 2010
@@ -30,7 +30,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.IRequestHandler;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.IBehavior;
@@ -39,10 +38,11 @@
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.html.list.AbstractItem;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
import org.apache.wicket.model.IDetachable;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.ng.resource.JavascriptResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.string.AppendingStringBuffer;
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java?rev=897330&r1=897329&r2=897330&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/tree/BaseTree.java Fri Jan 8 21:48:50 2010
@@ -21,7 +21,6 @@
import org.apache.wicket.Component;
import org.apache.wicket.IClusterable;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.ResourceReference;
import org.apache.wicket.Response;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
@@ -31,8 +30,9 @@
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.resources.CompressedResourceReference;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.ng.resource.CompressedResourceReference;
+import org.apache.wicket.ng.resource.ResourceReference;
import org.apache.wicket.util.lang.EnumeratedType;
import org.apache.wicket.util.string.Strings;