Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-12-08 16:20:43 +0000
committerJean Michel-Lemieux2003-12-08 16:20:43 +0000
commit1bb419b9d50e3a9a51a640e8c30108488d464ed1 (patch)
treec721e7914f9953340cb206522f60ec9589b8a72f
parentbaac826866aeaf2164e002d007f7f93e6fe1e46d (diff)
downloadeclipse.platform.team-1bb419b9d50e3a9a51a640e8c30108488d464ed1.tar.gz
eclipse.platform.team-1bb419b9d50e3a9a51a640e8c30108488d464ed1.tar.xz
eclipse.platform.team-1bb419b9d50e3a9a51a640e8c30108488d464ed1.zip
Bug 47168 Sync View doesn't grey when a Merge is performed
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipantLabelProvider.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipantLabelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipantLabelProvider.java
index e2280074e..d4b4a5f36 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipantLabelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipantLabelProvider.java
@@ -89,6 +89,10 @@ public class TeamSubscriberParticipantLabelProvider extends LabelProvider implem
}
}, SubscriberAction.SUBSCRIBER_JOB_TYPE);
+
+ // The label provider may of been created after the subscriber job has been
+ // started.
+ this.working = JobStatusHandler.hasRunningJobs(SubscriberAction.SUBSCRIBER_JOB_TYPE);
}
protected String decorateText(String input, Object resource) {

Back to the top