Attachment #166862 for bug #278102

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

Lines 17-22 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
17	org.eclipse.ui.ide,	17	org.eclipse.ui.ide,
18	org.eclipse.ui.views,	18	org.eclipse.ui.views,
19	org.eclipse.ui.workbench.texteditor,	19	org.eclipse.ui.workbench.texteditor,
		20	org.eclipse.ui.navigator,
20	org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",	21	org.eclipse.mylyn.context.core;bundle-version="[3.0.0,4.0.0)",
21	org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",	22	org.eclipse.mylyn.commons.core;bundle-version="[3.0.0,4.0.0)",
22	org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",	23	org.eclipse.mylyn.monitor.ui;bundle-version="[3.0.0,4.0.0)",

Lines 631-637 Link Here

(-)plugin.xml (-1 / +93 lines)
631	value="org.eclipse.mylyn.tasks.ui.views.tasks">	631	value="org.eclipse.mylyn.tasks.ui.views.tasks">
632	</parameter>	632	</parameter>
633	</key>	633	</key>
634	</extension>	634	<key
		635	sequence="M1+M2+M3+."
		636	commandId="org.eclipse.mylyn.task.ui.actions.outline.related.tasks.dialog"
		637	schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
		638	</key>
		639	</extension>
635		640
636	<extension	641	<extension
637	point="org.eclipse.ui.themes">	642	point="org.eclipse.ui.themes">
Lines 828-833 Link Here
828	style="push"	833	style="push"
829	toolbarPath="org.eclipse.search.searchActionSet/Search"	834	toolbarPath="org.eclipse.search.searchActionSet/Search"
830	tooltip="%OpenTaskAction.tooltip"/>	835	tooltip="%OpenTaskAction.tooltip"/>
		836	<action
		837	definitionId="org.eclipse.mylyn.task.ui.actions.outline.related.tasks.dialog"
		838	label="related Task Popup"
		839	class="org.eclipse.mylyn.internal.tasks.ui.actions.QuickOutlineTaskDataAction"
		840	menubarPath="navigate/showIn"
		841	id="org.eclipse.mylyn.task.ui.actions.outline.related.tasks.dialog">
		842	</action>
831	</actionSet>	843	</actionSet>
832	</extension>	844	</extension>
833		845
Lines 835-840 Link Here
835	<command id="org.eclipse.mylyn.tasks.ui.command.previousTask"	847	<command id="org.eclipse.mylyn.tasks.ui.command.previousTask"
836	defaultHandler="org.eclipse.mylyn.internal.tasks.ui.TaskHistoryHandler"	848	defaultHandler="org.eclipse.mylyn.internal.tasks.ui.TaskHistoryHandler"
837	name="%command.previousTask.name"/>	849	name="%command.previousTask.name"/>
		850	<command
		851	name="bbbb"
		852	description="aaaa"
		853	id="org.eclipse.mylyn.task.ui.actions.outline.related.tasks.dialog"
		854	categoryId="org.eclipse.mylyn.tasks.ui.commands">
		855	</command>
