Author: ivaynberg
Date: Fri Mar 12 18:39:18 2010
New Revision: 922384
URL: http://svn.apache.org/viewvc?rev=922384&view=rev
Log:
fixed compilation errors
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java?rev=922384&r1=922383&r2=922384&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/MultipartRequest.java
Fri Mar 12 18:39:18 2010
@@ -18,10 +18,9 @@ package org.apache.wicket.extensions.aja
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequestImpl;
import org.apache.wicket.util.lang.Bytes;
+import org.apache.wicket.util.upload.FileItemFactory;
import org.apache.wicket.util.upload.FileUploadException;
/**
@@ -31,18 +30,18 @@ import org.apache.wicket.util.upload.Fil
*/
class MultipartRequest extends MultipartServletWebRequestImpl
{
- /**
- * @param req
- * @param maxSize
- * @throws FileUploadException
- */
- public MultipartRequest(HttpServletRequest req, Bytes maxSize) throws
FileUploadException
+
+
+ public MultipartRequest(HttpServletRequest request, String
filterPrefix, Bytes maxSize,
+ FileItemFactory factory) throws FileUploadException
{
- super(req, maxSize);
- if (req == null)
- {
- throw new IllegalStateException("req cannot be null");
- }
+ super(request, filterPrefix, maxSize, factory);
+ }
+
+ public MultipartRequest(HttpServletRequest request, String
filterPrefix, Bytes maxSize)
+ throws FileUploadException
+ {
+ super(request, filterPrefix, maxSize);
}
/**
@@ -62,8 +61,7 @@ class MultipartRequest extends Multipart
{
UploadInfo info = new UploadInfo(totalBytes);
- HttpServletRequest request =
((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest();
- UploadWebRequest.setUploadInfo(request, info);
+ UploadWebRequest.setUploadInfo(getHttpServletRequest(), info);
}
/**
@@ -73,7 +71,7 @@ class MultipartRequest extends Multipart
@Override
protected void onUploadUpdate(int bytesUploaded, int total)
{
- HttpServletRequest request =
((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest();
+ HttpServletRequest request = getHttpServletRequest();
UploadInfo info = UploadWebRequest.getUploadInfo(request);
if (info == null)
{
@@ -91,7 +89,6 @@ class MultipartRequest extends Multipart
@Override
protected void onUploadCompleted()
{
- HttpServletRequest request =
((WebRequest)RequestCycle.get().getRequest()).getHttpServletRequest();
- UploadWebRequest.clearUploadInfo(request);
+ UploadWebRequest.clearUploadInfo(getHttpServletRequest());
}
}
\ No newline at end of file
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=922384&r1=922383&r2=922384&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Fri Mar 12 18:39:18 2010
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.html.pan
import org.apache.wicket.ng.request.cycle.RequestCycle;
import org.apache.wicket.ng.resource.PackageResourceReference;
import org.apache.wicket.ng.resource.ResourceReference;
+import org.apache.wicket.ng.resource.SharedResourceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -195,7 +196,7 @@ public class UploadProgressBar extends P
@Override
public void onComponentTag(Component component, ComponentTag
tag)
{
- ResourceReference ref = new
ResourceReference(RESOURCE_NAME);
+ ResourceReference ref = new
SharedResourceReference(RESOURCE_NAME);
final String uploadFieldId = (uploadField == null) ? ""
: uploadField.getMarkupId();
tag.put("onsubmit", "var def=new Wicket.WUPB.Def('" +
component.getMarkupId() + "', '" +
status.getMarkupId() + "', '" +
bar.getMarkupId() + "', '" +
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java?rev=922384&r1=922383&r2=922384&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
Fri Mar 12 18:39:18 2010
@@ -18,9 +18,8 @@ package org.apache.wicket.extensions.aja
import javax.servlet.http.HttpServletRequest;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.markup.html.DynamicWebResource;
-import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.ng.resource.AbstractResource;
+import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
/**
@@ -31,68 +30,57 @@ import org.apache.wicket.protocol.http.W
* @author Andrew Lombardi
* @author Igor Vaynberg (ivaynberg)
*/
-class UploadStatusResource extends DynamicWebResource
+class UploadStatusResource extends AbstractResource
{
private static final long serialVersionUID = 1L;
- protected ResourceState getResourceState()
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes)
{
- return new UploadResourceState();
- }
-
- private static class UploadResourceState extends
DynamicWebResource.ResourceState
- {
- /**
- * status string that will be returned to javascript to be
parsed
- *
- * uploaded count|total count|transfer rate|time remaining
- */
- private String status;
+ ResourceResponse response = new ResourceResponse();
+ response.setContentType("text/plain");
- /** Create a new one of these from the current request */
- public UploadResourceState()
+ final String content = getStatus(attributes);
+ response.setWriteCallback(new WriteCallback()
{
-
- RequestCycle rc = RequestCycle.get();
- HttpServletRequest req =
((WebRequest)rc.getRequest()).getHttpServletRequest();
- UploadInfo info = UploadWebRequest.getUploadInfo(req);
-
- if (info == null || info.getTotalBytes() < 1)
+ @Override
+ public void writeData(Attributes attributes)
{
- status = "0|0|0|0";
+ attributes.getResponse().write(content);
}
- else
- {
- status = "" + info.getPercentageComplete() +
"|" + info.getBytesUploadedString() +
- "|" +
info.getTotalBytesString() + "|" + info.getTransferRateString() +
- "|" +
info.getRemainingTimeString();
- }
- status = "<html>|" + status + "|</html>";
- }
+ });
- /**
- * @see
org.apache.wicket.markup.html.DynamicWebResource.ResourceState#getContentType()
- */
- public String getContentType()
- {
- return "text/plain";
- }
+ response.setContentLength(content.getBytes().length);
- /**
- * @see
org.apache.wicket.markup.html.DynamicWebResource.ResourceState#getLength()
- */
- public int getLength()
+ return response;
+
+
+ }
+
+ /**
+ * @param attributes
+ * @return
+ */
+ private String getStatus(Attributes attributes)
+ {
+ HttpServletRequest req =
((ServletWebRequest)attributes.getRequest()).getHttpServletRequest();
+ UploadInfo info = UploadWebRequest.getUploadInfo(req);
+
+ String status = null;
+ if (info == null || info.getTotalBytes() < 1)
{
- return status.length();
+ status = "0|0|0|0";
}
-
- /**
- * @see
org.apache.wicket.markup.html.DynamicWebResource.ResourceState#getData()
- */
- public byte[] getData()
+ else
{
- return status.getBytes();
+ status = "" + info.getPercentageComplete() + "|" +
info.getBytesUploadedString() + "|" +
+ info.getTotalBytesString() + "|" +
info.getTransferRateString() + "|" +
+ info.getRemainingTimeString();
}
+ status = "<html>|" + status + "|</html>";
+ return status;
}
+
+
}
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java?rev=922384&r1=922383&r2=922384&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadWebRequest.java
Fri Mar 12 18:39:18 2010
@@ -19,7 +19,8 @@ package org.apache.wicket.extensions.aja
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.protocol.http.WebRequest;
+import org.apache.wicket.ng.request.Url;
+import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.upload.FileUploadException;
@@ -42,30 +43,26 @@ import org.apache.wicket.util.upload.Fil
*/
public class UploadWebRequest extends ServletWebRequest
{
- final HttpServletRequest req;
+ public UploadWebRequest(HttpServletRequest httpServletRequest, String
filterPrefix, Url url)
+ {
+ super(httpServletRequest, filterPrefix, url);
+ }
- /**
- * Constructor
- *
- * @param req
- */
- public UploadWebRequest(final HttpServletRequest req)
+ public UploadWebRequest(HttpServletRequest httpServletRequest, String
filterPrefix)
{
- super(req);
- this.req = req;
+ super(httpServletRequest, filterPrefix);
}
+
/**
* @see
org.apache.wicket.protocol.http.WebRequest#newMultipartWebRequest(org.apache.wicket.util.lang.Bytes)
*/
@Override
- public WebRequest newMultipartWebRequest(Bytes maxsize)
+ public MultipartServletWebRequest newMultipartWebRequest(Bytes maxsize)
{
try
{
- final MultipartRequest multipartRequest = new
MultipartRequest(req, maxsize);
-
multipartRequest.setRequestParameters(getRequestParameters());
- return multipartRequest;
+ return new MultipartRequest(getHttpServletRequest(),
getFilterPrefix(), maxsize);
}
catch (FileUploadException e)
{
