Merge tag 'Luna_4.0_SR2_RC4'
diff --git a/org.eclipse.scout.rt.incubator.parent/pom.xml b/org.eclipse.scout.rt.incubator.parent/pom.xml
index 27b3e62..139f055 100644
--- a/org.eclipse.scout.rt.incubator.parent/pom.xml
+++ b/org.eclipse.scout.rt.incubator.parent/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.rt.incubator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.scout.rt.incubator</groupId>
diff --git a/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/feature.xml b/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/feature.xml
index 96bf7ec..37ec5b8 100644
--- a/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/feature.xml
+++ b/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.scout.rt.ui.rap.incubator.filechooser"
label="%featureName"
- version="4.0.0.qualifier"
+ version="4.0.200.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
@@ -25,7 +25,7 @@
</url>
<requires>
- <import feature="org.eclipse.scout.rt.rap" version="4.0.0.qualifier"/>
+ <import feature="org.eclipse.scout.rt.rap" version="4.0.200.qualifier"/>
</requires>
<plugin
diff --git a/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/pom.xml b/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/pom.xml
index 49d479a..c35774b 100644
--- a/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/pom.xml
+++ b/org.eclipse.scout.rt.ui.rap.incubator.filechooser-feature/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.scout.rt.incubator</groupId>
<artifactId>org.eclipse.scout.rt.incubator.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.rt.incubator.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.rt.ui.rap.incubator.filechooser-repository/pom.xml b/org.eclipse.scout.rt.ui.rap.incubator.filechooser-repository/pom.xml
index 1eca1e6..60301d1 100644
--- a/org.eclipse.scout.rt.ui.rap.incubator.filechooser-repository/pom.xml
+++ b/org.eclipse.scout.rt.ui.rap.incubator.filechooser-repository/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.scout.rt.incubator</groupId>
<artifactId>org.eclipse.scout.rt.incubator.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.rt.incubator.parent</relativePath>
</parent>
diff --git a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/META-INF/MANIFEST.MF b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/META-INF/MANIFEST.MF
index 9d2a35c..cc9e375 100644
--- a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/META-INF/MANIFEST.MF
+++ b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Scout UI RWT Incubator Plug-in
Bundle-SymbolicName: org.eclipse.scout.rt.ui.rap.incubator.filechooser;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.0.200.qualifier
Bundle-Activator: org.eclipse.scout.rt.ui.rap.Activator
Require-Bundle: org.eclipse.scout.rt.ui.rap;bundle-version="[3.10.0,4.1.0)",
org.eclipse.rap.addons.fileupload;bundle-version="[0.5.0,1.0.0)",
diff --git a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/pom.xml b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/pom.xml
index 6ce603d..1c0ebc4 100644
--- a/org.eclipse.scout.rt.ui.rap.incubator.filechooser/pom.xml
+++ b/org.eclipse.scout.rt.ui.rap.incubator.filechooser/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.scout.rt.incubator</groupId>
<artifactId>org.eclipse.scout.rt.incubator.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.rt.incubator.parent</relativePath>
</parent>
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 55f2815..cc0e455 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
@@ -220,8 +220,10 @@
}
@Override
- public void disposeImpl() {
+ public void handleUiDispose() {
+ super.handleUiDispose();
if (m_uploadListener != null) {
+ m_uploadListener.cancelUpload();
m_handler.removeUploadListener(m_uploadListener);
m_uploadListener = null;
}
diff --git a/pom.xml b/pom.xml
index 0af3df4..89e00e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.scout</groupId>
<artifactId>org.eclipse.scout.parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.200-SNAPSHOT</version>
<relativePath>../org.eclipse.scout.parent</relativePath>
</parent>