838	</extension>	856	</extension>
839		857
840	<!-- command-based implementation of the previousTask/history dropdown,	858	<!-- command-based implementation of the previousTask/history dropdown,
Lines 1903-1906 Link Here
1903	</iterate>	1921	</iterate>
1904	</definition>	1922	</definition>
1905	</extension>	1923	</extension>
		1924
		1925	<!-- TaskData Quick Outline -->
		1926	<!--
		1927	<extension
		1928	point="org.eclipse.ui.views">
		1929	<view
		1930	allowMultiple="false"
		1931	class="org.eclipse.ui.navigator.CommonNavigator"
		1932	id="org.eclipse.mylyn.internal.tasks.ui.taskdata.quick"
		1933	name="Non-Resources Viewer!!!!!"/>
		1934	</extension>
		1935	-->
		1936	<extension
		1937	point="org.eclipse.ui.navigator.viewer">
		1938	<viewer viewerId="org.eclipse.mylyn.internal.tasks.ui.taskdata.quick"/>
		1939	<viewerContentBinding viewerId="org.eclipse.mylyn.internal.tasks.ui.taskdata.quick">
		1940	<includes>
		1941	<contentExtension pattern="org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataContentProvider"/>
		1942	<contentExtension pattern="org.eclipse.ui.navigator.resources.filters.*"/>
		1943	<!--
		1944	<contentExtension pattern="org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataFilter.NoOper"/>
		1945	-->
		1946	</includes>
		1947	</viewerContentBinding>
		1948	<viewerActionBinding viewerId="org.eclipse.mylyn.internal.tasks.ui.taskdata.quick">
		1949	<includes>
		1950	<actionExtension pattern="org.eclipse.ui.navigator.resources.*"/>
		1951	</includes>
		1952	</viewerActionBinding>
		1953	</extension>
		1954	<extension
		1955	point="org.eclipse.ui.navigator.navigatorContent">
		1956	<navigatorContent
		1957	activeByDefault="true"
		1958	contentProvider="org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataContentProvider"
		1959	id="org.eclipse.mylyn.internal.tasks.ui.navigatorContent1"
		1960	labelProvider="org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataLabelProvider"
		1961	name="NR Content">
		1962	<triggerPoints>
		1963	<or>
		1964	<instanceof value="org.eclipse.mylyn.tasks.core.data.TaskData"/>
		1965	</or>
		1966	</triggerPoints>
		1967	<possibleChildren>
		1968	<or>
		1969	<instanceof value="org.eclipse.mylyn.tasks.core.data.TaskAttribute"/>
		1970	<instanceof value="org.eclipse.mylyn.tasks.core.data.TaskData"/>
		1971	</or>
		1972	</possibleChildren>
		1973	</navigatorContent>
		1974	</extension>
		1975	<!--
		1976	<extension
		1977	point="org.eclipse.ui.navigator.navigatorContent">
		1978	<commonFilter
		1979	class="org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataFilter"
		1980	description="Filter Operation of TaskData"
		1981	id="org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataFilter.NoOper"
		1982	name="No Operation">
		1983	</commonFilter>
		1984	</extension>
		1985	-->
		1986	<extension
		1987	point="org.eclipse.ui.navigator.viewer">
1988	<viewerContentBinding viewerId="org.eclipse.mylyn.internal.tasks.ui.taskdata.quick">
1989	<includes>
1990	<contentExtension
1991	isRoot="false"
1992	pattern="org.eclipse.mylyn.internal.tasks.ui.navigatorContent1"/>
1993	</includes>
1994	</viewerContentBinding>
1995	</extension>
1996
1997
1906	</plugin>	1998	</plugin>




