24802: Acc: No indication of outgoing/incoming changes or conflicts

7 files changed, 145 insertions, 49 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java
index 1064bb21a..39f5629f4 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java
@@ -414,25 +414,27 @@ public abstract class RemoteSyncElement extends LocalSyncElement implements IRem
 	}
 	
 	static public String kindToString(int kind) {
-		StringBuffer buffer = new StringBuffer();
-		buffer.append("["); //$NON-NLS-1$
+		String label = ""; //$NON-NLS-1$
 		if(kind==IN_SYNC) {
-			buffer.append("in-sync"); //$NON-NLS-1$
+			label = Policy.bind("RemoteSyncElement.insync"); //$NON-NLS-1$
 		} else {
 			switch(kind & DIRECTION_MASK) {
-				case CONFLICTING: buffer.append("conflicting"); break; //$NON-NLS-1$
-				case OUTGOING: buffer.append("outgoing"); break; //$NON-NLS-1$
-				case INCOMING: buffer.append("incoming"); break; //$NON-NLS-1$
-			}		
+				case CONFLICTING: label = Policy.bind("RemoteSyncElement.conflicting"); break; //$NON-NLS-1$
+				case OUTGOING: label = Policy.bind("RemoteSyncElement.outgoing"); break; //$NON-NLS-1$
+				case INCOMING: label = Policy.bind("RemoteSyncElement.incoming"); break; //$NON-NLS-1$
+			}	
 			switch(kind & CHANGE_MASK) {
-				case CHANGE: buffer.append("change"); break; //$NON-NLS-1$
-				case ADDITION: buffer.append("addition"); break; //$NON-NLS-1$
-				case DELETION: buffer.append("deletion"); break; //$NON-NLS-1$
+				case CHANGE: label = Policy.bind("concatStrings", label, Policy.bind("RemoteSyncElement.change")); break; //$NON-NLS-1$ //$NON-NLS-2$
+				case ADDITION: label = Policy.bind("concatStrings", label, Policy.bind("RemoteSyncElement.addition")); break; //$NON-NLS-1$ //$NON-NLS-2$
+				case DELETION: label = Policy.bind("concatStrings", label, Policy.bind("RemoteSyncElement.deletion")); break; //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			if((kind & MANUAL_CONFLICT) != 0) {			
+				label = Policy.bind("concatStrings", label, Policy.bind("RemoteSyncElement.manual")); //$NON-NLS-1$ //$NON-NLS-2$
+			}
+			if((kind & AUTOMERGE_CONFLICT) != 0) {				
+				label = Policy.bind("concatStrings", label, Policy.bind("RemoteSyncElement.auto")); //$NON-NLS-1$ //$NON-NLS-2$
 			}
-			if((kind & MANUAL_CONFLICT) != 0) buffer.append("{manual}"); //$NON-NLS-1$
-			if((kind & AUTOMERGE_CONFLICT) != 0) buffer.append("{auto}"); //$NON-NLS-1$
 		}
-		buffer.append("]"); //$NON-NLS-1$
-		return buffer.toString();
+		return Policy.bind("RemoteSyncElement.delimit", label); //$NON-NLS-1$
 	}
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
index 322a59212..af90bc0a7 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/messages.properties
@@ -1,3 +1,4 @@
+concatStrings={0} {1}
 
 Assert.assertionFailed=Assertion failed: {0}
 
@@ -71,3 +72,15 @@ filetransfer.monitor={0} ({1}K of {2}K bytes)
 OK_1=OK
 
 SynchronizedTargetProvider.invalidURLCombination=Could not form a valid URL from {0} and {1}
+
+RemoteSyncElement.delimit=[{0}]
+RemoteSyncElement.insync=in-sync
+RemoteSyncElement.conflicting=conflicting
+RemoteSyncElement.outgoing=outgoing
+RemoteSyncElement.incoming=incoming
+RemoteSyncElement.change=change
+RemoteSyncElement.addition=addition
+RemoteSyncElement.deletion=deletion
+RemoteSyncElement.manual={manual}
+RemoteSyncElement.auto={auto}
+
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java
index 4b1eb007a..f13ab58ad 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecoratorPreferencesPage.java
@@ -11,6 +11,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.compare.internal.TabFolderLayout;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
@@ -27,9 +28,10 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.team.internal.ccvs.core.CVSException;
 import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation;
