*** empty log message ***

2 files changed, 24 insertions, 7 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index 247c88e92..e2787b1d2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -107,8 +107,8 @@ SyncInfoCompareInput.localLabel=Local File
 SyncInfoCompareInput.localLabelExists=Local File ({0})
 SyncInfoCompareInput.remoteLabel=Remote File
 SyncInfoCompareInput.baseLabel=Common Ancestor
-SyncInfoCompareInput.remoteLabelExists=Remote File ({0} {1} {2})
-SyncInfoCompareInput.baseLabelExists=Common Ancestor ({0} {1} {2})
+SyncInfoCompareInput.remoteLabelExists=Remote File ({0})
+SyncInfoCompareInput.baseLabelExists=Common Ancestor ({0})
 SyncInfoCompareInput.title={0}: {1}
 SyncInfoCompareInput.tooltip=Comparing resources from {0}: {1}
 
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
index d1b033b61..f970229db 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/compare/SyncInfoCompareInput.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.subscribers.SyncInfo;
@@ -93,9 +94,9 @@ public class SyncInfoCompareInput extends CompareEditorInput {
 	}
 	
 	protected void updateLabels() {
-		CompareConfiguration config = getCompareConfiguration();
-		IRemoteResource remote = sync.getRemote();
-		IRemoteResource base = sync.getBase();
+		final CompareConfiguration config = getCompareConfiguration();
+		final IRemoteResource remote = sync.getRemote();
+		final IRemoteResource base = sync.getBase();
 		
 		String localContentId = sync.getLocalContentIdentifier();
 		if(localContentId != null) {		
@@ -106,7 +107,7 @@ public class SyncInfoCompareInput extends CompareEditorInput {
 		
 		if(remote != null) {
 			try {
-				config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabelExists", remote.getContentIdentifier(), remote.getCreatorDisplayName(), flattenText(remote.getComment()))); //$NON-NLS-1$
+				config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabelExists", remote.getContentIdentifier())); //$NON-NLS-1$
 			} catch (TeamException e) {
 				config.setRightLabel(Policy.bind("SyncInfoCompareInput.remoteLabel")); //$NON-NLS-1$
 			}
@@ -116,7 +117,7 @@ public class SyncInfoCompareInput extends CompareEditorInput {
 		
 		if(base != null) {
 			try {
-				config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabelExists", base.getContentIdentifier(), base.getCreatorDisplayName(), flattenText(base.getComment()))); //$NON-NLS-1$
+				config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabelExists", base.getContentIdentifier())); //$NON-NLS-1$
 			} catch (TeamException e) {
 				config.setAncestorLabel(Policy.bind("SyncInfoCompareInput.baseLabel")); //$NON-NLS-1$
 			}
@@ -244,4 +245,20 @@ public class SyncInfoCompareInput extends CompareEditorInput {
 	public SyncInfo getSyncInfo() {
 		return sync;
 	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.compare.IPropertyChangeNotifier#removePropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
+	 */
+	public void removePropertyChangeListener(IPropertyChangeListener listener) {
+		super.removePropertyChangeListener(listener);
+	}
+
+	
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.compare.IPropertyChangeNotifier#addPropertyChangeListener(org.eclipse.jface.util.IPropertyChangeListener)
+	 */
+	public void addPropertyChangeListener(IPropertyChangeListener listener) {
+		super.addPropertyChangeListener(listener);
+	}
 }