/*******************************************************************************
 * Copyright (c) 2010 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui;

import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.tasks.core.data.TaskData;

public class CommonViewerTaskDataContentProvider implements ITreeContentProvider {

	public Object[] getChildren(Object parentElement) {
		Object[] result = {};
		if (parentElement instanceof TaskData) {
			TaskData node = (TaskData) parentElement;
			result = node.getRoot().getAttributes().values().toArray();
//		} else if (parentElement instanceof TaskAttribute) {
//			TaskAttribute node = (TaskAttribute) parentElement;
//			result = node.getAttributes().values().toArray();
		}
		return result;
	}

	public Object[] getElements(Object inputElement) {
		return getChildren(inputElement);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
	 */
	public Object getParent(Object element) {
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
	 */
	public boolean hasChildren(Object element) {
		return true;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
	 */
	public void dispose() {
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
	 */
	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
	}

}




/*******************************************************************************
 * Copyright (c) 2010 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui;

import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.ui.internal.misc.StringMatcher;

public class CommonViewerTaskDataFilter extends ViewerFilter {

	private StringMatcher stringMatcher;

	@Override
	public boolean select(Viewer viewer, Object parentElement, Object element) {
		if (element instanceof TaskAttribute) {
			TaskAttribute attribute = (TaskAttribute) element;
			String metaType = attribute.getMetaData().getType();
			if (TaskAttribute.TYPE_OPERATION.equals(metaType)) {
				return false;
			}
		}
		if ((stringMatcher == null) || ((viewer instanceof TreeViewer) == false)) {
			return true;
		}
		TreeViewer treeViewer = (TreeViewer) viewer;
		// Match the pattern against the label of the given element
		String matchName = ((ILabelProvider) treeViewer.getLabelProvider()).getText(element);
		// Element passes the filter if it matches the pattern
		if ((matchName != null) && stringMatcher.match(matchName)) {
			return true;
		}
		return false;
	}

	public void setStringMatcher(StringMatcher stringMatcher) {
		this.stringMatcher = stringMatcher;
	}

}




/*******************************************************************************
 * Copyright (c) 2010 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui;

import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.core.data.TaskAttributeMetaData;
import org.eclipse.mylyn.tasks.core.data.TaskData;
import org.eclipse.swt.graphics.Image;

public class CommonViewerTaskDataLabelProvider implements ILabelProvider {
	public String getText(Object element) {
		String result = ""; //$NON-NLS-1$
		if (element instanceof TaskData) {
			TaskData node = (TaskData) element;
			result = node.getTaskId();
		} else if (element instanceof TaskAttribute) {
			TaskAttribute node = (TaskAttribute) element;
			TaskAttributeMetaData meta = node.getMetaData();
			if (meta != null) {
				String lable = meta.getLabel();
				if (lable != null) {
					result = lable + " (" + node.getId() + ")";
				} else {
					if (TaskAttribute.TYPE_ATTACHMENT.equals(meta.getType())) {
						result = "Attachment: " + node.getValue(); //$NON-NLS-1$
					} else if (TaskAttribute.TYPE_COMMENT.equals(meta.getType())) {
						result = "Comment: " + node.getValue(); //$NON-NLS-1$
					} else {
						result = "<" + node.getId() + ">"; //$NON-NLS-1$//$NON-NLS-2$
					}
				}
			}
		} else if (element instanceof String) {
			result = (String) element;
		}
		return result;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
	 */
	public Image getImage(Object element) {
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
	 */
	public void addListener(ILabelProviderListener listener) {
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
	 */
	public void dispose() {
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
	 */
	public boolean isLabelProperty(Object element, String property) {
		return false;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
	 */
	public void removeListener(ILabelProviderListener listener) {
	}

}




/*******************************************************************************
 * Copyright (c) 2010 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui;

import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
import org.eclipse.jface.viewers.IOpenListener;
import org.eclipse.jface.viewers.OpenEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.internal.provisional.commons.ui.CommonFormUtil;
import org.eclipse.mylyn.internal.tasks.core.TaskAttachment;
import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorAttributePart;
import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPart;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.IFormPage;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.Section;

public class CommonViewerTaskDataOpenListener implements IOpenListener, IDoubleClickListener, MouseListener {

	private final Viewer viewer;

	public CommonViewerTaskDataOpenListener(Viewer viewer) {
		this.viewer = viewer;
	}

	public void mouseDoubleClick(MouseEvent e) {
		setSelection(e);
	}

	public void mouseDown(MouseEvent e) {
		setSelection(e);
	}

	public void mouseUp(MouseEvent e) {
		// ignore

	}

	public void doubleClick(DoubleClickEvent event) {
		open(null);
	}

	public void open(OpenEvent event) {
		StructuredSelection selection = (StructuredSelection) viewer.getSelection();
		Object object = selection.getFirstElement();
		if (object instanceof TaskAttribute) {
			TaskAttribute attribute = (TaskAttribute) object;
			IEditorPart editorPart = PlatformUI.getWorkbench()
					.getActiveWorkbenchWindow()
					.getActivePage()
					.getActiveEditor();
			AbstractTaskEditorPage taskEditorPage = null;
			if (editorPart instanceof TaskEditor) {
				TaskEditor taskEditor = (TaskEditor) editorPart;
				IFormPage formPage = taskEditor.getActivePageInstance();
				if (formPage instanceof AbstractTaskEditorPage) {
					taskEditorPage = (AbstractTaskEditorPage) formPage;
				}
			}
			if (TaskAttribute.TYPE_ATTACHMENT.equals(attribute.getMetaData().getType())) {
				AbstractTaskEditorPart actionPart = taskEditorPage.getPart(AbstractTaskEditorPage.ID_PART_ATTACHMENTS);
				if (actionPart != null && actionPart.getControl() instanceof ExpandableComposite) {
					CommonFormUtil.setExpanded((ExpandableComposite) actionPart.getControl(), true);
					if (actionPart.getControl() instanceof Section) {
						Control client = actionPart.getControl();
						if (client instanceof Composite) {
							for (Control control : ((Composite) client).getChildren()) {
								if (control instanceof Composite) {
									for (Control control1 : ((Composite) control).getChildren()) {
										if (control1 instanceof org.eclipse.swt.widgets.Table) {
											org.eclipse.swt.widgets.Table attachmentTable = ((org.eclipse.swt.widgets.Table) control1);
											TableItem[] attachments = attachmentTable.getItems();
											int index = 0;
											for (TableItem attachment : attachments) {
												TaskAttachment attachmentData = ((TaskAttachment) attachment.getData());
												if (attachmentData.getTaskAttribute() == attribute) {
													attachmentTable.deselectAll();
													attachmentTable.select(index);
													IManagedForm mform = actionPart.getManagedForm();
													ScrolledForm form = mform.getForm();
//													EditorUtil.focusOn(form, attachmentTable, 30);
													taskEditorPage.focusOn(attachmentTable);
													break;
												}
												index++;
											}
										}
									}
								}
							}
						}
					}
				}
			} else {
				if (TaskAttribute.TYPE_COMMENT.equals(attribute.getMetaData().getType())) {
					AbstractTaskEditorPart actionPart = taskEditorPage.getPart(AbstractTaskEditorPage.ID_PART_COMMENTS);
					if (actionPart != null && actionPart.getControl() instanceof ExpandableComposite) {
						CommonFormUtil.setExpanded((ExpandableComposite) actionPart.getControl(), true);
						if (actionPart.getControl() instanceof Section) {
							Control client = ((Section) actionPart.getControl()).getClient();
							if (client instanceof Composite) {
								for (Control control : ((Composite) client).getChildren()) {
									// toggle subsections
									if (control instanceof Section) {
										CommonFormUtil.setExpanded((Section) control, true);
									}
								}
							}
						}
					}
				} else {
					TaskEditorAttributePart actionPart = (TaskEditorAttributePart) taskEditorPage.getPart(AbstractTaskEditorPage.ID_PART_ATTRIBUTES);
					Section section = actionPart.getSection();
					boolean expanded = section.isExpanded();
					if (!expanded && actionPart != null && actionPart.getControl() instanceof ExpandableComposite) {
						CommonFormUtil.setExpanded((ExpandableComposite) actionPart.getControl(), true);
						if (!expanded) {
							CommonFormUtil.setExpanded((ExpandableComposite) actionPart.getControl(), false);
						}
					}
				}
				taskEditorPage.reveal(attribute.getId());
			}
		}
	}

	private void setSelection(MouseEvent event) {
		try {
			Object selection = ((Tree) event.getSource()).getSelection()[0].getData();
			viewer.setSelection(new StructuredSelection(selection));
			open(null);
		} catch (Exception e) {
			// ignore
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2010 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui.actions;

import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.mylyn.internal.tasks.core.TaskTask;
import org.eclipse.mylyn.internal.tasks.ui.views.QuickOutlineTaskDataDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.PlatformUI;

public class QuickOutlineTaskDataAction implements IWorkbenchWindowActionDelegate {

	private QuickOutlineTaskDataDialog inplaceDialog;

	private TaskTask sel;

	public void run(IAction action) {
		Shell parent = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
		inplaceDialog = new QuickOutlineTaskDataDialog(parent);
		inplaceDialog.open();
		inplaceDialog.setFocus();
	}

	public void selectionChanged(IAction action, ISelection selection) {
		// ignore
		if (selection instanceof StructuredSelection) {
			StructuredSelection a = (StructuredSelection) selection;
			if (a.size() > 0) {
				if (a.getFirstElement() instanceof TaskTask) {
					sel = (TaskTask) a.getFirstElement();
				}
			}
		}
	}

	public void dispose() {
		inplaceDialog = null;
	}

	public void init(IWorkbenchWindow window) {
		// ignore
	}

}

Lines 153-159 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java (-5 / +11 lines)
153	* @param control	153	* @param control
154	* The StyledText to scroll to	154	* The StyledText to scroll to
155	*/	155	*/
156	private static void focusOn(ScrolledForm form, Control control) {	156	public static void focusOn(ScrolledForm form, Control control) {
157	int pos = 0;	157	int pos = 0;
158	control.setEnabled(true);	158	control.setEnabled(true);
159	control.setFocus();	159	control.setFocus();
Lines 405-412 Link Here
405	} else {	405	} else {
406	roundedBorder.setLayout(GridLayoutFactory.fillDefaults().margins(0, 6).create());	406	roundedBorder.setLayout(GridLayoutFactory.fillDefaults().margins(0, 6).create());
407	}	407	}
408	GridDataFactory.fillDefaults().align(SWT.FILL, SWT.BEGINNING).hint(EditorUtil.MAXIMUM_WIDTH, SWT.DEFAULT).grab(	408	GridDataFactory.fillDefaults()
409	true, false).applyTo(roundedBorder);	409	.align(SWT.FILL, SWT.BEGINNING)
		410	.hint(EditorUtil.MAXIMUM_WIDTH, SWT.DEFAULT)
		411	.grab(true, false)
		412	.applyTo(roundedBorder);
410	return roundedBorder;	413	return roundedBorder;
411	}	414	}
412		415
Lines 432-439 Link Here
432	textFont.dispose();	435	textFont.dispose();
433	}	436	}
434	});	437	});
435	Color color = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry().get(	438	Color color = PlatformUI.getWorkbench()
436	CommonThemes.COLOR_COMPLETED);	439	.getThemeManager()
		440	.getCurrentTheme()
		441	.getColorRegistry()
		442	.get(CommonThemes.COLOR_COMPLETED);
