Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-01-26 17:26:46 -0500
committerMichael Valenta2004-01-26 17:26:46 -0500
commita6147c7745dcc53917f36951568245c8c48fd3c0 (patch)
tree931d1ff860149afaed1b0655f05fd75e468407d1
parent510d3c7b9638dfa8c846d3146931517face3bcb8 (diff)
downloadeclipse.platform.team-a6147c7745dcc53917f36951568245c8c48fd3c0.tar.gz
eclipse.platform.team-a6147c7745dcc53917f36951568245c8c48fd3c0.tar.xz
eclipse.platform.team-a6147c7745dcc53917f36951568245c8c48fd3c0.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoSetCompareConfiguration.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/content/SyncInfoDecoratingLabelProvider.java (renamed from bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipantLabelProvider.java)22
3 files changed, 15 insertions, 14 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java
index ddcf85657..4fb89ec72 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewCompareConfiguration.java
@@ -15,11 +15,12 @@ import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.team.internal.ccvs.ui.CVSLightweightDecorator;
import org.eclipse.team.ui.synchronize.*;
+import org.eclipse.team.ui.synchronize.content.*;
import org.eclipse.team.ui.synchronize.content.SyncInfoLabelProvider;
public class CVSSynchronizeViewCompareConfiguration extends SynchronizeViewCompareConfiguration {
- private static class CVSLabelProvider extends TeamSubscriberParticipantLabelProvider {
+ private static class CVSLabelProvider extends SyncInfoDecoratingLabelProvider {
protected CVSLabelProvider(SyncInfoLabelProvider syncInfoLabelProvider) {
super(syncInfoLabelProvider);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoSetCompareConfiguration.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoSetCompareConfiguration.java
index a30c433df..ecbeaf908 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoSetCompareConfiguration.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SyncInfoSetCompareConfiguration.java
@@ -188,10 +188,10 @@ public class SyncInfoSetCompareConfiguration {
* subclass of <code>TeamSubscriberParticipantLabelProvider</code>.
* @param logicalProvider the label provider for the selected logical view
* @return a label provider
- * @see TeamSubscriberParticipantLabelProvider
+ * @see SyncInfoDecoratingLabelProvider
*/
protected ILabelProvider getLabelProvider(SyncInfoLabelProvider logicalProvider) {
- return new TeamSubscriberParticipantLabelProvider(logicalProvider);
+ return new SyncInfoDecoratingLabelProvider(logicalProvider);
}
/**
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/content/SyncInfoDecoratingLabelProvider.java
index 31b43fbe8..5b8effe6d 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/content/SyncInfoDecoratingLabelProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.ui.synchronize;
+package org.eclipse.team.ui.synchronize.content;
import java.util.*;
@@ -24,20 +24,20 @@ import org.eclipse.team.core.subscribers.*;
import org.eclipse.team.internal.core.Assert;
import org.eclipse.team.internal.ui.*;
import org.eclipse.team.ui.ISharedImages;
-import org.eclipse.team.ui.synchronize.content.SyncInfoLabelProvider;
-import org.eclipse.team.ui.synchronize.content.SyncInfoSetContentProvider;
+import org.eclipse.team.ui.synchronize.SyncInfoDiffNode;
import org.eclipse.ui.internal.WorkbenchColors;
/**
- * Provides basic labels for the subscriber participant synchronize view
- * page. This class provides a facility for subclasses to define annotations
+ * Decorates the text and labels from a <code>SyncInfoLabelProvider</code>
+ * with the proper sync kind indications.
+ * This class provides a facility for subclasses to define annotations
* on the labels and icons of adaptable objects by overriding
* <code>decorateText()</code> and <code>decorateImage</code>.
*
- * @see TeamSubscriberParticipantPage#getLabelProvider()
+ * @see SyncInfoSetCompareConfiguration#getLabelProvider(SyncInfoLabelProvider)
* @since 3.0
*/
-public class TeamSubscriberParticipantLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider {
+public class SyncInfoDecoratingLabelProvider extends LabelProvider implements ITableLabelProvider, IColorProvider {
//column constants
private static final int COL_RESOURCE = 0;
@@ -52,11 +52,11 @@ public class TeamSubscriberParticipantLabelProvider extends LabelProvider implem
CompareConfiguration compareConfig = new CompareConfiguration();
SyncInfoLabelProvider syncInfoLabelProvider;
- public TeamSubscriberParticipantLabelProvider() {
+ public SyncInfoDecoratingLabelProvider() {
this(new SyncInfoLabelProvider());
}
- public TeamSubscriberParticipantLabelProvider(SyncInfoLabelProvider syncInfoLabelProvider) {
+ public SyncInfoDecoratingLabelProvider(SyncInfoLabelProvider syncInfoLabelProvider) {
Assert.isNotNull(syncInfoLabelProvider);
JobStatusHandler.addJobListener(new IJobListener() {
public void started(QualifiedName jobType) {
@@ -65,7 +65,7 @@ public class TeamSubscriberParticipantLabelProvider extends LabelProvider implem
public void run() {
// TODO: What this is this supposed to be?
synchronized (this) {
- fireLabelProviderChanged(new LabelProviderChangedEvent(TeamSubscriberParticipantLabelProvider.this));
+ fireLabelProviderChanged(new LabelProviderChangedEvent(SyncInfoDecoratingLabelProvider.this));
}
}
});
@@ -75,7 +75,7 @@ public class TeamSubscriberParticipantLabelProvider extends LabelProvider implem
Display.getDefault().asyncExec(new Runnable() {
public void run() {
synchronized (this) {
- fireLabelProviderChanged(new LabelProviderChangedEvent(TeamSubscriberParticipantLabelProvider.this));
+ fireLabelProviderChanged(new LabelProviderChangedEvent(SyncInfoDecoratingLabelProvider.this));
}
}
});

Back to the top