diff options
| author | bvosburgh | 2007-12-04 04:53:43 +0000 |
|---|---|---|
| committer | bvosburgh | 2007-12-04 04:53:43 +0000 |
| commit | dcd4a43c4c1119eb060e8788af7d8205583a4100 (patch) | |
| tree | 2f751c3506d6ca1b979c967a2a68f7031520d71e | |
| parent | 76ccdd0a7297fcac3aeaecfe4d54aac8df25a83a (diff) | |
| download | webtools.dali-dcd4a43c4c1119eb060e8788af7d8205583a4100.tar.gz webtools.dali-dcd4a43c4c1119eb060e8788af7d8205583a4100.tar.xz webtools.dali-dcd4a43c4c1119eb060e8788af7d8205583a4100.zip | |
changed Display fetch code
2 files changed, 14 insertions, 4 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/AsynchronousUiCommandExecutor.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/AsynchronousUiCommandExecutor.java index 633cd52adf..03d9c7bba2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/AsynchronousUiCommandExecutor.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/AsynchronousUiCommandExecutor.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal; import org.eclipse.jpt.utility.internal.Command; import org.eclipse.jpt.utility.internal.CommandExecutor; -import org.eclipse.ui.PlatformUI; +import org.eclipse.swt.widgets.Display; /** * This implementation of CommandExecutor can be used by a non-UI @@ -33,7 +33,7 @@ public final class AsynchronousUiCommandExecutor } public void execute(Command command) { - PlatformUI.getWorkbench().getDisplay().asyncExec(this.buildRunnable(command)); + this.display().asyncExec(this.buildRunnable(command)); } private Runnable buildRunnable(final Command command) { @@ -44,4 +44,9 @@ public final class AsynchronousUiCommandExecutor }; } + private Display display() { + Display display = Display.getCurrent(); + return (display != null) ? display : Display.getDefault(); + } + } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/SynchronousUiCommandExecutor.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/SynchronousUiCommandExecutor.java index 3243de44fb..da4802b162 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/SynchronousUiCommandExecutor.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/SynchronousUiCommandExecutor.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal; import org.eclipse.jpt.utility.internal.Command; import org.eclipse.jpt.utility.internal.CommandExecutor; -import org.eclipse.ui.PlatformUI; +import org.eclipse.swt.widgets.Display; /** * This implementation of CommandExecutor can be used by a non-UI @@ -33,7 +33,7 @@ public final class SynchronousUiCommandExecutor } public void execute(Command command) { - PlatformUI.getWorkbench().getDisplay().syncExec(this.buildRunnable(command)); + this.display().syncExec(this.buildRunnable(command)); } private Runnable buildRunnable(final Command command) { @@ -44,4 +44,9 @@ public final class SynchronousUiCommandExecutor }; } + private Display display() { + Display display = Display.getCurrent(); + return (display != null) ? display : Display.getDefault(); + } + } |