437	text.setForeground(color);	443	text.setForeground(color);
438	return textFont;	444	return textFont;
439	}	445	}

Lines 29-34 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/views/Messages.java (+2 lines)
29		29
30	public static String PriorityDropDownAction_Filter_Priority_Lower_Than;	30	public static String PriorityDropDownAction_Filter_Priority_Lower_Than;
31		31
		32	public static String QuickOutlineTaskDataDialog_InfoText;
		33
32	public static String RepositoryElementActionGroup_Copy_Detail_Menu_Label;	34	public static String RepositoryElementActionGroup_Copy_Detail_Menu_Label;
33		35
34	public static String RepositoryElementActionGroup_New;	36	public static String RepositoryElementActionGroup_New;




/*******************************************************************************
 * Copyright (c) 2010 Tasktop Technologies and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Tasktop Technologies - initial API and implementation
 *******************************************************************************/

package org.eclipse.mylyn.internal.tasks.ui.views;

import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.text.IInformationControl;
import org.eclipse.jface.text.IInformationControlExtension;
import org.eclipse.jface.text.IInformationControlExtension2;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataFilter;
import org.eclipse.mylyn.internal.tasks.ui.CommonViewerTaskDataOpenListener;
import org.eclipse.mylyn.tasks.core.data.TaskData;
import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorPage;
import org.eclipse.mylyn.tasks.ui.editors.TaskEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.FontMetrics;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.forms.editor.IFormPage;
import org.eclipse.ui.internal.misc.StringMatcher;
import org.eclipse.ui.navigator.CommonViewer;

