modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java | 59 ++++------ modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 5 2 files changed, 30 insertions(+), 34 deletions(-)
New commits: commit 84cfe8726c3aa0d9f0cbff628b32e554ff59ebc2 Author: Jirka Kremser jkremser@redhat.com Date: Thu Jun 21 18:55:49 2012 +0200
timeou after progress update increased to 10; some errors removed
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java index 7e8d11d..89cab60 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java @@ -36,9 +36,6 @@ import com.smartgwt.client.widgets.form.fields.ButtonItem; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.FormItemIcon; import com.smartgwt.client.widgets.form.fields.HiddenItem; -import com.smartgwt.client.widgets.form.fields.UploadItem; -import com.smartgwt.client.widgets.form.fields.events.ChangeEvent; -import com.smartgwt.client.widgets.form.fields.events.ChangeHandler; import com.smartgwt.client.widgets.form.fields.events.ClickEvent; import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
@@ -56,7 +53,8 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity; */ public class FileUploadForm extends DynamicCallbackForm {
- private UploadItem fileUploadItem; + private SingleUploader uploader; +// private UploadItem fileUploadItem; private ButtonItem uploadButton;
private Boolean uploadResult; @@ -180,7 +178,8 @@ public class FileUploadForm extends DynamicCallbackForm { }
protected void changeIcon(FormItemIcon icon, String tooltip) { - FormItem item = (this.showUploadButton) ? this.uploadButton : this.fileUploadItem; +// FormItem item = (this.showUploadButton) ? this.uploadButton : this.fileUploadItem; + FormItem item = this.uploadButton; item.setIcons(icon); item.setIconPrompt(tooltip); markForRedraw(); @@ -201,11 +200,11 @@ public class FileUploadForm extends DynamicCallbackForm { versionField.setDefaultValue(version); onDrawItems.add(versionField);
- fileUploadItem = new UploadItem("fileUploadItem", name); - fileUploadItem.setShowTitle(showNameLabel); - fileUploadItem.setWrapTitle(false); - fileUploadItem.setColSpan(1); - onDrawItems.add(fileUploadItem); +// fileUploadItem = new UploadItem("fileUploadItem", name); +// fileUploadItem.setShowTitle(showNameLabel); +// fileUploadItem.setWrapTitle(false); +// fileUploadItem.setColSpan(1); +// onDrawItems.add(fileUploadItem);
if (showUploadButton) { // this intercepts an enable request and only allows it if there is a file selected @@ -216,7 +215,7 @@ public class FileUploadForm extends DynamicCallbackForm {
@Override public void enable() { - String selectedFile = fileUploadItem.getValueAsString(); + String selectedFile = uploader.getBasename(); if (selectedFile != null && selectedFile.length() > 0) { super.enable(); } @@ -235,13 +234,13 @@ public class FileUploadForm extends DynamicCallbackForm { } });
- fileUploadItem.setEndRow(false); - fileUploadItem.addChangeHandler(new ChangeHandler() { - @Override - public void onChange(ChangeEvent changeEvent) { - uploadButton.setDisabled(false); - } - }); +// fileUploadItem.setEndRow(false); +// fileUploadItem.addChangeHandler(new ChangeHandler() { +// @Override +// public void onChange(ChangeEvent changeEvent) { +// uploadButton.setDisabled(false); +// } +// });
onDrawItems.add(uploadButton); } @@ -313,17 +312,17 @@ public class FileUploadForm extends DynamicCallbackForm { setUploadError(message); }
- Object value = fileUploadItem.getValue(); - if (value == null || value.toString().length() == 0) { - String message = MSG.view_upload_prompt_1(name); - changeIcon(iconRed, message); - setUploadError(message); - // note - don't even submit this definite failure - } else { -// changeIcon(iconLoading, MSG.common_msg_loading()); - uploadInProgress = true; -// super.submitForm(); - } +// Object value = uploader.getBasename(); +// if (value == null || value.toString().length() == 0) { +// String message = MSG.view_upload_prompt_1(name); +// changeIcon(iconRed, message); +// setUploadError(message); +// // note - don't even submit this definite failure +// } else { +//// changeIcon(iconLoading, MSG.common_msg_loading()); +// uploadInProgress = true; +//// super.submitForm(); +// } return addDomHandler(handler, com.google.gwt.event.dom.client.ClickEvent.getType()); } } @@ -338,7 +337,7 @@ public class FileUploadForm extends DynamicCallbackForm { // List<FormItem> onDrawItems = getOnDrawItems(); // setItems(onDrawItems.toArray(new FormItem[onDrawItems.size()]));
- SingleUploader uploader = new SingleUploader(null, new UploadButton()); + uploader = new SingleUploader(null, new UploadButton()); uploader.addOnFinishUploadHandler(new IUploader.OnFinishUploaderHandler() { public void onFinish(IUploader uploader) { uploadInProgress = false; diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml index c6a33af..ee21988 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml +++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml @@ -30,11 +30,8 @@ <param-value>209715200</param-value> </context-param> <context-param> - <!-- Useful in development mode to slow down the uploads in fast networks. - Put the number of milliseconds to sleep in each block received in the server. - false or 0, means don't use slow uploads --> <param-name>slowUploads</param-name> - <param-value>0</param-value> + <param-value>10</param-value> </context-param>
<filter>