#34732, #34696, Reviewed by Dirk Baeumer

1 files changed, 108 insertions, 58 deletions

diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml
index 49826ac70..c296e1714 100644
--- a/bundles/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugin.xml
@@ -86,74 +86,130 @@
 		</page>	
 	</extension>
 
-	<extension point="org.eclipse.ui.actionDefinitions">
-		<actionDefinition
-			id="org.eclipse.compare.compareWithEachOther"
-			name= "%ActionDefinition.compareWithEachOther.name"
-			description="%ActionDefinition.compareWithEachOther.description"
+	<!-- commands and their bindings -->   
+	<extension point="org.eclipse.ui.commands">
+	
+		<category
+			name="%compareCategory.name"
+			description="%compareCategory.description"
+			id="org.eclipse.compare.ui.category.compare"
 		/>
-		<actionDefinition
-			id="org.eclipse.compare.compareWithPatch"
-			name= "%ActionDefinition.compareWithPatch.name"
-			description="%ActionDefinition.compareWithPatch.description"
+
+		<command
+			category="org.eclipse.compare.ui.category.compare"
+			id="org.eclipse.compare.copyRightToLeft"
+			name= "%Command.copyRightToLeft.name"
+			description="%Command.copyRightToLeft.description"
 		/>
-		<actionDefinition
-			id="org.eclipse.compare.replaceFromHistory"
-			name= "%ActionDefinition.replaceFromHistory.name"
-			description="%ActionDefinition.replaceFromHistory.description"
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyRightToLeft"
+			configuration="org.eclipse.ui.defaultAcceleratorConfiguration"
 		/>
-		<actionDefinition
-			id="org.eclipse.compare.replaceWithPreviousFromHistory"
-			name= "%ActionDefinition.replaceWithPreviousFromHistory.name"
-			description="%ActionDefinition.replaceWithPreviousFromHistory.description"
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyRightToLeft"
+			configuration="org.eclipse.ui.emacsAcceleratorConfiguration"
 		/>
-		<actionDefinition
-			id="org.eclipse.compare.compareWithHistory"
-			name= "%ActionDefinition.compareWithHistory.name"
-			description="%ActionDefinition.compareWithHistory.description"
+		
+ 		<command
+			category="org.eclipse.compare.ui.category.compare"
+			id="org.eclipse.compare.copyLeftToRight"
+			name= "%Command.copyLeftToRight.name"
+			description="%Command.copyLeftToRight.description"
 		/>
-		<actionDefinition
-			id="org.eclipse.compare.addFromHistory"
-			name= "%ActionDefinition.addFromHistory.name"
-			description="%ActionDefinition.addFromHistory.description"
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyLeftToRight"
+			configuration="org.eclipse.ui.defaultAcceleratorConfiguration"
 		/>
-				
-		<actionDefinition
-			id="org.eclipse.compare.copyRightToLeft"
-			name= "%ActionDefinition.copyRightToLeft.name"
-			description="%ActionDefinition.copyRightToLeft.description"
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyLeftToRight"
+			configuration="org.eclipse.ui.emacsAcceleratorConfiguration"
 		/>
-		<actionDefinition
-			id="org.eclipse.compare.copyLeftToRight"
-			name= "%ActionDefinition.copyLeftToRight.name"
-			description="%ActionDefinition.copyLeftToRight.description"
-		/>
-		<actionDefinition
+
+		<command
+			category="org.eclipse.compare.ui.category.compare"
 			id="org.eclipse.compare.copyAllRightToLeft"
-			name= "%ActionDefinition.copyAllRightToLeft.name"
-			description="%ActionDefinition.copyAllRightToLeft.description"
+			name= "%Command.copyAllRightToLeft.name"
+			description="%Command.copyAllRightToLeft.description"
+		/>
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyAllRightToLeft"
+			configuration="org.eclipse.ui.defaultAcceleratorConfiguration"
 		/>
-		<actionDefinition
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyAllRightToLeft"
+			configuration="org.eclipse.ui.emacsAcceleratorConfiguration"
+		/>
+
+		<command
+			category="org.eclipse.compare.ui.category.compare"
 			id="org.eclipse.compare.copyAllLeftToRight"