public class QuickOutlineTaskDataDialog extends PopupDialog implements IInformationControl,
		IInformationControlExtension, IInformationControlExtension2, DisposeListener {

	public static final String ID_VIEWER = "org.eclipse.mylyn.internal.tasks.ui.taskdata.quick"; //$NON-NLS-1$

	private CommonViewer commonViewer;

	private Text fFilterText;

	private StringMatcher fStringMatcher;

	private CommonViewerTaskDataFilter namePatternFilter;

	private CommonViewerTaskDataOpenListener openListener;

	public QuickOutlineTaskDataDialog(Shell parent) {
		super(parent, SWT.RESIZE, true, true, true, true, true, null, Messages.QuickOutlineTaskDataDialog_InfoText);
		create();
	}

	@Override
	public boolean close() {
		// nothing additional to dispose
		return super.close();
	}

	@Override
	protected Control createDialogArea(Composite parent) {
		createViewer(parent);
		createUIListenersTreeViewer();
		addDisposeListener(this);

		return commonViewer.getControl();
	}

	private void createViewer(Composite parent) {
		Control composite = super.createDialogArea(parent);
		commonViewer = createCommonViewer((Composite) composite);

		openListener = new CommonViewerTaskDataOpenListener(commonViewer);

		commonViewer.addOpenListener(openListener);
		commonViewer.getTree().addMouseListener(openListener);

		namePatternFilter = new CommonViewerTaskDataFilter();
		commonViewer.addFilter(namePatternFilter);

		try {
			commonViewer.getControl().setRedraw(false);
			IEditorPart activeEditor = PlatformUI.getWorkbench()
					.getActiveWorkbenchWindow()
					.getActivePage()
					.getActiveEditor();
			if (activeEditor instanceof TaskEditor) {
				TaskEditor taskEditor = (TaskEditor) activeEditor;
				IFormPage pageInstance = taskEditor.getActivePageInstance();
				if (pageInstance instanceof AbstractTaskEditorPage) {
					AbstractTaskEditorPage taskEditorPage = (AbstractTaskEditorPage) pageInstance;
					TaskData taskData = taskEditorPage.getModel().getTaskData();
					commonViewer.setInput(taskData);
				}
			}
			commonViewer.expandAll();
		} finally {
			commonViewer.getControl().setRedraw(true);
		}
	}

	protected CommonViewer createCommonViewer(Composite parent) {
		CommonViewer viewer = new CommonViewer(ID_VIEWER, parent, SWT.H_SCROLL | SWT.V_SCROLL);
		viewer.setUseHashlookup(true);
		viewer.getControl().setLayoutData(new GridData(500, 400));
		return viewer;
	}

	@Override
	protected void fillDialogMenu(IMenuManager dialogMenu) {
		dialogMenu.add(new Separator());
		super.fillDialogMenu(dialogMenu);
	}

	private void createUIListenersTreeViewer() {
		final Tree tree = commonViewer.getTree();
		tree.addKeyListener(new KeyListener() {
			public void keyPressed(KeyEvent e) {
				if (e.character == 0x1B) {
					// Dispose on ESC key press
					dispose();
				}
			}

			public void keyReleased(KeyEvent e) {
				// ignore
			}
		});

		tree.addMouseListener(new MouseAdapter() {
			@Override
			public void mouseUp(MouseEvent e) {
				handleTreeViewerMouseUp(tree, e);
			}
		});

		tree.addSelectionListener(new SelectionListener() {
			public void widgetSelected(SelectionEvent e) {
				// ignore
			}

			public void widgetDefaultSelected(SelectionEvent e) {
				gotoSelectedElement();
			}
		});
	}

	private void handleTreeViewerMouseUp(final Tree tree, MouseEvent e) {
		if ((tree.getSelectionCount() < 1) || (e.button != 1) || (tree.equals(e.getSource()) == false)) {
			return;
		}
		// Selection is made in the selection changed listener
		Object object = tree.getItem(new Point(e.x, e.y));
		TreeItem selection = tree.getSelection()[0];
		if (selection.equals(object)) {
			gotoSelectedElement();
		}
	}

	private Object getSelectedElement() {
		if (commonViewer == null) {
			return null;
		}
		return ((IStructuredSelection) commonViewer.getSelection()).getFirstElement();
	}

	public void addDisposeListener(DisposeListener listener) {
		getShell().addDisposeListener(listener);
	}

	public void addFocusListener(FocusListener listener) {
		getShell().addFocusListener(listener);
	}

	public Point computeSizeHint() {
		// Note that it already has the persisted size if persisting is enabled.
		return getShell().getSize();
	}

	public void dispose() {
		close();
	}

	public boolean isFocusControl() {
		if (commonViewer.getControl().isFocusControl() || fFilterText.isFocusControl()) {
			return true;
		}
		return false;
	}

	public void removeDisposeListener(DisposeListener listener) {
		getShell().removeDisposeListener(listener);
	}

	public void removeFocusListener(FocusListener listener) {
		getShell().removeFocusListener(listener);
	}

	public void setBackgroundColor(Color background) {
		applyBackgroundColor(background, getContents());
	}

	public void setFocus() {
		getShell().forceFocus();
		fFilterText.setFocus();
	}

	public void setForegroundColor(Color foreground) {
		applyForegroundColor(foreground, getContents());
	}

	public void setInformation(String information) {
		// See IInformationControlExtension2
	}

	public void setLocation(Point location) {
		/*
		 * If the location is persisted, it gets managed by PopupDialog - fine. Otherwise, the location is
		 * computed in Window#getInitialLocation, which will center it in the parent shell / main
		 * monitor, which is wrong for two reasons:
		 * - we want to center over the editor / subject control, not the parent shell
		 * - the center is computed via the initalSize, which may be also wrong since the size may 
		 *   have been updated since via min/max sizing of AbstractInformationControlManager.
		 * In that case, override the location with the one computed by the manager. Note that
		 * the call to constrainShellSize in PopupDialog.open will still ensure that the shell is
		 * entirely visible.
		 */
		if (getPersistLocation() == false || getDialogSettings() == null) {
			getShell().setLocation(location);
		}
	}

	public void setSize(int width, int height) {
		getShell().setSize(width, height);
	}

	public void setSizeConstraints(int maxWidth, int maxHeight) {
		// Ignore
	}

	public void setVisible(boolean visible) {
		if (visible) {
			open();
		} else {
			saveDialogBounds(getShell());
			getShell().setVisible(false);
		}
	}

	public boolean hasContents() {
		if ((commonViewer == null) || (commonViewer.getInput() == null)) {
			return false;
		}
		return true;
	}

	public void setInput(Object input) {
		// Input comes from PDESourceInfoProvider.getInformation2()
		// The input should be a model object of some sort
		// Turn it into a structured selection and set the selection in the tree
		if (input != null) {
			commonViewer.setSelection(new StructuredSelection(input));
		}
	}

	public void widgetDisposed(DisposeEvent e) {
		// Note: We do not reuse the dialog
		commonViewer = null;
		fFilterText = null;
	}

	@Override
	protected Control createTitleControl(Composite parent) {
		// Applies only to dialog title - not body.  See createDialogArea
		// Create the text widget
		createUIWidgetFilterText(parent);
		// Add listeners to the text widget
		createUIListenersFilterText();
		// Return the text widget
		return fFilterText;
	}

	private void createUIWidgetFilterText(Composite parent) {
		// Create the widget
		fFilterText = new Text(parent, SWT.NONE);
		// Set the font 
		GC gc = new GC(parent);
		gc.setFont(parent.getFont());
		FontMetrics fontMetrics = gc.getFontMetrics();
		gc.dispose();
		// Create the layout
		GridData data = new GridData(GridData.FILL_HORIZONTAL);
		data.heightHint = Dialog.convertHeightInCharsToPixels(fontMetrics, 1);
		data.horizontalAlignment = GridData.FILL;
		data.verticalAlignment = GridData.CENTER;
		fFilterText.setLayoutData(data);
	}

	/**
	 * 
	 */
	private void gotoSelectedElement() {
		Object selectedElement = getSelectedElement();
		if (selectedElement == null) {
			return;
		}
		dispose();
	}

	private void createUIListenersFilterText() {
		fFilterText.addKeyListener(new KeyListener() {
			public void keyPressed(KeyEvent e) {
				if (e.keyCode == 0x0D) {
					// Return key was pressed
					gotoSelectedElement();
				} else if (e.keyCode == SWT.ARROW_DOWN) {
					// Down key was pressed
					commonViewer.getTree().setFocus();
				} else if (e.keyCode == SWT.ARROW_UP) {
					// Up key was pressed
					commonViewer.getTree().setFocus();
				} else if (e.character == 0x1B) {
					// Escape key was pressed
					dispose();
				}
			}

			public void keyReleased(KeyEvent e) {
				// NO-OP
			}
		});
		// Handle text modify events
		fFilterText.addModifyListener(new ModifyListener() {
			public void modifyText(ModifyEvent e) {
				String text = ((Text) e.widget).getText();
				int length = text.length();
				if (length > 0) {
					// Append a '*' pattern to the end of the text value if it
					// does not have one already
					if (text.charAt(length - 1) != '*') {
						text = text + '*';
					}
					// Prepend a '*' pattern to the beginning of the text value
					// if it does not have one already
					if (text.charAt(0) != '*') {
						text = '*' + text;
					}
				}
				// Set and update the pattern
				setMatcherString(text, true);
			}
		});
	}

	/**
	 * Sets the patterns to filter out for the receiver.
	 * <p>
	 * The following characters have special meaning: ? => any character * => any string
	 * </p>
	 * 
	 * @param pattern
	 *            the pattern
	 * @param update
	 *            <code>true</code> if the viewer should be updated
	 */
	private void setMatcherString(String pattern, boolean update) {
		if (pattern.length() == 0) {
			fStringMatcher = null;
		} else {
			fStringMatcher = new StringMatcher(pattern, true, false);
		}
		// Update the name pattern filter on the tree viewer
		namePatternFilter.setStringMatcher(fStringMatcher);
		// Update the tree viewer according to the pattern
		if (update) {
			stringMatcherUpdated();
		}
	}

	/**
	 * The string matcher has been modified. The default implementation refreshes the view and selects the first matched
	 * element
	 */
	private void stringMatcherUpdated() {
		// Refresh the tree viewer to re-filter
		commonViewer.getControl().setRedraw(false);
		commonViewer.refresh();
		commonViewer.expandAll();
		selectFirstMatch();
		commonViewer.getControl().setRedraw(true);
	}

	/**
	 * Selects the first element in the tree which matches the current filter pattern.
	 */
	private void selectFirstMatch() {
		Tree tree = commonViewer.getTree();
		Object element = findFirstMatchToPattern(tree.getItems());
		if (element != null) {
			commonViewer.setSelection(new StructuredSelection(element), true);
		} else {
			commonViewer.setSelection(StructuredSelection.EMPTY);
		}
	}

	/**
	 * @param items
	 * @return
	 */
	private Object findFirstMatchToPattern(TreeItem[] items) {
		// Match the string pattern against labels
		ILabelProvider labelProvider = (ILabelProvider) commonViewer.getLabelProvider();
		// Process each item in the tree
		for (TreeItem item : items) {
			Object element = item.getData();
			// Return the first element if no pattern is set
			if (fStringMatcher == null) {
				return element;
			}
			// Return the element if it matches the pattern
			if (element != null) {
				String label = labelProvider.getText(element);
				if (fStringMatcher.match(label)) {
					return element;
				}
			}
			// Recursively check the elements children for a match
			element = findFirstMatchToPattern(item.getItems());
			// Return the child element match if found
			if (element != null) {
				return element;
			}
		}
		// No match found
		return null;
	}

}

