Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJudith Gull2015-04-22 14:56:41 +0000
committerJudith Gull2015-04-22 15:05:53 +0000
commit3dd0f2cb1d3ad7811e450370d50f6721838ea94f (patch)
treecd0abbc3d9d32e5f5ef5de0502a80dc4e5e09454
parent96d98a6415818b55ba188e999b6e2dcc9fbe5cb2 (diff)
downloadscout.rt.incubator-releases/4.2.x.tar.gz
scout.rt.incubator-releases/4.2.x.tar.xz
scout.rt.incubator-releases/4.2.x.zip
Change-Id: Id7506353e9fe021acfc6ea72623a64d2ecc4b90b Reviewed-on: https://git.eclipse.org/r/46259 Reviewed-by: Judith Gull <jgu@bsiag.com> Tested-by: Judith Gull <jgu@bsiag.com>
-rw-r--r--org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java44
1 files changed, 28 insertions, 16 deletions
diff --git a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java
index cc0e455..7de0d31 100644
--- a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java
+++ b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/src/org/eclipse/scout/rt/ui/rap/form/fields/filechooserfield/RwtScoutFileUploadField.java
@@ -188,6 +188,7 @@ public class RwtScoutFileUploadField extends RwtScoutValueFieldComposite<IFileCh
}
getUiField().setText(filename);
+ resetUpload();
handleUpload();
}
});
@@ -421,39 +422,50 @@ public class RwtScoutFileUploadField extends RwtScoutValueFieldComposite<IFileCh
if (m_uploadListener == null) {
m_uploadListener = new P_FileUploadListener();
}
- m_uploadListener.startUpload();
m_handler.addUploadListener(m_uploadListener);
+ m_uploadListener.startUpload();
createProgressBar();
getUiBrowseButton().submit(url);
}
+ private void resetUpload() {
+ disposeHandler();
+ disposeProgressBar();
+ initializeFileUpload();
+ }
+
private boolean cancelUpload() {
- if (m_uploadedFile != null) {
- return false;
- }
- if (m_uploadListener != null) {
- m_handler.removeUploadListener(m_uploadListener);
- m_uploadListener.cancelUpload();
- m_uploadListener = null;
- }
- m_handler.dispose();
+ disposeHandler();
+ disposeBrowseButton();
+ disposeProgressBar();
+ getUiField().setText("");
+
+ initializeFileUpload();
+ createBrowseButton();
+ return true;
+ }
+ private void disposeBrowseButton() {
DropDownFileUpload uiBrowseButton = getUiBrowseButton();
if (uiBrowseButton != null && !uiBrowseButton.isDisposed()) {
uiBrowseButton.dispose();
}
+ }
+ private void disposeProgressBar() {
ProgressBar uiProgressBar = getUiProgressBar();
if (uiProgressBar != null && !uiProgressBar.isDisposed()) {
uiProgressBar.dispose();
}
- getUiField().setText("");
-
- initializeFileUpload();
-
- createBrowseButton();
+ }
- return true;
+ private void disposeHandler() {
+ if (m_uploadListener != null) {
+ m_handler.removeUploadListener(m_uploadListener);
+ m_uploadListener.cancelUpload();
+ m_uploadListener = null;
+ }
+ m_handler.dispose();
}
@Override

Back to the top