Only in tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/: Activator.java
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingInteractionsTest.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/BindingInteractionsTest.java
2c2
<  * Copyright (c) 2005, 2008 IBM Corporation and others.
---
>  * Copyright (c) 2005, 2011 IBM Corporation and others.
11c11
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingManagerTest.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/BindingManagerTest.java
2c2
<  * Copyright (c) 2005, 2009 IBM Corporation and others.
---
>  * Copyright (c) 2005, 2011 IBM Corporation and others.
11c11
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/BindingPersistenceTest.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/BindingPersistenceTest.java
11c11,13
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
> 
> import java.util.HashMap;
13a16
> import org.eclipse.e4.ui.bindings.EBindingService;
14a18
> import org.eclipse.jface.bindings.Scheme;
15a20
> import org.eclipse.jface.bindings.keys.KeyBinding;
20a26
> import org.eclipse.ui.IWorkbenchCommandConstants;
23a30
> import org.eclipse.ui.internal.keys.BindingService;
35a43,44
> 	private final String EMACS_SCHEME_ID = "org.eclipse.ui.emacsAcceleratorConfiguration";
> 
64,66c73,75
< 		final String emacsSchemeId = "org.eclipse.ui.emacsAcceleratorConfiguration";
< 		assertFalse("The active scheme should be Emacs yet", emacsSchemeId
< 				.equals(bindingService.getActiveScheme().getId()));
---
> 		final String emacsSchemeId = EMACS_SCHEME_ID;
> 		assertFalse("The active scheme should be Emacs yet",
> 				emacsSchemeId.equals(bindingService.getActiveScheme().getId()));
80,81c89,90
< 				assertFalse("The command should not yet be bound", commandId
< 						.equals(actualCommandId));
---
> 				assertFalse("The command should not yet be bound",
> 						commandId.equals(actualCommandId));
91,100c100,107
< 		store
< 				.setValue(
< 						"org.eclipse.ui.commands",
< 						"<?xml version=\"1.0\" encoding=\"UTF-8\"?><org.eclipse.ui.commands><activeKeyConfiguration keyConfigurationId=\""
< 								+ emacsSchemeId
< 								+ "\"/><keyBinding commandId=\""
< 								+ commandId
< 								+ "\" contextId=\"org.eclipse.ui.contexts.window\" keyConfigurationId=\"org.eclipse.ui.defaultAcceleratorConfiguration\" keySequence=\""
< 								+ formalKeySequence
< 								+ "\"/></org.eclipse.ui.commands>");
---
> 		store.setValue(
> 				"org.eclipse.ui.commands",
> 				"<?xml version=\"1.0\" encoding=\"UTF-8\"?><org.eclipse.ui.commands><activeKeyConfiguration keyConfigurationId=\""
> 						+ emacsSchemeId
> 						+ "\"/><keyBinding commandId=\""
> 						+ commandId
> 						+ "\" contextId=\"org.eclipse.ui.contexts.window\" keyConfigurationId=\"org.eclipse.ui.defaultAcceleratorConfiguration\" keySequence=\""
> 						+ formalKeySequence + "\"/></org.eclipse.ui.commands>");
130,131c137,139
< 		ParameterizedCommand about = new ParameterizedCommand(commandService
< 				.getCommand("org.eclipse.ui.help.aboutAction"), null);
---
> 		ParameterizedCommand about = new ParameterizedCommand(
> 				commandService.getCommand("org.eclipse.ui.help.aboutAction"),
> 				null);
151,154c159,164
< 						assertTrue("failure for platform: "
< 								+ binding.getPlatform(), Util.WS_CARBON
< 								.equals(binding.getPlatform())
< 								|| Util.WS_COCOA.equals(binding.getPlatform()));
---
> 						assertTrue(
> 								"failure for platform: "
> 										+ binding.getPlatform(),
> 								Util.WS_CARBON.equals(binding.getPlatform())
> 										|| Util.WS_COCOA.equals(binding
> 												.getPlatform()));
173,174c183,186
< 		ParameterizedCommand addWS = new ParameterizedCommand(commandService
< 				.getCommand("org.eclipse.ui.navigate.addToWorkingSet"), null);
---
> 		ParameterizedCommand addWS = new ParameterizedCommand(
> 				commandService
> 						.getCommand("org.eclipse.ui.navigate.addToWorkingSet"),
> 				null);
199,202c211,216
< 					assertTrue(platform, Util.WS_CARBON.equals(platform)
< 							|| Util.WS_COCOA.equals(platform)
< 							|| Util.WS_GTK.equals(platform)
< 							|| Util.WS_WIN32.equals(platform));
---
> 					assertTrue(
> 							platform,
> 							Util.WS_CARBON.equals(platform)
> 									|| Util.WS_COCOA.equals(platform)
> 									|| Util.WS_GTK.equals(platform)
> 									|| Util.WS_WIN32.equals(platform));
210,216d223
< 
< 		// make sure that the proper contexts are currently active
< 		IContextService contextService = (IContextService) fWorkbench
< 				.getService(IContextService.class);
< 		contextService
< 				.activateContext(IContextService.CONTEXT_ID_DIALOG_AND_WINDOW);
< 		contextService.activateContext(IContextService.CONTEXT_ID_WINDOW);
239,240c246,247
< 				assertEquals(KeySequence.getInstance("M2+8 I"), binding
< 						.getTriggerSequence());
---
> 				assertEquals(KeySequence.getInstance("M2+8 I"),
> 						binding.getTriggerSequence());
265,266c272,273
< 				assertEquals(KeySequence.getInstance("M1+8 E"), binding
< 						.getTriggerSequence());
---
> 				assertEquals(KeySequence.getInstance("M1+8 E"),
> 						binding.getTriggerSequence());
271c278
< 	
---
> 
288,290c295,298
< 				// this will fail on Photon (but Paul thinks we'll never run the test suite on that platform :-)
< 				assertEquals(KeySequence.getInstance("M1+8 Q"), binding
< 						.getTriggerSequence());
---
> 				// this will fail on Photon (but Paul thinks we'll never run the
> 				// test suite on that platform :-)
> 				assertEquals(KeySequence.getInstance("M1+8 Q"),
> 						binding.getTriggerSequence());
298c306,577
< 	/* (non-Javadoc)
---
> 	public void testAboutBinding() throws Exception {
> 		ICommandService commandService = (ICommandService) fWorkbench
> 				.getAdapter(ICommandService.class);
> 		IBindingService bindingService = (IBindingService) fWorkbench
> 				.getAdapter(IBindingService.class);
> 
> 		final Scheme activeScheme = bindingService.getActiveScheme();
> 		final Binding[] originalBindings = bindingService.getBindings();
> 
> 		ParameterizedCommand aboutCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.HELP_ABOUT),
> 				null);
> 		ParameterizedCommand activateEditorCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.WINDOW_ACTIVATE_EDITOR),
> 				null);
> 
> 		final KeySequence keyF12 = KeySequence.getInstance("F12");
> 		final KeySequence keyAltCtrlShiftI = KeySequence
> 				.getInstance("ALT+CTRL+SHIFT+I");
> 		final Binding editorBinding = bindingService.getPerfectMatch(keyF12);
> 		assertNotNull(editorBinding);
> 		assertEquals(activateEditorCmd, editorBinding.getParameterizedCommand());
> 
> 		EBindingService ebs = (EBindingService) fWorkbench
> 				.getService(EBindingService.class);
> 		HashMap<String, String> attrs = new HashMap<String, String>();
> 		attrs.put(EBindingService.TYPE_ATTR_TAG, "user");
> 		final Binding localAboutBinding = ebs.createBinding(keyF12, aboutCmd,
> 				IContextService.CONTEXT_ID_WINDOW, attrs);
> 		assertEquals(Binding.USER, localAboutBinding.getType());
> 
> 		// test unbinding a system binding and adding a user binding (same
> 		// triggers and context)
> 		final Binding[] bindings = originalBindings;
> 		Binding[] added = new Binding[bindings.length + 2];
> 		System.arraycopy(bindings, 0, added, 0, bindings.length);
> 
> 		Binding del = new KeyBinding(keyF12, null,
> 				IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID,
> 				IContextService.CONTEXT_ID_WINDOW, null, null, null,
> 				Binding.USER);
> 		added[bindings.length] = del;
> 		added[bindings.length + 1] = localAboutBinding;
> 		bindingService.savePreferences(activeScheme, added);
> 
> 		// the match should be the user binding that we just added
> 		final Binding secondMatch = bindingService.getPerfectMatch(keyF12);
> 		assertNotNull(secondMatch);
> 		assertEquals(aboutCmd, secondMatch.getParameterizedCommand());
> 
> 		// go back to the defaults
> 		bindingService.savePreferences(activeScheme, originalBindings);
> 		final Binding thirdMatch = bindingService.getPerfectMatch(keyF12);
> 		assertNotNull(thirdMatch);
> 		assertEquals(activateEditorCmd, thirdMatch.getParameterizedCommand());
> 
> 		// try assigning alt-ctrl-shift-i (no other binding uses this for this
> 		// context) to the 'about' command
> 		final Binding localAboutBinding1 = ebs.createBinding(keyAltCtrlShiftI,
> 				aboutCmd, IContextService.CONTEXT_ID_WINDOW, attrs);
> 		assertEquals(Binding.USER, localAboutBinding1.getType());
> 		Binding[] added1 = new Binding[bindings.length + 1];
> 		System.arraycopy(bindings, 0, added1, 0, bindings.length);
> 		added1[bindings.length] = localAboutBinding1;
> 
> 		bindingService.savePreferences(activeScheme, added1);
> 		final Binding fourthMatch = bindingService
> 				.getPerfectMatch(keyAltCtrlShiftI);
> 		assertNotNull(fourthMatch);
> 		assertEquals(aboutCmd, fourthMatch.getParameterizedCommand());
> 	}
> 
> 	public void testAboutBindingIn3x() throws Exception {
> 		ICommandService commandService = (ICommandService) fWorkbench
> 				.getAdapter(ICommandService.class);
> 		IBindingService bindingService = (IBindingService) fWorkbench
> 				.getAdapter(IBindingService.class);
> 
> 		final Scheme activeScheme = bindingService.getActiveScheme();
> 
> 		ParameterizedCommand aboutCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.HELP_ABOUT),
> 				null);
> 		ParameterizedCommand activateEditorCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.WINDOW_ACTIVATE_EDITOR),
> 				null);
> 
> 		final KeySequence keyF12 = KeySequence.getInstance("F12");
> 		final Binding editorBinding = bindingService.getPerfectMatch(keyF12);
> 		assertNotNull(editorBinding);
> 		assertEquals(activateEditorCmd, editorBinding.getParameterizedCommand());
> 
> 		EBindingService ebs = (EBindingService) fWorkbench
> 				.getService(EBindingService.class);
> 		HashMap<String, String> attrs = new HashMap<String, String>();
> 		attrs.put(EBindingService.TYPE_ATTR_TAG, "user");
> 		final Binding localAboutBinding = ebs.createBinding(keyF12, aboutCmd,
> 				IContextService.CONTEXT_ID_WINDOW, attrs);
> 		assertEquals(Binding.USER, localAboutBinding.getType());
> 
> 		final Binding[] bindings = bindingService.getBindings();
> 		Binding[] added = new Binding[bindings.length + 1];
> 		System.arraycopy(bindings, 0, added, 0, bindings.length);
> 
> 		added[bindings.length] = localAboutBinding;
> 		bindingService.savePreferences(activeScheme, added);
> 
> 		final Binding secondMatch = bindingService.getPerfectMatch(keyF12);
> 		// fails
> 		assertNotNull(secondMatch);
> 		assertEquals(aboutCmd, secondMatch.getParameterizedCommand());
> 	}
> 
> 	public void testAboutBindingEmacs() throws Exception {
> 
> 		ICommandService commandService = (ICommandService) fWorkbench
> 				.getAdapter(ICommandService.class);
> 		IBindingService bindingService = (IBindingService) fWorkbench
> 				.getAdapter(IBindingService.class);
> 
> 		final Scheme emacsScheme = bindingService.getScheme(EMACS_SCHEME_ID);
> 		assertNotNull(emacsScheme);
> 		final Binding[] originalBindings = bindingService.getBindings();
> 		bindingService.savePreferences(emacsScheme, originalBindings);
> 
> 		ParameterizedCommand findAndReplaceCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.EDIT_FIND_AND_REPLACE),
> 				null);
> 		ParameterizedCommand aboutCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.HELP_ABOUT),
> 				null);
> 
> 		final KeySequence keyAltR = KeySequence.getInstance("ALT+R");
> 		final KeySequence keyAltCtrlShiftI = KeySequence
> 				.getInstance("ALT+CTRL+SHIFT+I");
> 		final Binding findAndReplaceBinding = bindingService
> 				.getPerfectMatch(keyAltR);
> 
> 		assertNotNull(findAndReplaceBinding);
> 		assertEquals(findAndReplaceCmd,
> 				findAndReplaceBinding.getParameterizedCommand());
> 		assertEquals(EMACS_SCHEME_ID, findAndReplaceBinding.getSchemeId());
> 
> 		EBindingService ebs = (EBindingService) fWorkbench
> 				.getService(EBindingService.class);
> 		HashMap<String, String> attrs = new HashMap<String, String>();
> 		attrs.put(EBindingService.TYPE_ATTR_TAG, "user");
> 		attrs.put(EBindingService.SCHEME_ID_ATTR_TAG, EMACS_SCHEME_ID);
> 		final Binding localAboutBinding = ebs.createBinding(keyAltR, aboutCmd,
> 				IContextService.CONTEXT_ID_WINDOW, attrs);
> 		assertNotNull(localAboutBinding);
> 		assertEquals(Binding.USER, localAboutBinding.getType());
> 		assertEquals(EMACS_SCHEME_ID, localAboutBinding.getSchemeId());
> 
> 		final Binding[] bindings = originalBindings;
> 		Binding[] added = new Binding[bindings.length + 2];
> 		System.arraycopy(bindings, 0, added, 0, bindings.length);
> 
> 		Binding del = new KeyBinding(keyAltR, null, EMACS_SCHEME_ID,
> 				IContextService.CONTEXT_ID_WINDOW, null, null, null,
> 				Binding.USER);
> 		added[bindings.length] = del;
> 		added[bindings.length + 1] = localAboutBinding;
> 		bindingService.savePreferences(emacsScheme, added);
> 
> 		// the match should be the user binding that we just added
> 		final Binding secondMatch = bindingService.getPerfectMatch(keyAltR);
> 		assertNotNull(secondMatch);
> 		assertEquals(aboutCmd, secondMatch.getParameterizedCommand());
> 
> 		// go back to the defaults
> 		bindingService.savePreferences(emacsScheme, originalBindings);
> 		final Binding thirdMatch = bindingService.getPerfectMatch(keyAltR);
> 		assertNotNull(thirdMatch);
> 		assertEquals(findAndReplaceCmd, thirdMatch.getParameterizedCommand());
> 
> 		// try assigning alt-ctrl-shift-i (no other binding uses this for this
> 		// context) to the 'about' command
> 		final Binding localAboutBinding1 = ebs.createBinding(keyAltCtrlShiftI,
> 				aboutCmd, IContextService.CONTEXT_ID_WINDOW, attrs);
> 		assertNotNull(localAboutBinding1);
> 		assertEquals(Binding.USER, localAboutBinding1.getType());
> 		assertEquals(EMACS_SCHEME_ID, localAboutBinding.getSchemeId());
> 
> 		Binding[] added1 = new Binding[bindings.length + 1];
> 		System.arraycopy(bindings, 0, added1, 0, bindings.length);
> 		added1[bindings.length] = localAboutBinding1;
> 
> 		bindingService.savePreferences(emacsScheme, added1);
> 		final Binding fourthMatch = bindingService
> 				.getPerfectMatch(keyAltCtrlShiftI);
> 		assertNotNull(fourthMatch);
> 		assertEquals(aboutCmd, fourthMatch.getParameterizedCommand());
> 		assertEquals(EMACS_SCHEME_ID, fourthMatch.getSchemeId());
> 	}
> 
> 	// the 'paste' key binding overrides the 'redo' key binding on Windows
> 	// platforms
> 	public void testPasteAndRedoBindingEmacs() throws Exception {
> 		ICommandService commandService = (ICommandService) fWorkbench
> 				.getAdapter(ICommandService.class);
> 		IBindingService bindingService = (IBindingService) fWorkbench
> 				.getAdapter(IBindingService.class);
> 
> 		final Scheme emacsScheme = bindingService.getScheme(EMACS_SCHEME_ID);
> 		assertNotNull(emacsScheme);
> 		final Scheme defaultScheme = bindingService
> 				.getScheme(IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID);
> 		assertNotNull(defaultScheme);
> 
> 		final Binding[] originalBindings = bindingService.getBindings();
> 		bindingService.savePreferences(emacsScheme, originalBindings);
> 
> 		ParameterizedCommand pasteCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.EDIT_PASTE),
> 				null);
> 		ParameterizedCommand redoCmd = new ParameterizedCommand(
> 				commandService.getCommand(IWorkbenchCommandConstants.EDIT_REDO),
> 				null);
> 
> 		final KeySequence keyCtrlY = KeySequence.getInstance("CTRL+Y");
> 
> 		final Binding pasteBinding = bindingService.getPerfectMatch(keyCtrlY);
> 		assertNotNull(pasteBinding);
> 		assertEquals(pasteCmd, pasteBinding.getParameterizedCommand());
> 		assertEquals(EMACS_SCHEME_ID, pasteBinding.getSchemeId());
> 
> 		// reset the scheme
> 		bindingService.savePreferences(defaultScheme, originalBindings);
> 		final Binding redoBinding = bindingService.getPerfectMatch(keyCtrlY);
> 		assertNotNull(redoBinding);
> 		assertEquals(redoCmd, redoBinding.getParameterizedCommand());
> 		assertEquals(IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID,
> 				redoBinding.getSchemeId());
> 	}
> 
> 	// the 'paste' key binding overrides the 'redo' key binding and can be
> 	// put back
> 	public void testPasteBindingEmacs() throws Exception {
> 		ICommandService commandService = (ICommandService) fWorkbench
> 				.getAdapter(ICommandService.class);
> 		IBindingService bindingService = (IBindingService) fWorkbench
> 				.getAdapter(IBindingService.class);
> 
> 		final Scheme emacsScheme = bindingService.getScheme(EMACS_SCHEME_ID);
> 		assertNotNull(emacsScheme);
> 		final Binding[] originalBindings = bindingService.getBindings();
> 		bindingService.savePreferences(emacsScheme, originalBindings);
> 
> 		ParameterizedCommand pasteCmd = new ParameterizedCommand(
> 				commandService
> 						.getCommand(IWorkbenchCommandConstants.EDIT_PASTE),
> 				null);
> 
> 		final KeySequence keyCtrlY = KeySequence.getInstance("CTRL+Y");
> 
> 		final Binding pasteBinding = bindingService.getPerfectMatch(keyCtrlY);
> 		assertNotNull(pasteBinding);
> 		assertEquals(pasteCmd, pasteBinding.getParameterizedCommand());
> 		assertEquals(EMACS_SCHEME_ID, pasteBinding.getSchemeId());
> 	}
> 
> 	/*
> 	 * (non-Javadoc)
> 	 * 
304,309c583,596
< 		store
< 				.setValue(
< 						"org.eclipse.ui.commands",
< 						"<?xml version=\"1.0\" encoding=\"UTF-8\"?><org.eclipse.ui.commands><activeKeyConfiguration keyConfigurationId=\""
< 								+ IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID
< 								+ "\"/></org.eclipse.ui.commands>");
---
> 		store.setValue(
> 				"org.eclipse.ui.commands",
> 				"<?xml version=\"1.0\" encoding=\"UTF-8\"?><org.eclipse.ui.commands><activeKeyConfiguration keyConfigurationId=\""
> 						+ IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID
> 						+ "\"/></org.eclipse.ui.commands>");
> 		IBindingService bindingService = (IBindingService) fWorkbench
> 				.getAdapter(IBindingService.class);
> 
> 		// reset keybindings
> 		bindingService.readRegistryAndPreferences(null);
> 		final Scheme activeScheme = bindingService
> 				.getScheme(IBindingService.DEFAULT_DEFAULT_ACTIVE_SCHEME_ID);
> 		final Binding[] originalBindings = bindingService.getBindings();
> 		bindingService.savePreferences(activeScheme, originalBindings);
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug189167Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug189167Test.java
2c2
<  * Copyright (c) 2007, 2008 IBM Corporation and others.
---
>  * Copyright (c) 2007, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug36420Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug36420Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug36537Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug36537Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug40023Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug40023Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug42024Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug42024Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug42035Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug42035Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug42627Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug42627Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug43168Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug43168Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug43321Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug43321Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug43538Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug43538Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug43597Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug43597Test.java
2c2
<  * Copyright (c) 2000, 2009 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug43610Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug43610Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug43800Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug43800Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug44460Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug44460Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/Bug53489Test.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/Bug53489Test.java
2c2
<  * Copyright (c) 2000, 2006 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/KeysCsvTest.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/KeysCsvTest.java
2c2
<  * Copyright (c) 2006 IBM Corporation and others.
---
>  * Copyright (c) 2006, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/KeysPreferenceModelTest.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/KeysPreferenceModelTest.java
2c2
<  * Copyright (c) 2007, 2009 IBM Corporation and others.
---
>  * Copyright (c) 2007, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/KeysTestSuite.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/KeysTestSuite.java
2c2
<  * Copyright (c) 2000, 2009 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
11c11
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/PreferenceMutator.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/PreferenceMutator.java
2c2
<  * Copyright (c) 2000, 2005 IBM Corporation and others.
---
>  * Copyright (c) 2000, 2011 IBM Corporation and others.
12c12
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
diff tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/keys/TestBinding.java tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/TestBinding.java
2c2
<  * Copyright (c) 2005 IBM Corporation and others.
---
>  * Copyright (c) 2005, 2011 IBM Corporation and others.
11c11
< package org.eclipse.ui.tests.keys;
---
> package org.eclipse.e4.ui.keybinding.tests;
Only in tests/org.eclipse.e4.ui.keybinding.tests/src/org/eclipse/e4/ui/keybinding/tests/: XXX.txt