@@ -60,6 +62,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 	private Text addedFlag;
 	
 	private Button showDirty;
+	private Button showSyncInfoInLabel;
 	
 	class StringPair {
 		String s1;
@@ -75,6 +78,13 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 		Text t2;
 	}
 	
+	/**
+	 * Constructor for CVSDecoratorPreferencesPage.
+	 */
+	public CVSDecoratorPreferencesPage() {
+		setDescription(Policy.bind("CVSDecoratorPreferencesPage.description")); //$NON-NLS-1$;
+	}
+
 	protected TextPair createFormatEditorControl(Composite composite, String title, String buttonText, final Map supportedBindings) {
 		createLabel(composite, title, 1);
 		Text format = new Text(composite, SWT.BORDER);
@@ -140,23 +150,46 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 	 * @see PreferencePage#createContents(Composite)
 	 */
 	protected Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		GridLayout layout= new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData());
-
-		// file text decoration options
-
-		Group fileTextGroup = new Group(composite, SWT.NULL);
-		layout = new GridLayout();
+				
+		// create a tab folder for the page
+		TabFolder tabFolder = new TabFolder(parent, SWT.NONE);
+		tabFolder.setLayout(new TabFolderLayout());
+		tabFolder.setLayoutData(new GridData(GridData.FILL_BOTH));		
+		
+		// text decoration options
+		TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
+		tabItem.setText(Policy.bind("Text_Labels_12"));//$NON-NLS-1$		
+		tabItem.setControl(createTextDecoratorPage(tabFolder));
+		
+		// image decoration options
+		tabItem = new TabItem(tabFolder, SWT.NONE);
+		tabItem.setText(Policy.bind("Icon_Overlays_24"));//$NON-NLS-1$		
+		tabItem.setControl(createIconDecoratorPage(tabFolder));
+		
+		// general decoration options
+		tabItem = new TabItem(tabFolder, SWT.NONE);
+		tabItem.setText(Policy.bind("CVSDecoratorPreferencesPage.generalTabFolder"));//$NON-NLS-1$
+		tabItem.setControl(createGeneralDecoratorPage(tabFolder));
+		
+		// synchronize decoration options
+		tabItem = new TabItem(tabFolder, SWT.NONE);
+		tabItem.setText(Policy.bind("CVSDecoratorPreferencesPage.synchronizeTabFolder"));//$NON-NLS-1$
+		tabItem.setControl(createSynchronizeDecoratorPage(tabFolder));
+				
+		initializeValues();
+		WorkbenchHelp.setHelp(tabFolder, IHelpContextIds.DECORATORS_PREFERENCE_PAGE);
+		return tabFolder;
+	}
+	
+	private Control createTextDecoratorPage(Composite parent) {
+		Composite fileTextGroup = new Composite(parent, SWT.NULL);
+		GridLayout	layout = new GridLayout();
 		layout.numColumns = 3;
 		fileTextGroup.setLayout(layout);
 		GridData data = new GridData();
 		data.horizontalAlignment = GridData.FILL;
 		fileTextGroup.setLayoutData(data);
-		fileTextGroup.setText(Policy.bind("Text_Labels_12")); //$NON-NLS-1$
+
 		createLabel(fileTextGroup, Policy.bind("Select_the_format_for_file,_folders,_and_project_text_labels__13"), 3); //$NON-NLS-1$
 
 		TextPair format = createFormatEditorControl(fileTextGroup, Policy.bind("&File_Format__14"), Policy.bind("Add_&Variables_15"), getFileBindingDescriptions()); //$NON-NLS-1$ //$NON-NLS-2$
@@ -173,44 +206,66 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 		dirtyFlag = new Text(fileTextGroup, SWT.BORDER);
 		dirtyFlag.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		dirtyFlag.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {				
+			public void modifyText(ModifyEvent e) {
 				updateExamples();
 			}
 		});
 		createLabel(fileTextGroup, "", 1); // spacer //$NON-NLS-1$
