Author: svenmeier
Date: Wed Jul 13 19:02:19 2011
New Revision: 1146232
URL: http://svn.apache.org/viewvc?rev=1146232&view=rev
Log:
WICKET-3310 use standard Wicket string resources
Removed:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.properties
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource_de.properties
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource_fr.properties
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.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
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java?rev=1146232&r1=1146231&r2=1146232&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/UploadInfo.java
Wed Jul 13 19:02:19 2011
@@ -16,9 +16,8 @@
*/
package org.apache.wicket.protocol.http.servlet;
-import java.util.Locale;
-
import org.apache.wicket.IClusterable;
+import org.apache.wicket.Session;
import org.apache.wicket.util.lang.Bytes;
import org.apache.wicket.util.time.Duration;
@@ -69,9 +68,9 @@ public class UploadInfo implements IClus
* locale for formatting
* @return human readable string of bytes uploaded so far
*/
- public String getBytesUploadedString(Locale locale)
+ public String getBytesUploadedString()
{
- return Bytes.bytes(bytesUploaded).toString(locale);
+ return
Bytes.bytes(bytesUploaded).toString(Session.get().getLocale());
}
/**
@@ -79,9 +78,9 @@ public class UploadInfo implements IClus
* locale for formatting
* @return human readable string of total number of bytes
*/
- public String getTotalBytesString(Locale locale)
+ public String getTotalBytesString()
{
- return Bytes.bytes(totalBytes).toString(locale);
+ return
Bytes.bytes(totalBytes).toString(Session.get().getLocale());
}
/**
@@ -122,9 +121,9 @@ public class UploadInfo implements IClus
* locale for formatting
* @return transfer rate in a human readable string
*/
- public String getTransferRateString(Locale locale)
+ public String getTransferRateString()
{
- return Bytes.bytes(getTransferRateBPS()).toString(locale) +
"/s";
+ return
Bytes.bytes(getTransferRateBPS()).toString(Session.get().getLocale()) + "/s";
}
/**
@@ -159,9 +158,10 @@ public class UploadInfo implements IClus
* locale for formatting
* @return estimate of the remaining time in a human readable string
*/
- public String getRemainingTimeString(Locale locale)
+ public String getRemainingTimeString()
{
- return
Duration.milliseconds(getRemainingMilliseconds()).toString(locale);
+ return Duration.milliseconds(getRemainingMilliseconds())
+ .toString(Session.get().getLocale());
}
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=1146232&r1=1146231&r2=1146232&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
Wed Jul 13 19:02:19 2011
@@ -29,6 +29,8 @@ import org.apache.wicket.markup.html.Wic
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.SharedResourceReference;
@@ -57,6 +59,8 @@ import org.slf4j.LoggerFactory;
* </code>
* </pre>
*
+ * For customizing starting text see {@link #RESOURCE_STARTING}.
+ *
* Implementation detail: Despite being located in an Ajax package, the
progress communication is
* not done via Ajax but with an IFrame instead due to a bug in Webkit based
browsers, see
* WICKET-3202.
@@ -68,6 +72,13 @@ public class UploadProgressBar extends P
private static final Logger log =
LoggerFactory.getLogger(UploadProgressBar.class);
/**
+ * Resource key used to retrieve starting message for.
+ *
+ * Example: UploadProgressBar.starting=Upload starting...
+ */
+ public static final String RESOURCE_STARTING =
"UploadProgressBar.starting";
+
+ /**
* Initializer for this component; binds static resources.
*/
public final static class ComponentInitializer implements IInitializer
@@ -204,13 +215,17 @@ public class UploadProgressBar extends P
final String uploadFieldId = (uploadField == null) ? "" :
uploadField.getMarkupId();
- final String status =
UploadStatusResource.getStatus("statusStarting", getLocale());
+ final String status = new
StringResourceModel("UploadProgressBar.starting", this,
+ (IModel<?>)null, "Upload starting...").getString();
+
+ CharSequence url = urlFor(ref, null);
StringBuilder builder = new StringBuilder(128);
Formatter formatter = new Formatter(builder);
+
formatter.format("new Wicket.WUPB('%s', '%s', '%s', '%s', '%s',
'%s').bind('%s')",
- getMarkupId(), statusDiv.getMarkupId(),
barDiv.getMarkupId(), urlFor(ref, null),
- uploadFieldId, status, getCallbackForm().getMarkupId());
+ getMarkupId(), statusDiv.getMarkupId(),
barDiv.getMarkupId(), url, uploadFieldId,
+ status, getCallbackForm().getMarkupId());
response.renderOnDomReadyJavaScript(builder.toString());
}
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=1146232&r1=1146231&r2=1146232&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
Wed Jul 13 19:02:19 2011
@@ -16,14 +16,12 @@
*/
package org.apache.wicket.extensions.ajax.markup.html.form.upload;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.Application;
-import org.apache.wicket.Session;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequestImpl;
import org.apache.wicket.protocol.http.servlet.UploadInfo;
import org.apache.wicket.request.resource.AbstractResource;
@@ -33,6 +31,8 @@ import org.apache.wicket.request.resourc
* feed the progress bar information by the progress bar javascript which
requests this resource
* through ajax.
*
+ * For customizing status text see {@link #RESOURCE_STATUS}.
+ *
* @author Andrew Lombardi
* @author Igor Vaynberg (ivaynberg)
*/
@@ -41,6 +41,14 @@ class UploadStatusResource extends Abstr
private static final long serialVersionUID = 1L;
+ /**
+ * Resource key used to retrieve status message for.
+ *
+ * Example: UploadStatusResource.status=${percentageComplete}%
finished, ${bytesUploadedString}
+ * of ${totalBytesString} at ${transferRateString};
${remainingTimeString}
+ */
+ public static final String RESOURCE_STATUS =
"UploadStatusResource.status";
+
@Override
protected ResourceResponse newResourceResponse(final Attributes
attributes)
{
@@ -74,7 +82,9 @@ class UploadStatusResource extends Abstr
*/
private String getStatus(final Attributes attributes)
{
- HttpServletRequest req =
(HttpServletRequest)attributes.getRequest().getContainerRequest();
+ final HttpServletRequest req =
(HttpServletRequest)attributes.getRequest()
+ .getContainerRequest();
+
UploadInfo info =
MultipartServletWebRequestImpl.getUploadInfo(req);
String status = null;
@@ -84,31 +94,14 @@ class UploadStatusResource extends Abstr
}
else
{
- Locale locale = Session.get().getLocale();
-
- String pattern = getStatus("statusUpdate", locale);
-
status = info.getPercentageComplete() +
"|" +
- MessageFormat.format(pattern,
info.getPercentageComplete(),
- info.getBytesUploadedString(locale),
info.getTotalBytesString(locale),
- info.getTransferRateString(locale),
info.getRemainingTimeString(locale));
+ new StringResourceModel(
+ RESOURCE_STATUS,
+ (Component)null,
+ Model.of(info),
+ "${percentageComplete}% finished,
${bytesUploadedString} of ${totalBytesString} at ${transferRateString};
${remainingTimeString}").getString();
}
return status;
}
-
- /**
- * Get a status message for the given key.
- *
- * @param key
- * message key
- * @param locale
- * locale for message
- * @return status message
- */
- static String getStatus(String key, Locale locale)
- {
- return
ResourceBundle.getBundle(UploadStatusResource.class.getName(), locale)
- .getString(key);
- }
}
