Attachment #209109 for bug #363975

View | Details | Raw Unified | Return to bug 363975
Collapse All | Expand All

Lines 29-34 Link Here

(-)a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/Messages.java (+2 lines)
29		29
30	public static String TaskWorkingSetPage_The_name_must_not_have_a_leading_or_trailing_whitespace;	30	public static String TaskWorkingSetPage_The_name_must_not_have_a_leading_or_trailing_whitespace;
31		31
		32	public static String TaskWorkingSetPage_Name;
		33
32	public static String TaskWorkingSetPage_No_categories_queries_selected;	34	public static String TaskWorkingSetPage_No_categories_queries_selected;
33		35
34	public static String TaskWorkingSetPage_Resources;	36	public static String TaskWorkingSetPage_Resources;

Lines 26-31 Link Here

(-)a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java (-8 / +19 lines)
26	import org.eclipse.core.runtime.PlatformObject;	26	import org.eclipse.core.runtime.PlatformObject;
27	import org.eclipse.jface.dialogs.Dialog;	27	import org.eclipse.jface.dialogs.Dialog;
28	import org.eclipse.jface.dialogs.IDialogConstants;	28	import org.eclipse.jface.dialogs.IDialogConstants;
		29	import org.eclipse.jface.layout.GridDataFactory;
		30	import org.eclipse.jface.layout.GridLayoutFactory;
29	import org.eclipse.jface.resource.ImageDescriptor;	31	import org.eclipse.jface.resource.ImageDescriptor;
30	import org.eclipse.jface.viewers.CheckStateChangedEvent;	32	import org.eclipse.jface.viewers.CheckStateChangedEvent;
31	import org.eclipse.jface.viewers.CheckboxTreeViewer;	33	import org.eclipse.jface.viewers.CheckboxTreeViewer;
Lines 34-42 Link Here
34	import org.eclipse.jface.viewers.ILabelProvider;	36	import org.eclipse.jface.viewers.ILabelProvider;
35	import org.eclipse.jface.viewers.ILabelProviderListener;	37	import org.eclipse.jface.viewers.ILabelProviderListener;
36	import org.eclipse.jface.viewers.ITreeContentProvider;	38	import org.eclipse.jface.viewers.ITreeContentProvider;
		39	import org.eclipse.jface.viewers.TreeViewer;
37	import org.eclipse.jface.viewers.Viewer;	40	import org.eclipse.jface.viewers.Viewer;
38	import org.eclipse.jface.viewers.ViewerSorter;	41	import org.eclipse.jface.viewers.ViewerSorter;
39	import org.eclipse.jface.wizard.WizardPage;	42	import org.eclipse.jface.wizard.WizardPage;
		43	import org.eclipse.mylyn.internal.provisional.commons.ui.EnhancedFilteredTree;
		44	import org.eclipse.mylyn.internal.provisional.commons.ui.SubstringPatternFilter;
40	import org.eclipse.mylyn.internal.tasks.core.AbstractTaskCategory;	45	import org.eclipse.mylyn.internal.tasks.core.AbstractTaskCategory;
41	import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;	46	import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
42	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;	47	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
Lines 401-412 Link Here
401	setControl(composite);	406	setControl(composite);
402		407
403	// PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IIDEHelpContextIds.WORKING_SET_RESOURCE_PAGE);	408	// PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IIDEHelpContextIds.WORKING_SET_RESOURCE_PAGE);
404	Label label = new Label(composite, SWT.WRAP);
405	label.setText(""); //$NON-NLS-1$
406	label.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL \| GridData.HORIZONTAL_ALIGN_FILL
407	\| GridData.VERTICAL_ALIGN_CENTER));
408		409
409	text = new Text(composite, SWT.SINGLE \| SWT.BORDER);	410	Composite nameComposite = new Composite(composite, SWT.NONE);
		411	GridDataFactory.fillDefaults().applyTo(nameComposite);
		412	GridLayoutFactory.fillDefaults().numColumns(2).applyTo(nameComposite);
		413	Label nameLabel = new Label(nameComposite, SWT.NONE);
		414	nameLabel.setText(Messages.TaskWorkingSetPage_Name);
		415	text = new Text(nameComposite, SWT.SINGLE \| SWT.BORDER);
410	text.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL \| GridData.HORIZONTAL_ALIGN_FILL));	416	text.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL \| GridData.HORIZONTAL_ALIGN_FILL));
411	text.addModifyListener(new ModifyListener() {	417	text.addModifyListener(new ModifyListener() {
412	public void modifyText(ModifyEvent e) {	418	public void modifyText(ModifyEvent e) {
Lines 416-427 Link Here
416	text.setFocus();	422	text.setFocus();
417	// text.setBackground(FieldAssistColors.getRequiredFieldBackgroundColor(text));	423	// text.setBackground(FieldAssistColors.getRequiredFieldBackgroundColor(text));
418		424
419	label = new Label(composite, SWT.WRAP);	425	Label label = new Label(composite, SWT.WRAP);
420	label.setText(""); //$NON-NLS-1$	426	label.setText(""); //$NON-NLS-1$
421	label.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL \| GridData.HORIZONTAL_ALIGN_FILL	427	label.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL \| GridData.HORIZONTAL_ALIGN_FILL
422	\| GridData.VERTICAL_ALIGN_CENTER));	428	\| GridData.VERTICAL_ALIGN_CENTER));
423		429	treeViewer = (CheckboxTreeViewer) new EnhancedFilteredTree(composite, SWT.NONE, new SubstringPatternFilter(),
424	treeViewer = new CheckboxTreeViewer(composite);	430	true) {
		431	@Override
		432	protected TreeViewer doCreateTreeViewer(Composite parent, int style) {
		433	return new CheckboxTreeViewer(parent, style);
		434	}
		435	}.getViewer();
425	treeViewer.setUseHashlookup(true);	436	treeViewer.setUseHashlookup(true);
426	treeViewer.setContentProvider(workingSetPageContentProvider);	437	treeViewer.setContentProvider(workingSetPageContentProvider);
427		438

Lines 10-15 Link Here

(-)a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/messages.properties (+1 lines)
10	###############################################################################	10	###############################################################################
11	TaskWorkingSetPage_The_name_must_not_be_empty=The name must not be empty.	11	TaskWorkingSetPage_The_name_must_not_be_empty=The name must not be empty.
12	TaskWorkingSetPage_The_name_must_not_have_a_leading_or_trailing_whitespace=The name must not have a leading or trailing whitespace.	12	TaskWorkingSetPage_The_name_must_not_have_a_leading_or_trailing_whitespace=The name must not have a leading or trailing whitespace.
		13	TaskWorkingSetPage_Name=Name:
13	TaskWorkingSetPage_No_categories_queries_selected=No categories/queries selected.	14	TaskWorkingSetPage_No_categories_queries_selected=No categories/queries selected.
14	TaskWorkingSetPage_Resources=Resources	15	TaskWorkingSetPage_Resources=Resources
15	TaskWorkingSetPage_Select_Working_Set_Elements=Select Working Set Elements	16	TaskWorkingSetPage_Select_Working_Set_Elements=Select Working Set Elements

Return to bug 363975