-			name= "%ActionDefinition.copyAllLeftToRight.name"
-			description="%ActionDefinition.copyAllLeftToRight.description"
+			name= "%Command.copyAllLeftToRight.name"
+			description="%Command.copyAllLeftToRight.description"
+		/>
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyAllLeftToRight"
+			configuration="org.eclipse.ui.defaultAcceleratorConfiguration"
 		/>
-		<actionDefinition
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.copyAllLeftToRight"
+			configuration="org.eclipse.ui.emacsAcceleratorConfiguration"
+		/>
+
+		<command
+			category="org.eclipse.compare.ui.category.compare"
 			id="org.eclipse.compare.selectNextChange"
-			name= "%ActionDefinition.selectNextChange.name"
-			description="%ActionDefinition.selectNextChange.description"
+			name= "%Command.selectNextChange.name"
+			description="%Command.selectNextChange.description"
 		/>
-		<actionDefinition
-			id="org.eclipse.compare.selectPreviousChange"
-			name= "%ActionDefinition.selectPreviousChange.name"
-			description="%ActionDefinition.selectPreviousChange.description"
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.selectNextChange"
+			configuration="org.eclipse.ui.defaultAcceleratorConfiguration"
+		/>
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.selectNextChange"
+			configuration="org.eclipse.ui.emacsAcceleratorConfiguration"
 		/>
 		
-		selectNextChange
-		
-		
-	</extension>
+		<command
+			category="org.eclipse.compare.ui.category.compare"
+			id="org.eclipse.compare.selectPreviousChange"
+			name= "%Command.selectPreviousChange.name"
+			description="%Command.selectPreviousChange.description"
+		/>
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.selectPreviousChange"
+			configuration="org.eclipse.ui.defaultAcceleratorConfiguration"
+		/>
+		<keyBinding
+			string=""
+			scope="org.eclipse.ui.globalScope"
+			command="org.eclipse.compare.selectPreviousChange"
+			configuration="org.eclipse.ui.emacsAcceleratorConfiguration"
+		/>
 
+	</extension>
 
 	<extension point="org.eclipse.ui.popupMenus">
 	
@@ -180,7 +236,6 @@
 			</menu>
 			<action
 				id="compareWithEachOther"
-				definitionId="org.eclipse.compare.compareWithEachOther"
 				label="%CompareWithEachOtherAction.label"
 				tooltip="%CompareWithEachOtherAction.tooltip"
 				menubarPath="compareWithMenu/compareWithGroup"
@@ -189,7 +244,6 @@
 			</action>
 			<action
 				id="compareWithPatch"
-				definitionId="org.eclipse.compare.compareWithPatch"
 				label="%CompareWithPatchAction.label"
 				tooltip="%CompareWithPatchAction.tooltip"
 				menubarPath="team.main/group1"
@@ -210,7 +264,6 @@
 			</menu>
 			<action
 				id="replaceFromHistory"
-				definitionId="org.eclipse.compare.replaceFromHistory"
 				label="%ReplaceFromHistoryAction.label"
 				tooltip="%ReplaceFromHistoryAction.tooltip"
 				menubarPath="replaceWithMenu/replaceWithGroup"
@@ -219,7 +272,6 @@
 			</action>
 			<action
 				id="replaceWithPreviousFromHistory"
-				definitionId="org.eclipse.compare.replaceWithPreviousFromHistory"
 				label="%ReplaceWithPreviousFromHistoryAction.label"
 				tooltip="%ReplaceWithPreviousFromHistoryAction.tooltip"
 				menubarPath="replaceWithMenu/replaceWithGroup"
@@ -239,7 +291,6 @@
 			</menu>
 			<action
 				id="compareWithHistory"
-				definitionId="org.eclipse.compare.compareWithHistory"
 				label="%CompareWithHistoryAction.label"
 				tooltip="%CompareWithHistoryAction.tooltip"
 				menubarPath="compareWithMenu/compareWithGroup"
@@ -253,7 +304,6 @@
 			objectClass="org.eclipse.core.resources.IContainer" adaptable="true">
 			<action
 				id="addFromHistoryAction"
-				definitionId="org.eclipse.compare.addFromHistory"
 				label="%addFromHistoryAction.label"
 				tooltip="%addFromHistoryAction.tooltip"
 				menubarPath="replaceWithMenu"