commit 683ae1e5737116b90c6723b56d248bda97e436f4
author Matthias Nick <Matthias.Nick@bsiag.com> Tue Nov 19 08:53:39 2013 +0100
committer Matthias Villiger <mvi@bsiag.com> Tue Nov 19 07:23:55 2013 -0500
tree e55c16eef4f1db7fd889cebdb76e0b04e95dae16
parent c407c9f29b8ecb9d741d593a54248f7bfa7b38e4

bug 415736: Invalid thread access when terminating Scout SWT Application
with Eclipse Luna M1 

https://bugs.eclipse.org/bugs/show_bug.cgi?id=415736

Dispose display when closing and make sure the workbench gets closed
only once

Change-Id: I1367818a541cb950352ed6a60f9ae982c2b3e315
Signed-off-by: Matthias Nick <Matthias.Nick@bsiag.com>
Reviewed-on: https://git.eclipse.org/r/18546
Tested-by: Hudson CI
Reviewed-by: Matthias Villiger <mvi@bsiag.com>
IP-Clean: Matthias Villiger <mvi@bsiag.com>

org.eclipse.scout.sdk/templates/ui.swt/src/SwtEnvironment.java

diff --git a/org.eclipse.scout.sdk/templates/ui.swt/src/SwtEnvironment.java b/org.eclipse.scout.sdk/templates/ui.swt/src/SwtEnvironment.java
index 11234a1..818cc14 100644
--- a/org.eclipse.scout.sdk/templates/ui.swt/src/SwtEnvironment.java
+++ b/org.eclipse.scout.sdk/templates/ui.swt/src/SwtEnvironment.java
@@ -53,7 +53,9 @@
       @Override
       public void environmentChanged(SwtEnvironmentEvent e) {
         if (e.getType() == SwtEnvironmentEvent.STOPPED) {
-          PlatformUI.getWorkbench().close();
+          if (!PlatformUI.getWorkbench().isClosing()) {
+            PlatformUI.getWorkbench().close();
+          }
         }
       }
     });

org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java

diff --git a/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java b/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java
index a9301bf..125c688 100644
--- a/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java
+++ b/org.eclipse.scout.sdk/templates/ui.swt/src/application/Application.java
@@ -14,17 +14,25 @@
  *  This class controls all aspects of the application's execution
  */
 public class Application implements IApplication {
+  private Display m_display;
 
   @Override
   public Object start(final IApplicationContext context) throws Exception {
-    Subject subject = new Subject();
-    subject.getPrincipals().add(new SimplePrincipal(System.getProperty("user.name")));
-    return Subject.doAs(subject, new PrivilegedExceptionAction<Object>() {
-      @Override
-      public Object run() throws Exception {
-        return startSecure(context);
+    m_display = getApplicationDisplay();
+    try {
+      Subject subject = new Subject();
+      subject.getPrincipals().add(new SimplePrincipal(System.getProperty("user.name")));
+      return Subject.doAs(subject, new PrivilegedExceptionAction<Object>() {
+        @Override
+        public Object run() throws Exception {
+          return startSecure(context);
+        }
+      });
+    } finally {
+      if (m_display != null) {
+        m_display.dispose();
       }
-    });
+    }
   }
 
   public Integer startSecure(final IApplicationContext context) throws Exception {
@@ -49,4 +57,11 @@
         }
     });
   }
+
+  public Display getApplicationDisplay() {
+    if (m_display == null) {
+      m_display = Display.getDefault();
+    }
+    return m_display;
+  }
 }