-		
+
 		createLabel(fileTextGroup, Policy.bind("Label_decorat&ion_for_added__22"), 1); //$NON-NLS-1$
 		addedFlag = new Text(fileTextGroup, SWT.BORDER);
 		addedFlag.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		addedFlag.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {				
+			public void modifyText(ModifyEvent e) {
 				updateExamples();
 			}
 		});
 
-		createLabel(fileTextGroup, "", 1); // spacer //$NON-NLS-1$
-		
-		// image decoration options
-		
-		Group imageGroup = new Group(composite, SWT.NULL);
-		layout = new GridLayout();
+		return fileTextGroup;	
+	}
+	
+	private Control createIconDecoratorPage(Composite parent) {
+		Composite imageGroup = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
 		imageGroup.setLayout(layout);
-		data = new GridData();
+		GridData data = new GridData();
 		data.horizontalAlignment = GridData.FILL;
 		imageGroup.setLayoutData(data);
-		imageGroup.setText(Policy.bind("Icon_Overlays_24")); //$NON-NLS-1$
+
+		createLabel(imageGroup, Policy.bind("CVSDecoratorPreferencesPage.iconDescription"), 1); //$NON-NLS-1$
+		
 		imageShowDirty = createCheckBox(imageGroup, Policy.bind("Sho&w_outgoing_25")); //$NON-NLS-1$
 		imageShowHasRemote = createCheckBox(imageGroup, Policy.bind("Show_has_&remote_26")); //$NON-NLS-1$
 		imageShowAdded = createCheckBox(imageGroup, Policy.bind("S&how_is_added_27")); //$NON-NLS-1$
 		imageShowNewResource = createCheckBox(imageGroup, Policy.bind("CVSDecoratorPreferencesPage.newResources")); //$NON-NLS-1$
 		
-		showDirty = createCheckBox(composite, Policy.bind("&Compute_deep_outgoing_state_for_folders_(disabling_this_will_improve_decorator_performance)_28")); //$NON-NLS-1$
-				
-		initializeValues();
-		WorkbenchHelp.setHelp(composite, IHelpContextIds.DECORATORS_PREFERENCE_PAGE);
+		return imageGroup;
+	}
+	
+	private Control createGeneralDecoratorPage(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData();
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+		createLabel(composite, Policy.bind("CVSDecoratorPreferencesPage.generalDescription"), 1); //$NON-NLS-1$		
+		showDirty = createCheckBox(composite, Policy.bind("&Compute_deep_outgoing_state_for_folders_(disabling_this_will_improve_decorator_performance)_28")); //$NON-NLS-1$		
 		return composite;
 	}
 	
+	private Control createSynchronizeDecoratorPage(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NULL);
+		GridLayout layout = new GridLayout();
+		composite.setLayout(layout);
+		GridData data = new GridData();
+		data.horizontalAlignment = GridData.FILL;
+		composite.setLayoutData(data);
+		createLabel(composite, Policy.bind("CVSDecoratorPreferencesPage.synchronizeDescription"), 1); //$NON-NLS-1$
+		showSyncInfoInLabel = createCheckBox(composite, Policy.bind("CVSDecoratorPreferencesPage.showSyncInfoInLabel")); //$NON-NLS-1$
+		return composite;
+	}
+		
 	private Label createLabel(Composite parent, String text, int span) {
 		Label label = new Label(parent, SWT.LEFT);
 		label.setText(text);
@@ -261,6 +316,8 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 		imageShowNewResource.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION));
 		
 		showDirty.setSelection(store.getBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY));
+		
+		showSyncInfoInLabel.setSelection(store.getBoolean(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT));
 	
 		setValid(true);
 	}
@@ -292,6 +349,8 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 		
 		store.setValue(ICVSUIConstants.PREF_CALCULATE_DIRTY, showDirty.getSelection());
 		
