fixed #25507

10 files changed, 76 insertions, 36 deletions

diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index 77f32e285..eb7d213ed 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -11,7 +11,16 @@
 <h1>
 Eclipse Platform Build Notes<br>
 Compare</h1>
-Eclipse Build Input February 6th 2003
+Eclipse Build Input February ?th 2003 (RC1)
+
+<h2>
+Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=25507">#25507</a>: Compare view prevents Ctrl + F6 working<br>
+
+
+<h1>
+<hr WIDTH="100%"></h1>
+Eclipse Build Input February 6th 2003 (M5 aka RC0)
 
 <h2>
 API Additions</h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index ab0f375f8..d7c78916d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -188,14 +188,14 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	 * see IEditorInput.getToolTipText
 	 */
 	public String getToolTipText() {
-		return fTitle;
+		return getTitle();
 	}
 	
 	/* (non Javadoc)
 	 * see IEditorInput.getName
 	 */
 	public String getName() {
-		return fTitle;
+		return getTitle();
 	}
 			
 	/**
@@ -238,6 +238,8 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	 * @return the title
 	 */
 	public String getTitle() {
+		if (fTitle == null)
+			return Utilities.getString("CompareEditorInput.defaultTitle"); //$NON-NLS-1$
 		return fTitle;
 	}
 	
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 834c63aa9..af06e6d19 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -897,17 +897,6 @@ public class TextMergeViewer extends ContentMergeViewer  {
 		fAncestor.setEditable(false);
 		
 		fSummaryCanvas= new Label(composite, SWT.NONE);
-		/*
-		new Canvas(composite, SWT.NONE);
-		fSummaryCanvas.addPaintListener(
-			new PaintListener() {
-				public void paintControl(PaintEvent e) {
-					// TODO Auto-generated method stub
-
-				}
-			}
-		);
-		*/
 		updateResolveStatus();
 				
 		// 2nd row
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
index 614790a0d..29108bae8 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
@@ -34,8 +34,7 @@ class ResourceCompareInput extends CompareEditorInput {
 	private IResource fAncestorResource;
 	private IResource fLeftResource;
 	private IResource fRightResource;
-	private DiffTreeViewer fDiffViewer;
-	
+	private DiffTreeViewer fDiffViewer;	
 	
 	class MyDiffNode extends DiffNode {
 		
@@ -206,10 +205,10 @@ class ResourceCompareInput extends CompareEditorInput {
 			if (fThreeWay) {			
 				String format= Utilities.getString("ResourceCompare.threeWay.title"); //$NON-NLS-1$
 				String ancestorLabel= fAncestorResource.getName();
-				title= MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel} );
+				title= MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel});	
 			} else {
 				String format= Utilities.getString("ResourceCompare.twoWay.title"); //$NON-NLS-1$
-				title= MessageFormat.format(format, new String[] {leftLabel, rightLabel} );
+				title= MessageFormat.format(format, new String[] {leftLabel, rightLabel});
 			}
 			setTitle(title);
 			
@@ -229,6 +228,23 @@ class ResourceCompareInput extends CompareEditorInput {
 		}
 	}
 	
