diff options
author | Michael Keppler | 2019-04-26 16:41:38 +0000 |
---|---|---|
committer | Michael Keppler | 2019-05-01 10:41:51 +0000 |
commit | f8800d8ed1b5002bcf4cccfa431d24b17f3b480a (patch) | |
tree | b5c13f2b77eb7f5ffa4deaa9a3cc7bfdc8f6d61f /org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view | |
parent | c14842f57dceb3d7c5e699f31c65c35d0967149a (diff) | |
download | egit-f8800d8ed1b5002bcf4cccfa431d24b17f3b480a.tar.gz egit-f8800d8ed1b5002bcf4cccfa431d24b17f3b480a.tar.xz egit-f8800d8ed1b5002bcf4cccfa431d24b17f3b480a.zip |
Get display instance from workbench
org.eclipse.ui.IWorkbench.getDisplay() recommends to always use that
method instead of Display.getDefault().
Change-Id: I0d7512aa9b40ad26e0b71356aa90bebd5b7611f7
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view')
3 files changed, 10 insertions, 9 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java index 185e8b128b..d332f2516e 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewRepoHandlingTest.java @@ -45,6 +45,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotText; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.eclipse.ui.PlatformUI; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +75,7 @@ public class GitRepositoriesViewRepoHandlingTest extends final SWTBotTree tree = getOrOpenView().bot().tree(); tree.getAllItems()[0].select(); waitInUI(); - Display.getDefault().syncExec(new Runnable() { + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @Override public void run() { @@ -106,13 +107,13 @@ public class GitRepositoriesViewRepoHandlingTest extends final Exception[] exceptions = new Exception[1]; final SWTBotLabel label = getOrOpenView().bot().label( UIText.RepositoriesView_messageEmpty); - Display.getDefault().syncExec(new Runnable() { + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @Override public void run() { Clipboard clip = null; try { - clip = new Clipboard(Display.getDefault()); + clip = new Clipboard(PlatformUI.getWorkbench().getDisplay()); clip.setContents(new Object[] { repositoryFile.getPath() }, new Transfer[] { TextTransfer.getInstance() }); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java index 79df4a4749..df7e6886ab 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTestUtils.java @@ -26,9 +26,9 @@ import org.eclipse.egit.ui.internal.repository.tree.TagsNode; import org.eclipse.egit.ui.internal.repository.tree.WorkingDirNode; import org.eclipse.egit.ui.test.TestUtil; import org.eclipse.jgit.lib.Repository; -import org.eclipse.swt.widgets.Display; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.eclipse.ui.PlatformUI; public class GitRepositoriesViewTestUtils { @@ -39,7 +39,7 @@ public class GitRepositoriesViewTestUtils { */ public static RepositoryTreeNodeLabelProvider createLabelProvider() { final AtomicReference<RepositoryTreeNodeLabelProvider> providerRef = new AtomicReference<>(); - Display.getDefault().syncExec(new Runnable() { + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @Override public void run() { @@ -62,7 +62,7 @@ public class GitRepositoriesViewTestUtils { } public void dispose() { - Display.getDefault().syncExec(() -> labelProvider.dispose()); + PlatformUI.getWorkbench().getDisplay().syncExec(() -> labelProvider.dispose()); } public SWTBotTreeItem getLocalBranchesItem(SWTBotTree tree, File repo) diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java index 990baf6116..6afb055d1f 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java @@ -46,13 +46,13 @@ import org.eclipse.egit.ui.test.TestUtil; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Status; import org.eclipse.jgit.lib.Repository; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.widgets.SWTBotLabel; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.team.ui.synchronize.ISynchronizeView; +import org.eclipse.ui.PlatformUI; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Ignore; @@ -312,7 +312,7 @@ public class SynchronizeViewGitChangeSetModelTest extends FILE1, true); // when - Display.getDefault().syncExec(new Runnable() { + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @Override public void run() { CommonUtils.runCommand("org.eclipse.compare.copyLeftToRight", @@ -343,7 +343,7 @@ public class SynchronizeViewGitChangeSetModelTest extends FILE1, true); // when - Display.getDefault().syncExec(new Runnable() { + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { @Override public void run() { CommonUtils.runCommand("org.eclipse.compare.copyRightToLeft", |