+		store.setValue(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT, showSyncInfoInLabel.getSelection());		
+		
 		CVSDecorator.refresh();
 		
 		CVSUIPlugin.getPlugin().savePluginPreferences();
@@ -319,6 +378,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 		imageShowNewResource.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_NEWRESOURCE_DECORATION));
 		
 		showDirty.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY));
+		showSyncInfoInLabel.setSelection(store.getDefaultBoolean(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT));		
 	}
 
 	/**
@@ -368,7 +428,7 @@ public class CVSDecoratorPreferencesPage extends PreferencePage implements IWork
 				labelProvider,
 				Policy.bind("Select_the_&variables_to_add_to_the_decoration_format__30")); //$NON-NLS-1$
 		dialog.setTitle(Policy.bind("Add_Variables_31")); //$NON-NLS-1$
-		if (dialog.open() != dialog.OK)
+		if (dialog.open() != ListSelectionDialog.OK)
 			return;
 	
 		Object[] result = dialog.getResult();
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 1a4c05691..a777d7867 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -347,7 +347,7 @@ public class CVSUIPlugin extends AbstractUIPlugin implements IPropertyChangeList
 			status = ((TeamException)exception).getStatus();
 			log = ((flags & LOG_TEAM_EXCEPTIONS) > 0);
 		} else if (exception instanceof InterruptedException) {
-			return new CVSStatus(IStatus.OK, Policy.bind("ok"));
+			return new CVSStatus(IStatus.OK, Policy.bind("ok")); //$NON-NLS-1$
 		} else if (exception != null) {
 			status = new CVSStatus(IStatus.ERROR, Policy.bind("internal"), exception); //$NON-NLS-1$
 			log = ((flags & LOG_OTHER_EXCEPTIONS) > 0);
@@ -465,6 +465,7 @@ public class CVSUIPlugin extends AbstractUIPlugin implements IPropertyChangeList
 		store.setDefault(ICVSUIConstants.PREF_ADDED_FLAG, CVSDecoratorConfiguration.DEFAULT_ADDED_FLAG);
 		store.setDefault(ICVSUIConstants.PREF_DIRTY_FLAG, CVSDecoratorConfiguration.DEFAULT_DIRTY_FLAG);
 		store.setDefault(ICVSUIConstants.PREF_CALCULATE_DIRTY, true);
+		store.setDefault(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT, false);		
 		store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_MIXED_TAGS, true);
 		store.setDefault(ICVSUIConstants.PREF_PROMPT_ON_SAVING_IN_SYNC, true);
 		store.setDefault(ICVSUIConstants.PREF_SAVE_DIRTY_EDITORS, ICVSUIConstants.OPTION_PROMPT);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
index e4b287098..68f75e3f8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
@@ -86,6 +86,8 @@ public interface ICVSUIConstants {
 	public final String PREF_ADDED_FLAG = "pref_added_flag"; //$NON-NLS-1$
 	
 	public final String PREF_CALCULATE_DIRTY = "pref_calculate_dirty";	 //$NON-NLS-1$
+	
+	public final String PREF_SHOW_SYNCINFO_AS_TEXT = "pref_show_syncinfo_as_text"; //$NON-NLS-1$
 
 	// Wizard banners
 	public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.gif";	 //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index c3ee71e44..1f1182f05 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -78,6 +78,7 @@ CVSCatchupReleaseViewer.fileDecoration={0} ({1})
 CVSCatchupReleaseViewer.folderDecoration={0} {1}
 CVSCatchupReleaseViewer.confirmMerge=Mark as Mer&ged
 CVSCatchupReleaseViewer.addAction=&Add to Version Control
+CVSCatchupReleaseViewer.labelWithSyncKind={0} {1}
 
 CVSCompareEditorInput.branchLabel=<branch-{0}>
 CVSCompareEditorInput.headLabel=<HEAD>
@@ -111,7 +112,14 @@ CVSDecorator.fileDecorationWithTag={0} [{1}:{2}]
 CVSDecorator.fileDecorationNoTag={0} [{1}]
 CVSDecorator.folderDecoration={0} [{1}]
 
+CVSDecoratorPreferencesPage.description=CVS Decorator settings:
+CVSDecoratorPreferencesPage.iconDescription=Choose which CVS resource states should be indicated using an icon decorator:
+CVSDecoratorPreferencesPage.generalDescription=Set general properties of CVS decorators:
+CVSDecoratorPreferencesPage.generalTabFolder=&General
 CVSDecoratorPreferencesPage.newResources=Indicate is &new resource
+CVSDecoratorPreferencesPage.synchronizeTabFolder=S&ynchronize View
+CVSDecoratorPreferencesPage.synchronizeDescription=Set the properties of CVS decorators for the Synchronize view:
+CVSDecoratorPreferencesPage.showSyncInfoInLabel=Show all synchronization information in a resource's text label
 
 CVSFilePropertiesPage.ignored=The file is ignored by CVS.
 CVSFilePropertiesPage.notManaged=The file is not managed by CVS.
@@ -630,7 +638,7 @@ UpdateSyncAction.Overwrite_local_changes__5=Overwrite local changes?
 UpdateSyncAction.You_have_local_changes_you_are_about_to_overwrite._Do_you_wish_to_continue__6=You have local changes you are about to overwrite. Do you wish to continue?
 
 Example__1=Example:
-Text_Labels_12=Text
+Text_Labels_12=T&ext
 Select_the_format_for_file,_folders,_and_project_text_labels__13=Select the format for file, folders, and project text labels:
 &File_Format__14=&File Format:
 Add_&Variables_15=Add &Variables...
@@ -640,7 +648,7 @@ Add_Varia&bles_17=Add Varia&bles...
 Add_Variable&s_19=Add Variable&s...
 &Label_decoration_for_outgoing__20=&Label decoration for outgoing:
 Label_decorat&ion_for_added__22=Label decora&tion for added:
-Icon_Overlays_24=Icons
+Icon_Overlays_24=&Icons
 Sho&w_outgoing_25=Indicate is out&going
 Show_has_&remote_26=Indicate &has remote
 S&how_is_added_27=Indi&cate is added
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
index 8ae093820..7eb35187c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
@@ -37,8 +37,10 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.team.core.RepositoryProvider;
 import org.eclipse.team.core.TeamException;
+import org.eclipse.team.core.sync.ILocalSyncElement;
 import org.eclipse.team.core.sync.IRemoteResource;
 import org.eclipse.team.core.sync.IRemoteSyncElement;
+import org.eclipse.team.core.sync.RemoteSyncElement;
 import org.eclipse.team.internal.ccvs.core.CVSException;
 import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
 import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
@@ -246,6 +248,7 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer {
 				return image;
 			}
 			public String getText(Object element) {
+				String label = oldProvider.getText(element);
 				if (element instanceof ITeamNode) {					
 					ITeamNode node = (ITeamNode)element;					
 					IResource resource = node.getResource();
@@ -260,12 +263,19 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer {
 							// the label for the remote/base/local files editors
 							bindings.remove(CVSDecoratorConfiguration.FILE_REVISION);
 							
-							bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, oldProvider.getText(element));
-							return CVSDecoratorConfiguration.bind(format, bindings);
+							bindings.put(CVSDecoratorConfiguration.RESOURCE_NAME, label);
+							label = CVSDecoratorConfiguration.bind(format, bindings);
+						}
+					}
+					if (CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_SHOW_SYNCINFO_AS_TEXT)) {
+						int syncKind = node.getKind();
+						if (syncKind != ILocalSyncElement.IN_SYNC) {
+							String syncKindString = RemoteSyncElement.kindToString(syncKind);
+							label = Policy.bind("CVSCatchupReleaseViewer.labelWithSyncKind", label, syncKindString); //$NON-NLS-1$
 						}
 					}
 				}								
-				return oldProvider.getText(element);
+				return label;
 			}
 		});
 	}