Attachment 66386 Details for Bug 185150 – Show conflict v03

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Show conflict v03

keyConflict-v03.txt (text/plain), 7.11 KB, created by Paul Webster

on 2007-05-08 19:41:56 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Webster

Created: 2007-05-08 19:41:56 EDT

Size: 7.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java,v
>retrieving revision 1.59
>diff -u -r1.59 NewKeysPreferencePage.java
>--- Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java	8 May 2007 19:02:46 -0000	1.59
>+++ Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.java	8 May 2007 23:40:53 -0000
>@@ -133,14 +133,14 @@
>  * </p>
>  * <p>
>  * This preference page has four general types of methods. Create methods are
>- * called when the page is first made visisble. They are responsible for
>- * creating all of the widgets, and laying them out within the preference page.
>- * Fill methods populate the contents of the widgets that contain collections of
>- * data from which items can be selected. The select methods respond to
>- * selection events from the user, such as a button press or a table selection.
>- * The update methods update the contents of various widgets based on the
>- * current state of the user interface. For example, the command name label will
>- * always try to match the current select in the binding table.
>+ * called when the page is first made visible. They are responsible for creating
>+ * all of the widgets, and laying them out within the preference page. Fill
>+ * methods populate the contents of the widgets that contain collections of data
>+ * from which items can be selected. The select methods respond to selection
>+ * events from the user, such as a button press or a table selection. The update
>+ * methods update the contents of various widgets based on the current state of
>+ * the user interface. For example, the command name label will always try to
>+ * match the current select in the binding table.
>  * </p>
>  * 
>  * @since 3.2
>@@ -603,6 +603,23 @@
> 			return null;
> 		}
> 
>+		private boolean checkConflict(Binding binding) {
>+			Collection matches = (Collection) localChangeManager
>+					.getActiveBindingsDisregardingContext().get(
>+							binding.getTriggerSequence());
>+			if (matches != null) {
>+				Iterator i = matches.iterator();
>+				while (i.hasNext()) {
>+					Binding b = (Binding) i.next();
>+					if (binding != b
>+							&& b.getContextId().equals(binding.getContextId())) {
>+						return true;
>+					}
>+				}
>+			}
>+			return false;
>+		}
>+
> 		public final String getColumnText(final Object element,
> 				final int columnIndex) {
> 			final Object value = element;
>@@ -617,6 +634,9 @@
> 						return NewKeysPreferenceMessages.Undefined_Command;
> 					}
> 				case COLUMN_TRIGGER_SEQUENCE:
>+					if (checkConflict(binding)) {
>+						return "*" + binding.getTriggerSequence().format(); //$NON-NLS-1$
>+					}
> 					return binding.getTriggerSequence().format();
> 
> 				case COLUMN_WHEN:
>@@ -701,6 +721,7 @@
> 			for (int i = 1; i < COLUMN_USER; i++) {
> 				String text = getColumnText(element, i);
> 				if (text != null) {
>+					buf.append(' ');
> 					buf.append(text);
> 				}
> 			}
>@@ -1038,8 +1059,35 @@
> 
> 		// update the model
> 		bindingModel.remove(binding);
>+		updateConflicts(binding);
> 		bindingAdd(binding);
> 	}
>+	
>+	private final void updateConflicts(final Collection bindings) {
>+		Iterator i = bindings.iterator();
>+		while (i.hasNext()) {
>+			final Binding b = (Binding) i.next();
>+			if (b.getParameterizedCommand()!=null) {
>+				updateConflicts(b);
>+			}
>+		}
>+	}
>+
>+	private final void updateConflicts(final Binding binding) {
>+		Collection matches = (Collection) localChangeManager
>+				.getActiveBindingsDisregardingContext().get(
>+						binding.getTriggerSequence());
>+		if (matches != null) {
>+			Iterator i = matches.iterator();
>+			while (i.hasNext()) {
>+				Binding b = (Binding) i.next();
>+				if (binding != b
>+						&& b.getContextId().equals(binding.getContextId())) {
>+					filteredTree.getViewer().update(b, null);
>+				}
>+			}
>+		}
>+	}
> 
> 	private final void bindingRestore(final KeyBinding binding) {
> 		final ParameterizedCommand cmd = binding.getParameterizedCommand();
>@@ -1112,6 +1160,8 @@
> 
> 		bindingModel.addAll(addSystemAll);
> 		bindingModel.removeAll(removeUser);
>+		updateConflicts(addSystemAll);
>+		updateConflicts(removeUser);
> 		if (addSystemAll.isEmpty()) {
> 			commandModel.add(cmd);
> 			filteredTree.getViewer().setSelection(new StructuredSelection(cmd),
>@@ -1420,6 +1470,14 @@
> 				}
> 			}
> 		});
>+		
>+		final Label asterisk = new Label(leftDataArea, SWT.NONE);
>+		asterisk.setText(NewKeysPreferenceMessages.Asterisk_Text);
>+		gridData = new GridData();
>+		gridData.grabExcessHorizontalSpace = true;
>+		gridData.horizontalSpan = 2;
>+		gridData.horizontalAlignment = SWT.FILL;
>+		asterisk.setLayoutData(gridData);
> 
> 		// RIGHT DATA AREA
> 		// Creates the right data area.
>@@ -1870,6 +1928,8 @@
> 						// update the model
> 						bindingModel.remove(keyBinding);
> 						bindingModel.add(binding);
>+						updateConflicts(keyBinding);
>+						updateConflicts(binding);
> 						// end update the model
> 						update();
> 						filteredTree.getViewer().setSelection(
>@@ -1886,6 +1946,7 @@
> 					// end update the model
> 					bindingModel.add(binding);
> 					commandModel.remove(object);
>+					updateConflicts(binding);
> 					update();
> 
> 					filteredTree.getViewer().setSelection(
>@@ -2371,6 +2432,8 @@
> 						// update the model
> 						bindingModel.remove(keyBinding);
> 						bindingModel.add(binding);
>+						updateConflicts(keyBinding);
>+						updateConflicts(binding);
> 						// end update the model
> 						update();
> 						filteredTree.getViewer().setSelection(
>Index: Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java,v
>retrieving revision 1.10
>diff -u -r1.10 NewKeysPreferenceMessages.java
>--- Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java	1 May 2007 02:22:52 -0000	1.10
>+++ Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferenceMessages.java	8 May 2007 23:40:52 -0000
>@@ -39,6 +39,7 @@
> 	public static String TriggerSequenceColumn_Text;
> 	public static String WhenColumn_Text;
> 	public static String WhenLabel_Text;
>+	public static String Asterisk_Text;
> 	
> 	public static String GroupingCombo_Label;
> 	public static String GroupingCombo_Category_Text;
>Index: Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties,v
>retrieving revision 1.18
>diff -u -r1.18 NewKeysPreferencePage.properties
>--- Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties	2 May 2007 00:22:09 -0000	1.18
>+++ Eclipse UI/org/eclipse/ui/internal/keys/NewKeysPreferencePage.properties	8 May 2007 23:40:53 -0000
>@@ -25,6 +25,7 @@
> TriggerSequenceColumn_Text = Binding
> WhenLabel_Text = &When:
> WhenColumn_Text = When
>+Asterisk_Text = * in the binding column denotes a key conflict
> 
> GroupingCombo_Label = Group By: 
> GroupingCombo_Category_Text = Category

Actions: View | Diff

Attachments on bug 185150: 66353 | 66383 | 66386