Lines 11-16 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/views/messages.properties (+1 lines)
11	DisconnectRepositoryAction_Disconnected=Disconnected	11	DisconnectRepositoryAction_Disconnected=Disconnected
12		12
13	PriorityDropDownAction_Filter_Priority_Lower_Than=Hide Priority Lower Than	13	PriorityDropDownAction_Filter_Priority_Lower_Than=Hide Priority Lower Than
		14	QuickOutlineTaskDataDialog_InfoText=TaskDetail
14	RepositoryElementActionGroup_Copy_Detail_Menu_Label=Copy Details	15	RepositoryElementActionGroup_Copy_Detail_Menu_Label=Copy Details
15	RepositoryElementActionGroup_New=New	16	RepositoryElementActionGroup_New=New
16		17

Lines 1239-1253 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java (-6 / +18 lines)
1239	if (part.getControl() != null) {	1239	if (part.getControl() != null) {
1240	if (ID_PART_ACTIONS.equals(part.getPartId())) {	1240	if (ID_PART_ACTIONS.equals(part.getPartId())) {
1241	// do not expand horizontally	1241	// do not expand horizontally
1242	GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(false, false).applyTo(	1242	GridDataFactory.fillDefaults()
1243	part.getControl());	1243	.align(SWT.FILL, SWT.FILL)
		1244	.grab(false, false)
		1245	.applyTo(part.getControl());
1244	} else {	1246	} else {
1245	if (part.getExpandVertically()) {	1247	if (part.getExpandVertically()) {
1246	GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(	1248	GridDataFactory.fillDefaults()
1247	part.getControl());	1249	.align(SWT.FILL, SWT.FILL)
		1250	.grab(true, true)
		1251	.applyTo(part.getControl());
1248	} else {	1252	} else {
1249	GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(	1253	GridDataFactory.fillDefaults()
1250	part.getControl());	1254	.align(SWT.FILL, SWT.TOP)
		1255	.grab(true, false)
		1256	.applyTo(part.getControl());
1251	}	1257	}
1252	}	1258	}
1253	// for outline	1259	// for outline
Lines 1669-1673 Link Here
1669	// toolBarManager.add(submitButtonContribution);	1675	// toolBarManager.add(submitButtonContribution);
1670	// }	1676	// }
1671	// }	1677	// }
		1678	public boolean reveal(String key) {
		1679	return EditorUtil.reveal(form, key);
		1680	}
1672		1681
		1682	public void focusOn(Control control) {
		1683	EditorUtil.focusOn(form, control);
		1684	}
1673	}	1685	}

