#8004: Ctrl+E beeps every time

18 files changed, 136 insertions, 82 deletions

diff --git a/bundles/org.eclipse.compare/.classpath b/bundles/org.eclipse.compare/.classpath
index d8b8ad011..1e3546d6b 100644
--- a/bundles/org.eclipse.compare/.classpath
+++ b/bundles/org.eclipse.compare/.classpath
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="compare"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry exported="true" kind="lib" path="compare.jar"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+    <classpathentry kind="src" path="compare"/>

+    <classpathentry kind="src" path="/org.eclipse.core.boot"/>

+    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>

+    <classpathentry kind="src" path="/org.eclipse.ui"/>

+    <classpathentry kind="src" path="/org.eclipse.core.resources"/>

+    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>

+    <classpathentry kind="src" path="/org.eclipse.swt"/>

+    <classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/bundles/org.eclipse.compare/compare.jar b/bundles/org.eclipse.compare/compare.jar
deleted file mode 100644
index 83bc3a22e..000000000
--- a/bundles/org.eclipse.compare/compare.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
index 91c0435e4..1d99df3d7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
@@ -59,8 +59,6 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane
 		

 		setViewer(new NullViewer(this));

 		

-		CompareNavigator.hookNavigation(this);

-

 		addDisposeListener(

 			new DisposeListener() {

 				public void widgetDisposed(DisposeEvent e) {

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 579be43cd..de00ff6d2 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
@@ -1005,7 +1005,6 @@ public class TextMergeViewer extends ContentMergeViewer  {
 					paintCenter(this, gc);

 				}

 			};

-			CompareNavigator.hookNavigation(canvas);

 			new Resizer(canvas, HORIZONTAL);

 			return canvas;

 		}

@@ -1044,7 +1043,6 @@ public class TextMergeViewer extends ContentMergeViewer  {
 			new KeyAdapter() {

 				public void keyPressed(KeyEvent e) {

 					handleSelectionChanged(part);

-					CompareNavigator.handleNavigationKeys(e);

 				}

 			}

 		);

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
index 390adc167..c1ff3bda9 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
@@ -38,7 +38,6 @@ public class BinaryCompareViewer extends AbstractViewer {
 		fControl= new Text(parent, SWT.NONE);

 		fControl.setEditable(false);

 		fControl.setData(CompareUI.COMPARE_VIEWER_TITLE, Utilities.getString(fBundle, "title")); //$NON-NLS-1$

-		CompareNavigator.hookNavigation(fControl);

 		

 		fLeftIsLocal= Utilities.getBoolean(cc, "LEFT_IS_LOCAL", false); //$NON-NLS-1$

 	}

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
index 3fe72b1ff..5ed4e2309 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
@@ -39,6 +39,12 @@ public class CompareEditorContributor extends EditorActionBarContributor {
 		tbm.add(fPrevious);

 	}

 	

+	/*

+	 * @see EditorActionBarContributor#contributeToMenu(IMenuManager)

+	 */

+	public void contributeToMenu(IMenuManager menuManager) {

+	}

+

 	public void setActiveEditor(IEditorPart targetEditor) {

 				

 		if (fActiveEditorPart == targetEditor)

@@ -56,11 +62,16 @@ public class CompareEditorContributor extends EditorActionBarContributor {
 		}

 			

 		if (targetEditor instanceof CompareEditor) {

+			IActionBars actionBars= getActionBars();

+		

 			CompareEditor editor= (CompareEditor) targetEditor;

-			editor.setActionBars(getActionBars());

+			editor.setActionBars(actionBars);

 		

+			actionBars.setGlobalActionHandler(IWorkbenchActionConstants.NEXT, fNext);

+			actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PREVIOUS, fPrevious);

+

 			CompareConfiguration cc= editor.getCompareConfiguration();

 			fIgnoreWhitespace.setCompareConfiguration(cc);

-		}

+		}		

 	}

 }

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
index a977359e3..6255c805a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
@@ -93,26 +93,6 @@ public class CompareNavigator {
 		return null;

 	}

 	

-	public static void hookNavigation(final Control c) {

-		c.addKeyListener(

-			new KeyAdapter() {

-				public void keyPressed(KeyEvent e) {

-					handleNavigationKeys(e);

-				}

-			}

-		);

-	}

-	

-	public static void handleNavigationKeys(KeyEvent e) {

-		if (e.character == ('E'-0x40)) {

-			if (e.widget instanceof Control) {

-				CompareNavigator nav= findNavigator((Control)e.widget);

-				if (nav != null)

-					nav.selectChange((e.stateMask & SWT.SHIFT) == 0);

-			}

-		}

-	}

