Attachment 104873 Details for Bug 141690 – patch

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

[patch] patch

141690.patch (text/plain), 11.68 KB, created by Martin Aeschlimann

on 2008-06-13 11:43:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Aeschlimann

Created: 2008-06-13 11:43:16 EDT

Size: 11.68 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java,v
>retrieving revision 1.88
>diff -u -r1.88 FilteredPreferenceDialog.java
>--- Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java	9 May 2008 14:13:11 -0000	1.88
>+++ Eclipse UI/org/eclipse/ui/internal/dialogs/FilteredPreferenceDialog.java	13 Jun 2008 15:41:28 -0000
>@@ -134,10 +134,7 @@
> 		 * @see org.eclipse.ui.dialogs.FilteredTree#updateToolbar(boolean)
> 		 */
> 		protected void updateToolbar(boolean visible) {
>-			if (filterToolBar != null) {
>-				filterToolBar.getControl().setVisible(
>-						viewerFilter != null || visible);
>-			}
>+			super.updateToolbar(viewerFilter != null || visible);
> 		}
> 
> 		/*
>@@ -320,8 +317,7 @@
> 		leftLayout.numColumns = 1;
> 		leftLayout.marginHeight = 0;
> 		leftLayout.marginTop = IDialogConstants.VERTICAL_MARGIN;
>-		leftLayout.marginWidth = 0;
>-		leftLayout.marginLeft = IDialogConstants.HORIZONTAL_MARGIN;
>+		leftLayout.marginWidth = IDialogConstants.HORIZONTAL_MARGIN;
> 		leftLayout.horizontalSpacing = 0;
> 		leftLayout.verticalSpacing = 0;
> 		leftArea.setLayout(leftLayout);
>Index: Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java,v
>retrieving revision 1.29
>diff -u -r1.29 FilteredTree.java
>--- Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java	24 Mar 2008 19:21:57 -0000	1.29
>+++ Eclipse UI/org/eclipse/ui/dialogs/FilteredTree.java	13 Jun 2008 15:41:28 -0000
>@@ -13,10 +13,9 @@
> 
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>+import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.core.runtime.jobs.Job;
>-import org.eclipse.jface.action.Action;
>-import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.action.ToolBarManager;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.resource.JFaceResources;
>@@ -25,7 +24,10 @@
> import org.eclipse.jface.viewers.TreeViewer;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
>+import org.eclipse.swt.accessibility.ACC;
> import org.eclipse.swt.accessibility.AccessibleAdapter;
>+import org.eclipse.swt.accessibility.AccessibleControlAdapter;
>+import org.eclipse.swt.accessibility.AccessibleControlEvent;
> import org.eclipse.swt.accessibility.AccessibleEvent;
> import org.eclipse.swt.events.DisposeEvent;
> import org.eclipse.swt.events.DisposeListener;
>@@ -35,17 +37,22 @@
> import org.eclipse.swt.events.KeyEvent;
> import org.eclipse.swt.events.ModifyEvent;
> import org.eclipse.swt.events.ModifyListener;
>+import org.eclipse.swt.events.MouseEvent;
>+import org.eclipse.swt.events.MouseListener;
>+import org.eclipse.swt.events.MouseTrackListener;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.TraverseEvent;
> import org.eclipse.swt.events.TraverseListener;
> import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Font;
>+import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Display;
>+import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Text;
> import org.eclipse.swt.widgets.TreeItem;
> import org.eclipse.ui.IWorkbenchPreferenceConstants;
>@@ -74,10 +81,21 @@
> 	 * The control representing the clear button for the filter text entry. This
> 	 * value may be <code>null</code> if no such button exists, or if the
> 	 * controls have not yet been created.
>+	 * @deprecated Not used anymore. Use {@link #clearButtonControl} instead.
> 	 */
> 	protected ToolBarManager filterToolBar;
> 
> 	/**
>+	 * The control representing the clear button for the filter text entry. This
>+	 * value may be <code>null</code> if no such button exists, or if the
>+	 * controls have not yet been created.
>+	 * 
>+	 * @since 3.5
>+	 */
>+	protected Control clearButtonControl;
>+	
>+	
>+	/**
> 	 * The viewer for the filtered tree. This value should never be
> 	 * <code>null</code> after the widget creation methods are complete.
> 	 */
>@@ -228,7 +246,12 @@
> 		setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
> 
> 		if (showFilterControls) {
>-			filterComposite = new Composite(this, SWT.NONE);
>+			if (useNativeSearchField()) {
>+				filterComposite = new Composite(this, SWT.NONE);
>+			} else {
>+				filterComposite= new Composite(this, SWT.BORDER);
>+				filterComposite.setBackground(getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
>+			}
> 			GridLayout filterLayout = new GridLayout(2, false);
> 			filterLayout.marginHeight = 0;
> 			filterLayout.marginWidth = 0;
>@@ -249,6 +272,11 @@
> 		treeComposite.setLayoutData(data);
> 		createTreeControl(treeComposite, treeStyle);
> 	}
>+	
>+	private static boolean useNativeSearchField() {
>+		return Platform.OS_MACOSX.equals(Platform.getOS());
>+	}
>+	
> 
> 	/**
> 	 * Create the filter controls. By default, a text and corresponding tool bar
>@@ -262,10 +290,9 @@
> 	protected Composite createFilterControls(Composite parent) {
> 		createFilterText(parent);
> 		createClearText(parent);
>-		if (filterToolBar != null) {
>-			filterToolBar.update(false);
>+		if (clearButtonControl != null) {
> 			// initially there is no text to clear
>-			filterToolBar.getControl().setVisible(false);
>+			clearButtonControl.setVisible(false);
> 		}
> 		return parent;
> 	}
>@@ -481,8 +508,8 @@
> 	}
> 
> 	protected void updateToolbar(boolean visible) {
>-		if (filterToolBar != null) {
>-			filterToolBar.getControl().setVisible(visible);
>+		if (clearButtonControl != null) {
>+			clearButtonControl.setVisible(visible);
> 		}
> 	}
> 
>@@ -649,7 +676,7 @@
> 			});
> 		}
> 
>-		GridData gridData = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
>+		GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
> 		// if the text widget supported cancel then it will have it's own
> 		// integrated button. We can take all of the space.
> 		if ((filterText.getStyle() & SWT.CANCEL) != 0)
>@@ -668,8 +695,11 @@
> 	 * @since 3.3
> 	 */
> 	protected Text doCreateFilterText(Composite parent) {
>-		return new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.SEARCH
>-				| SWT.CANCEL);
>+		if (useNativeSearchField()) {
>+			return new Text(parent, SWT.SINGLE | SWT.BORDER | SWT.SEARCH
>+					| SWT.CANCEL);
>+		}
>+		return new Text(parent, SWT.SINGLE);
> 	}
> 
> 	private String previousFilterText;
>@@ -696,12 +726,9 @@
> 	 */
> 	public void setBackground(Color background) {
> 		super.setBackground(background);
>-		if (filterComposite != null) {
>+		if (filterComposite != null && useNativeSearchField()) {
> 			filterComposite.setBackground(background);
> 		}
>-		if (filterToolBar != null && filterToolBar.getControl() != null) {
>-			filterToolBar.getControl().setBackground(background);
>-		}
> 	}
> 
> 	/**
>@@ -714,28 +741,56 @@
> 		// only create the button if the text widget doesn't support one
> 		// natively
> 		if ((filterText.getStyle() & SWT.CANCEL) == 0) {
>-			filterToolBar = new ToolBarManager(SWT.FLAT | SWT.HORIZONTAL);
>-			filterToolBar.createControl(parent);
>+			final Image inactiveImage= JFaceResources.getImageRegistry().getDescriptor(DCLEAR_ICON).createImage();
>+			final Image activeImage= JFaceResources.getImageRegistry().getDescriptor(CLEAR_ICON).createImage();
>+			
>+			final Label clearButton= new Label(parent, SWT.NONE);
>+			clearButton.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
>+			clearButton.setImage(inactiveImage);
>+			clearButton.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
>+			clearButton.setToolTipText(WorkbenchMessages.FilteredTree_ClearToolTip);
>+			clearButton.addMouseListener(new MouseListener() {
>+				public void mouseDoubleClick(MouseEvent e) {
>+				}
> 
>-			IAction clearTextAction = new Action("", IAction.AS_PUSH_BUTTON) {//$NON-NLS-1$
>-				/*
>-				 * (non-Javadoc)
>-				 * 
>-				 * @see org.eclipse.jface.action.Action#run()
>-				 */
>-				public void run() {
>+				public void mouseDown(MouseEvent e) {
> 					clearText();
> 				}
>-			};
> 
>-			clearTextAction
>-					.setToolTipText(WorkbenchMessages.FilteredTree_ClearToolTip);
>-			clearTextAction.setImageDescriptor(JFaceResources
>-					.getImageRegistry().getDescriptor(CLEAR_ICON));
>-			clearTextAction.setDisabledImageDescriptor(JFaceResources
>-					.getImageRegistry().getDescriptor(DCLEAR_ICON));
>+				public void mouseUp(MouseEvent e) {
>+				}			
>+			});
>+			clearButton.addMouseTrackListener(new MouseTrackListener() {
>+				public void mouseEnter(MouseEvent e) {
>+					clearButton.setImage(activeImage);
>+				}
>+
>+				public void mouseExit(MouseEvent e) {
>+					clearButton.setImage(inactiveImage);
>+				}
> 
>-			filterToolBar.add(clearTextAction);
>+				public void mouseHover(MouseEvent e) {
>+				}
>+			});
>+			clearButton.addDisposeListener(new DisposeListener() {
>+				public void widgetDisposed(DisposeEvent e) {
>+					inactiveImage.dispose();
>+					activeImage.dispose();
>+				}
>+			});
>+			clearButton.getAccessible().addAccessibleListener(
>+				new AccessibleAdapter() {
>+					public void getName(AccessibleEvent e) {
>+						e.result= WorkbenchMessages.FilteredTree_AccessibleListenerClearButton;
>+					}
>+			});
>+			clearButton.getAccessible().addAccessibleControlListener(
>+				new AccessibleControlAdapter() {
>+					public void getRole(AccessibleControlEvent e) {
>+						e.detail= ACC.ROLE_PUSHBUTTON;
>+					}
>+			});
>+			this.clearButtonControl= clearButton;
> 		}
> 	}
> 
>Index: Eclipse UI/org/eclipse/ui/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v
>retrieving revision 1.383
>diff -u -r1.383 messages.properties
>--- Eclipse UI/org/eclipse/ui/internal/messages.properties	30 May 2008 17:10:15 -0000	1.383
>+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	13 Jun 2008 15:41:28 -0000
>@@ -857,6 +857,7 @@
> FilteredTree_ClearToolTip=Clear
> FilteredTree_FilterMessage=type filter text
> FilteredTree_FilteredDialogTitle={0} (Filtered)
>+FilteredTree_AccessibleListenerClearButton=Clear filter field
> FilteredTree_AccessibleListenerFiltered={0} {1} matches.
> Workbench_restoreDisabled=This application does not save and restore previously saved state.
> Workbench_noStateToRestore=No previously saved state to restore.
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java,v
>retrieving revision 1.106
>diff -u -r1.106 WorkbenchMessages.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	14 May 2008 17:11:06 -0000	1.106
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java	13 Jun 2008 15:41:28 -0000
>@@ -877,6 +877,7 @@
> 	public static String FilteredTree_ClearToolTip;
> 	public static String FilteredTree_FilterMessage;
> 	public static String FilteredTree_FilteredDialogTitle;
>+	public static String FilteredTree_AccessibleListenerClearButton;
> 	public static String FilteredTree_AccessibleListenerFiltered;
> 	public static String Workbench_restoreDisabled;
> 	public static String Workbench_noStateToRestore;

Actions: View | Diff

Attachments on bug 141690: 41411 | 41412 | 41413 | 45443 | 45444 | 45445 | 45446 | 45447 | 104873 | 104876 | 119206