Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2017-10-21 17:18:36 -0400
committerAndrey Loskutov2017-10-27 08:30:22 -0400
commitba0bc4d46be22a613b6bcafb8964a615588d52ec (patch)
tree3a0e80a9309c20e04fe4b034d36ae979d4ac45f4 /org.eclipse.egit.ui.test/src/org/eclipse/egit
parent13ea03d91e047d8666a4068621e032e69f35af9c (diff)
downloadegit-ba0bc4d46be22a613b6bcafb8964a615588d52ec.tar.gz
egit-ba0bc4d46be22a613b6bcafb8964a615588d52ec.tar.xz
egit-ba0bc4d46be22a613b6bcafb8964a615588d52ec.zip
Commit editor branch handling fixes
- don't wait for data from branch searching if the branch count exceeds some high number, spawn extra job instead - don't show branch section next to files, move this above and collapse initially to give more space for files - cancel started jobs on disposal of the widget Bug: 526336 Change-Id: I68ce8c567809940dbe2c02a5e6b58ab45ae31224 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
index 50fd4e4eb..d2d373433 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/commit/CommitEditorTest.java
@@ -66,7 +66,7 @@ public class CommitEditorTest extends LocalRepositoryTestCase {
@Test
public void openAllEditorPagesOnValidCommit() throws Exception {
- final AtomicReference<IEditorPart> editorRef = new AtomicReference<IEditorPart>();
+ final AtomicReference<IEditorPart> editorRef = new AtomicReference<>();
PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
@Override
@@ -98,7 +98,7 @@ public class CommitEditorTest extends LocalRepositoryTestCase {
@Test
public void showAnnotations() throws Exception {
- final AtomicReference<IEditorPart> editorRef = new AtomicReference<IEditorPart>();
+ final AtomicReference<IEditorPart> editorRef = new AtomicReference<>();
PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
@Override
@@ -110,7 +110,7 @@ public class CommitEditorTest extends LocalRepositoryTestCase {
});
assertNotNull(editorRef.get());
SWTBotEditor commitEditor = bot.activeEditor();
- SWTBotTable table = commitEditor.bot().table(0);
+ SWTBotTable table = commitEditor.bot().table(1);
assertTrue(table.rowCount() > 0);
table.select(0);
ContextMenuHelper.clickContextMenuSync(table,

Back to the top