diff options
author | Judith Gull | 2015-04-22 14:56:41 +0000 |
---|---|---|
committer | Judith Gull | 2015-04-22 15:05:53 +0000 |
commit | 3dd0f2cb1d3ad7811e450370d50f6721838ea94f (patch) | |
tree | cd0abbc3d9d32e5f5ef5de0502a80dc4e5e09454 | |
parent | 96d98a6415818b55ba188e999b6e2dcc9fbe5cb2 (diff) | |
download | scout.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 |
RAP filechooser field reset after invalid value not correct4.2.0_R374.2.0_R364.2.0_R354.2.0_R344.2.0_R334.2.0_R324.2.0_R314.2.0_R304.2.0_R294.2.0_R284.2.0_R274.2.0_R264.2.0_R254.2.0_R244.2.0_R234.2.0_R224.2.0_R214.2.0_R204.2.0_R194.2.0_R184.2.0_R174.2.0_R164.2.0_R154.2.0_R144.2.0_R134.2.0_R124.2.0_R11releases/4.2.x
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.java | 44 |
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 |