-	

 	private static CompareNavigator findNavigator(Control c) {

 		while (c != null && !c.isDisposed()) {	// PR 1GEUVV2

 			Object data= c.getData();

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 2a179b3f7..696ec246a 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -321,4 +321,48 @@ public class Utilities {
 		return dfltValue;

 	}

 

+	/**

+	 * Answers <code>true</code> if the given selection contains resources that don't

+	 * have overlapping paths and <code>false</code> otherwise. 

+	 */

+	/*

+	public static boolean isSelectionNonOverlapping() throws TeamException {

+		IResource[] resources = getSelectedResources();

+		// allow operation for non-overlapping resource selections

+		if(resources.length>0) {

+			List validPaths = new ArrayList(2);

+			for (int i = 0; i < resources.length; i++) {

+				IResource resource = resources[i];

+				

+				// only allow cvs resources to be selected

+				if(RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()) == null) {

+					return false;

+				}

+				

+				// check if this resource overlaps other selections		

+				IPath resourceFullPath = resource.getFullPath();

+				if(!validPaths.isEmpty()) {

+					for (Iterator it = validPaths.iterator(); it.hasNext();) {

+						IPath path = (IPath) it.next();

+						if(path.isPrefixOf(resourceFullPath) || 

+					       resourceFullPath.isPrefixOf(path)) {

+							return false;

+						}

+					}

+				}

+				validPaths.add(resourceFullPath);

+				

+				// ensure that resources are managed

+				ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);

+				if(cvsResource.isFolder()) {

+					if( ! ((ICVSFolder)cvsResource).isCVSFolder()) return false;

+				} else {

+					if( ! cvsResource.isManaged()) return false;

+				}

+			}

+			return true;

+		}

+		return false;

+	}

+	*/

 }

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 6dd2c2b67..d4df57abb 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -173,8 +173,6 @@ public class DiffTreeViewer extends TreeViewer {
 		

 		Control tree= getControl();

 		

-		CompareNavigator.hookNavigation(tree);

-

 		INavigatable nav= new INavigatable() {

 			public boolean gotoDifference(boolean next) {

 				return internalNavigate(next);

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath
index d8b8ad011..1e3546d6b 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/.classpath
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="src" path="compare"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.ui"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry exported="true" kind="lib" path="compare.jar"/>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.swt"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+    <classpathentry kind="src" path="compare"/>

+    <classpathentry kind="src" path="/org.eclipse.core.boot"/>

+    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>

+    <classpathentry kind="src" path="/org.eclipse.ui"/>

+    <classpathentry kind="src" path="/org.eclipse.core.resources"/>

+    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>

+    <classpathentry kind="src" path="/org.eclipse.swt"/>

+    <classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare.jar b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare.jar
deleted file mode 100644
index 83bc3a22e..000000000
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare.jar
+++ /dev/null
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
index 91c0435e4..1d99df3d7 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerSwitchingPane.java
@@ -59,8 +59,6 @@ public abstract class CompareViewerSwitchingPane extends CompareViewerPane
 		

 		setViewer(new NullViewer(this));

 		

-		CompareNavigator.hookNavigation(this);

-

 		addDisposeListener(

 			new DisposeListener() {

 				public void widgetDisposed(DisposeEvent e) {

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 579be43cd..de00ff6d2 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
@@ -1005,7 +1005,6 @@ public class TextMergeViewer extends ContentMergeViewer  {
 					paintCenter(this, gc);

 				}

 			};

-			CompareNavigator.hookNavigation(canvas);

 			new Resizer(canvas, HORIZONTAL);

 			return canvas;

 		}

@@ -1044,7 +1043,6 @@ public class TextMergeViewer extends ContentMergeViewer  {
 			new KeyAdapter() {

 				public void keyPressed(KeyEvent e) {

 					handleSelectionChanged(part);

-					CompareNavigator.handleNavigationKeys(e);

 				}

 			}

 		);

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
index 390adc167..c1ff3bda9 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/BinaryCompareViewer.java
@@ -38,7 +38,6 @@ public class BinaryCompareViewer extends AbstractViewer {
 		fControl= new Text(parent, SWT.NONE);

 		fControl.setEditable(false);

 		fControl.setData(CompareUI.COMPARE_VIEWER_TITLE, Utilities.getString(fBundle, "title")); //$NON-NLS-1$

-		CompareNavigator.hookNavigation(fControl);

 		

 		fLeftIsLocal= Utilities.getBoolean(cc, "LEFT_IS_LOCAL", false); //$NON-NLS-1$

 	}

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
index 3fe72b1ff..5ed4e2309 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java
@@ -39,6 +39,12 @@ public class CompareEditorContributor extends EditorActionBarContributor {
 		tbm.add(fPrevious);

 	}

 	

+	/*

+	 * @see EditorActionBarContributor#contributeToMenu(IMenuManager)

+	 */

+	public void contributeToMenu(IMenuManager menuManager) {

+	}

+

 	public void setActiveEditor(IEditorPart targetEditor) {

 				

 		if (fActiveEditorPart == targetEditor)

@@ -56,11 +62,16 @@ public class CompareEditorContributor extends EditorActionBarContributor {
 		}

 			

 		if (targetEditor instanceof CompareEditor) {

+			IActionBars actionBars= getActionBars();

+		

 			CompareEditor editor= (CompareEditor) targetEditor;

-			editor.setActionBars(getActionBars());

+			editor.setActionBars(actionBars);

 		

+			actionBars.setGlobalActionHandler(IWorkbenchActionConstants.NEXT, fNext);

+			actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PREVIOUS, fPrevious);

+

 			CompareConfiguration cc= editor.getCompareConfiguration();

 			fIgnoreWhitespace.setCompareConfiguration(cc);

-		}

+		}		

 	}

 }

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
index a977359e3..6255c805a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareNavigator.java
@@ -93,26 +93,6 @@ public class CompareNavigator {
 		return null;

 	}

 	

-	public static void hookNavigation(final Control c) {

-		c.addKeyListener(

-			new KeyAdapter() {

-				public void keyPressed(KeyEvent e) {

-					handleNavigationKeys(e);

-				}

-			}

-		);

-	}

-	

-	public static void handleNavigationKeys(KeyEvent e) {

-		if (e.character == ('E'-0x40)) {

-			if (e.widget instanceof Control) {

-				CompareNavigator nav= findNavigator((Control)e.widget);

-				if (nav != null)

-					nav.selectChange((e.stateMask & SWT.SHIFT) == 0);

-			}

-		}

-	}

-	

 	private static CompareNavigator findNavigator(Control c) {

 		while (c != null && !c.isDisposed()) {	// PR 1GEUVV2

 			Object data= c.getData();

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 2a179b3f7..696ec246a 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -321,4 +321,48 @@ public class Utilities {
 		return dfltValue;

 	}

 

+	/**

+	 * Answers <code>true</code> if the given selection contains resources that don't

+	 * have overlapping paths and <code>false</code> otherwise. 

+	 */

+	/*

+	public static boolean isSelectionNonOverlapping() throws TeamException {

+		IResource[] resources = getSelectedResources();

+		// allow operation for non-overlapping resource selections

+		if(resources.length>0) {

+			List validPaths = new ArrayList(2);

+			for (int i = 0; i < resources.length; i++) {

+				IResource resource = resources[i];

+				

+				// only allow cvs resources to be selected

+				if(RepositoryProvider.getProvider(resource.getProject(), CVSProviderPlugin.getTypeId()) == null) {

+					return false;

+				}

+				

+				// check if this resource overlaps other selections		

+				IPath resourceFullPath = resource.getFullPath();

+				if(!validPaths.isEmpty()) {

+					for (Iterator it = validPaths.iterator(); it.hasNext();) {

+						IPath path = (IPath) it.next();

+						if(path.isPrefixOf(resourceFullPath) || 

+					       resourceFullPath.isPrefixOf(path)) {

+							return false;

+						}

+					}

+				}

+				validPaths.add(resourceFullPath);

+				

+				// ensure that resources are managed

+				ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);

+				if(cvsResource.isFolder()) {

+					if( ! ((ICVSFolder)cvsResource).isCVSFolder()) return false;

+				} else {

+					if( ! cvsResource.isManaged()) return false;

+				}

+			}

+			return true;

+		}

+		return false;

+	}

+	*/

 }

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
index 6dd2c2b67..d4df57abb 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/DiffTreeViewer.java
@@ -173,8 +173,6 @@ public class DiffTreeViewer extends TreeViewer {
 		

 		Control tree= getControl();

 		

-		CompareNavigator.hookNavigation(tree);

-

 		INavigatable nav= new INavigatable() {

 			public boolean gotoDifference(boolean next) {

 				return internalNavigate(next);