Return to bug 278102

Added Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/CommonViewerTaskDataContentProvider.java (+62 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 Tasktop Technologies and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Tasktop Technologies - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.tasks.ui;
13
14	import org.eclipse.jface.viewers.ITreeContentProvider;
15	import org.eclipse.jface.viewers.Viewer;
16	import org.eclipse.mylyn.tasks.core.data.TaskData;
17
18	public class CommonViewerTaskDataContentProvider implements ITreeContentProvider {
19
20	public Object[] getChildren(Object parentElement) {
21	Object[] result = {};
22	if (parentElement instanceof TaskData) {
23	TaskData node = (TaskData) parentElement;
24	result = node.getRoot().getAttributes().values().toArray();
25	// } else if (parentElement instanceof TaskAttribute) {
26	// TaskAttribute node = (TaskAttribute) parentElement;
27	// result = node.getAttributes().values().toArray();
28	}
29	return result;
30	}
31
32	public Object[] getElements(Object inputElement) {
33	return getChildren(inputElement);
34	}
35
36	/* (non-Javadoc)
37	* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
38	*/
39	public Object getParent(Object element) {
40	return null;
41	}
42
43	/* (non-Javadoc)
44	* @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
45	*/
46	public boolean hasChildren(Object element) {
47	return true;
48	}
49
50	/* (non-Javadoc)
51	* @see org.eclipse.jface.viewers.IContentProvider#dispose()
52	*/
53	public void dispose() {
54	}
55
56	/* (non-Javadoc)
57	* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
58	*/
59	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
60	}
61
62	}