+	public String getToolTipText() {
+		if (fLeftResource != null && fRightResource != null) {
+			String leftLabel= fLeftResource.getFullPath().makeRelative().toString();
+			String rightLabel= fRightResource.getFullPath().makeRelative().toString();			
+			if (fThreeWay) {			
+				String format= Utilities.getString("ResourceCompare.threeWay.tooltip"); //$NON-NLS-1$
+				String ancestorLabel= fAncestorResource.getFullPath().makeRelative().toString();
+				return MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel});
+			} else {
+				String format= Utilities.getString("ResourceCompare.twoWay.tooltip"); //$NON-NLS-1$
+				return MessageFormat.format(format, new String[] {leftLabel, rightLabel});
+			}
+		}
+		// fall back
+		return super.getToolTipText();
+	}
+	
 	private String buildLabel(IResource r) {
 		//return r.getName();
 		String n= r.getFullPath().toString();
diff --git a/bundles/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugin.properties
index 37b775cf0..5115f0d58 100644
--- a/bundles/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugin.properties
@@ -88,6 +88,8 @@ ComparePreferencePage.ignoreWhitespace.label= Ignore &white space
 #ComparePreferencePage.useSingleLine.label= Connect ranges with single line
 #ComparePreferencePage.useResolveUI.label= Use new resolve UI
 
+CompareEditorInput.defaultTitle= Compare
+
 #
 # Toolbar actions
 #
@@ -120,7 +122,9 @@ CompareDialog.saveErrorMessage=Can't save
 #
 ResourceCompare.taskName=Operation in Progress...
 ResourceCompare.twoWay.title=Compare ({0}-{1})
+ResourceCompare.twoWay.tooltip={0}-{1}
 ResourceCompare.threeWay.title=Compare ({0}-{1}-{2})
+ResourceCompare.threeWay.tooltip={1}-{2}
 
 #
 # DiffTreeViewer & DiffNodes
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index 77f32e285..eb7d213ed 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -11,7 +11,16 @@
 <h1>
 Eclipse Platform Build Notes<br>
 Compare</h1>
-Eclipse Build Input February 6th 2003
+Eclipse Build Input February ?th 2003 (RC1)
+
+<h2>
+Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=25507">#25507</a>: Compare view prevents Ctrl + F6 working<br>
+
+
+<h1>
+<hr WIDTH="100%"></h1>
+Eclipse Build Input February 6th 2003 (M5 aka RC0)
 
 <h2>
 API Additions</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index ab0f375f8..d7c78916d 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -188,14 +188,14 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	 * see IEditorInput.getToolTipText
 	 */
 	public String getToolTipText() {
-		return fTitle;
+		return getTitle();
 	}
 	
 	/* (non Javadoc)
 	 * see IEditorInput.getName
 	 */
 	public String getName() {
-		return fTitle;
+		return getTitle();
 	}
 			
 	/**
@@ -238,6 +238,8 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 	 * @return the title
 	 */
 	public String getTitle() {
+		if (fTitle == null)
+			return Utilities.getString("CompareEditorInput.defaultTitle"); //$NON-NLS-1$
 		return fTitle;
 	}
 	
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 834c63aa9..af06e6d19 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -897,17 +897,6 @@ public class TextMergeViewer extends ContentMergeViewer  {
 		fAncestor.setEditable(false);
 		
 		fSummaryCanvas= new Label(composite, SWT.NONE);
-		/*
-		new Canvas(composite, SWT.NONE);
-		fSummaryCanvas.addPaintListener(
-			new PaintListener() {
-				public void paintControl(PaintEvent e) {
-					// TODO Auto-generated method stub
-
-				}
-			}
-		);
-		*/
 		updateResolveStatus();
 				
 		// 2nd row
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
index 614790a0d..29108bae8 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/ResourceCompareInput.java
@@ -34,8 +34,7 @@ class ResourceCompareInput extends CompareEditorInput {
 	private IResource fAncestorResource;
 	private IResource fLeftResource;
 	private IResource fRightResource;
-	private DiffTreeViewer fDiffViewer;
-	
+	private DiffTreeViewer fDiffViewer;	
 	
 	class MyDiffNode extends DiffNode {
 		
@@ -206,10 +205,10 @@ class ResourceCompareInput extends CompareEditorInput {
 			if (fThreeWay) {			
 				String format= Utilities.getString("ResourceCompare.threeWay.title"); //$NON-NLS-1$
 				String ancestorLabel= fAncestorResource.getName();
-				title= MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel} );
+				title= MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel});	
 			} else {
 				String format= Utilities.getString("ResourceCompare.twoWay.title"); //$NON-NLS-1$
-				title= MessageFormat.format(format, new String[] {leftLabel, rightLabel} );
+				title= MessageFormat.format(format, new String[] {leftLabel, rightLabel});
 			}
 			setTitle(title);
 			
@@ -229,6 +228,23 @@ class ResourceCompareInput extends CompareEditorInput {
 		}
 	}
 	
+	public String getToolTipText() {
+		if (fLeftResource != null && fRightResource != null) {
+			String leftLabel= fLeftResource.getFullPath().makeRelative().toString();
+			String rightLabel= fRightResource.getFullPath().makeRelative().toString();			
+			if (fThreeWay) {			
+				String format= Utilities.getString("ResourceCompare.threeWay.tooltip"); //$NON-NLS-1$
+				String ancestorLabel= fAncestorResource.getFullPath().makeRelative().toString();
+				return MessageFormat.format(format, new String[] {ancestorLabel, leftLabel, rightLabel});
+			} else {
+				String format= Utilities.getString("ResourceCompare.twoWay.tooltip"); //$NON-NLS-1$
+				return MessageFormat.format(format, new String[] {leftLabel, rightLabel});
+			}
+		}
+		// fall back
+		return super.getToolTipText();
+	}
+	
 	private String buildLabel(IResource r) {
 		//return r.getName();
 		String n= r.getFullPath().toString();
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
index 37b775cf0..5115f0d58 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.properties
@@ -88,6 +88,8 @@ ComparePreferencePage.ignoreWhitespace.label= Ignore &white space
 #ComparePreferencePage.useSingleLine.label= Connect ranges with single line
 #ComparePreferencePage.useResolveUI.label= Use new resolve UI
 
+CompareEditorInput.defaultTitle= Compare
+
 #
 # Toolbar actions
 #
@@ -120,7 +122,9 @@ CompareDialog.saveErrorMessage=Can't save
 #
 ResourceCompare.taskName=Operation in Progress...
 ResourceCompare.twoWay.title=Compare ({0}-{1})
+ResourceCompare.twoWay.tooltip={0}-{1}
 ResourceCompare.threeWay.title=Compare ({0}-{1}-{2})
+ResourceCompare.threeWay.tooltip={1}-{2}
 
 #
 # DiffTreeViewer & DiffNodes