Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzymon Ptaszkiewicz2014-08-14 10:07:11 +0000
committerMatthias Sohn2014-08-26 22:43:50 +0000
commitf40ba8187cf074812f0a00745318307d683fe671 (patch)
treeb6afd85de8458f7e62069462f2979f1888a5b5d3
parenta8f27c54f8c49dce09321c4ae85a48fcdc5682e4 (diff)
downloadegit-f40ba8187cf074812f0a00745318307d683fe671.tar.gz
egit-f40ba8187cf074812f0a00745318307d683fe671.tar.xz
egit-f40ba8187cf074812f0a00745318307d683fe671.zip
Fix repeating message 'Building workspace' in status bar
In Ibdc454f5ffb290831b81c5e775da35434811454c, many jobs were converted from normal Job to WorkspaceJob. In case of RepositoryChangeScanner which is run every few seconds, this causes the message "Building workspace" to flash in the status bar. The reason for this is that a WorkspaceJob triggers an auto-build, even when no resources were changed. As RepositoryChangeScanner does not change any resources itself, it doesn't need to be a WorkspaceJob (which is for batching resource changed events). So change it back to a normal Job. Bug: 439325 Change-Id: Ic555b868fbda952e7f88a1b851e63af2bb1d6545 Signed-off-by: Szymon Ptaszkiewicz <szymon.ptaszkiewicz@pl.ibm.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
index b652b85c05..ed2cf825cc 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java
@@ -436,7 +436,7 @@ public class Activator extends AbstractUIPlugin implements DebugOptionsListener
* A Job that looks at the repository meta data and triggers a refresh of
* the resources in the affected projects.
*/
- static class RepositoryChangeScanner extends WorkspaceJob {
+ static class RepositoryChangeScanner extends Job {
RepositoryChangeScanner() {
super(UIText.Activator_repoScanJobName);
}
@@ -451,7 +451,7 @@ public class Activator extends AbstractUIPlugin implements DebugOptionsListener
}
@Override
- public IStatus runInWorkspace(IProgressMonitor monitor) {
+ protected IStatus run(IProgressMonitor monitor) {
// The core plugin might have been stopped before we could cancel
// this job.
RepositoryCache repositoryCache = org.eclipse.egit.core.Activator

Back to the top