Attachment #153117 for bug #178474

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

Lines 46-59 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/AttachmentTableLabelProvider.java (-7 / +18 lines)
46		46
47	private final AttributeEditorToolkit attributeEditorToolkit;	47	private final AttributeEditorToolkit attributeEditorToolkit;
48		48
49	public AttachmentTableLabelProvider(TaskDataModel model, AttributeEditorToolkit attributeEditorToolkit) {	49	int offset;
		50
		51	public AttachmentTableLabelProvider(TaskDataModel model, AttributeEditorToolkit attributeEditorToolkit, int offset) {
50	this.model = model;	52	this.model = model;
51	this.attributeEditorToolkit = attributeEditorToolkit;	53	this.attributeEditorToolkit = attributeEditorToolkit;
		54	this.offset = offset;
52	}	55	}
53		56
54	public Image getColumnImage(Object element, int columnIndex) {	57	public Image getColumnImage(Object element, int columnIndex) {
55	ITaskAttachment attachment = (ITaskAttachment) element;	58	ITaskAttachment attachment = (ITaskAttachment) element;
56	if (columnIndex == 0) {	59	if (columnIndex == 1 + offset) {
57	if (AttachmentUtil.isContext(attachment)) {	60	if (AttachmentUtil.isContext(attachment)) {
58	return CommonImages.getImage(TasksUiImages.CONTEXT_TRANSFER);	61	return CommonImages.getImage(TasksUiImages.CONTEXT_TRANSFER);
59	} else if (attachment.isPatch()) {	62	} else if (attachment.isPatch()) {
Lines 80-87 Link Here
80		83
81	public String getColumnText(Object element, int columnIndex) {	84	public String getColumnText(Object element, int columnIndex) {
82	ITaskAttachment attachment = (ITaskAttachment) element;	85	ITaskAttachment attachment = (ITaskAttachment) element;
83	switch (columnIndex) {	86	switch (columnIndex - offset) {
84	case 0:	87	case 0:
		88	String a = attachment.getUrl();
		89	int i = a.indexOf("?id="); //$NON-NLS-1$
		90	if (i != -1) {
		91	return a.substring(i + 4);
		92	} else {
		93	return ""; //$NON-NLS-1$
		94	}
		95	case 1:
85	if (AttachmentUtil.isContext(attachment)) {	96	if (AttachmentUtil.isContext(attachment)) {
86	return Messages.AttachmentTableLabelProvider_Task_Context;	97	return Messages.AttachmentTableLabelProvider_Task_Context;
87	} else if (attachment.isPatch()) {	98	} else if (attachment.isPatch()) {
Lines 89-105 Link Here
89	} else {	100	} else {
90	return " " + attachment.getFileName(); //$NON-NLS-1$	101	return " " + attachment.getFileName(); //$NON-NLS-1$
91	}	102	}
92	case 1:
93	return attachment.getDescription();
94	case 2:	103	case 2:
		104	return attachment.getDescription();
		105	case 3:
95	Long length = attachment.getLength();	106	Long length = attachment.getLength();
96	if (length < 0) {	107	if (length < 0) {
97	return "-"; //$NON-NLS-1$	108	return "-"; //$NON-NLS-1$
98	}	109	}
99	return sizeFormatter.format(length);	110	return sizeFormatter.format(length);
100	case 3:
101	return (attachment.getAuthor() != null) ? attachment.getAuthor().toString() : ""; //$NON-NLS-1$
102	case 4:	111	case 4:
		112	return (attachment.getAuthor() != null) ? attachment.getAuthor().toString() : ""; //$NON-NLS-1$
		113	case 5:
103	return (attachment.getCreationDate() != null) ? EditorUtil.formatDateTime(attachment.getCreationDate())	114	return (attachment.getCreationDate() != null) ? EditorUtil.formatDateTime(attachment.getCreationDate())
104	: ""; //$NON-NLS-1$	115	: ""; //$NON-NLS-1$
105	}	116	}

Lines 13-28 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorAttachmentPart.java (-71 / +153 lines)
13		13
14	package org.eclipse.mylyn.internal.tasks.ui.editors;	14	package org.eclipse.mylyn.internal.tasks.ui.editors;
15		15
		16	import java.io.File;
16	import java.util.ArrayList;	17	import java.util.ArrayList;
17	import java.util.Date;	18	import java.util.Date;
18	import java.util.List;	19	import java.util.List;
19		20
		21	import org.eclipse.core.runtime.IPath;
		22	import org.eclipse.core.runtime.Platform;
20	import org.eclipse.jface.action.Action;	23	import org.eclipse.jface.action.Action;
21	import org.eclipse.jface.action.IMenuListener;	24	import org.eclipse.jface.action.IMenuListener;
22	import org.eclipse.jface.action.IMenuManager;	25	import org.eclipse.jface.action.IMenuManager;
23	import org.eclipse.jface.action.MenuManager;	26	import org.eclipse.jface.action.MenuManager;
24	import org.eclipse.jface.action.ToolBarManager;	27	import org.eclipse.jface.action.ToolBarManager;
25	import org.eclipse.jface.layout.GridDataFactory;
26	import org.eclipse.jface.viewers.ArrayContentProvider;	28	import org.eclipse.jface.viewers.ArrayContentProvider;
27	import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;	29	import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
28	import org.eclipse.jface.viewers.IOpenListener;	30	import org.eclipse.jface.viewers.IOpenListener;
Lines 34-40 Link Here
34	import org.eclipse.jface.window.ToolTip;	36	import org.eclipse.jface.window.ToolTip;
35	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;	37	import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
36	import org.eclipse.mylyn.internal.tasks.core.TaskAttachment;	38	import org.eclipse.mylyn.internal.tasks.core.TaskAttachment;
		39	import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
		40	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
37	import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiMenus;	41	import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiMenus;
		42	import org.eclipse.mylyn.internal.tasks.ui.views.AbstractTableViewerConfigurator;
38	import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskAttachmentWizard.Mode;	43	import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskAttachmentWizard.Mode;
39	import org.eclipse.mylyn.tasks.core.ITaskAttachment;	44	import org.eclipse.mylyn.tasks.core.ITaskAttachment;
40	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;	45	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
Lines 49-59 Link Here
49	import org.eclipse.swt.widgets.Composite;	54	import org.eclipse.swt.widgets.Composite;
50	import org.eclipse.swt.widgets.Label;	55	import org.eclipse.swt.widgets.Label;
51	import org.eclipse.swt.widgets.Menu;	56	import org.eclipse.swt.widgets.Menu;
52	import org.eclipse.swt.widgets.Table;
53	import org.eclipse.swt.widgets.TableColumn;
54	import org.eclipse.ui.forms.events.ExpansionAdapter;	57	import org.eclipse.ui.forms.events.ExpansionAdapter;
55	import org.eclipse.ui.forms.events.ExpansionEvent;	58	import org.eclipse.ui.forms.events.ExpansionEvent;
56	import org.eclipse.ui.forms.widgets.FormToolkit;	59	import org.eclipse.ui.forms.widgets.FormToolkit;
		60	import org.eclipse.ui.forms.widgets.ScrolledForm;
57	import org.eclipse.ui.forms.widgets.Section;	61	import org.eclipse.ui.forms.widgets.Section;
58		62
59	/**	63	/**
Lines 65-76 Link Here
65		69
66	private static final String ID_POPUP_MENU = "org.eclipse.mylyn.tasks.ui.editor.menu.attachments"; //$NON-NLS-1$	70	private static final String ID_POPUP_MENU = "org.eclipse.mylyn.tasks.ui.editor.menu.attachments"; //$NON-NLS-1$
67		71
68	private final String[] attachmentsColumns = { Messages.TaskEditorAttachmentPart_Name,
69	Messages.TaskEditorAttachmentPart_Description, /"Type", /Messages.TaskEditorAttachmentPart_Size,
70	Messages.TaskEditorAttachmentPart_Creator, Messages.TaskEditorAttachmentPart_Created };
71
72	private final int[] attachmentsColumnWidths = { 130, 150, /100,/70, 100, 100 };
73
74	private List<TaskAttribute> attachments;	72	private List<TaskAttribute> attachments;
75		73
76	private boolean hasIncoming;	74	private boolean hasIncoming;
Lines 79-150 Link Here
79		77
80	private Composite attachmentsComposite;	78	private Composite attachmentsComposite;
81		79
82	public TaskEditorAttachmentPart() {	80	private class AttachmentTableViewer extends AbstractTableViewerConfigurator {
83	setPartName(Messages.TaskEditorAttachmentPart_Attachments);
84	}
85		81
86	private void createAttachmentTable(FormToolkit toolkit, final Composite attachmentsComposite) {	82	public AttachmentTableViewer(File stateFile) {
87	Table attachmentsTable = toolkit.createTable(attachmentsComposite, SWT.MULTI \| SWT.FULL_SELECTION);	83	super(stateFile);
88	attachmentsTable.setLinesVisible(true);	84	// ignore
89	attachmentsTable.setHeaderVisible(true);	85	}
90	attachmentsTable.setLayout(new GridLayout());
91	GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, false).hint(500, SWT.DEFAULT).applyTo(
92	attachmentsTable);
93	attachmentsTable.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);
94
95	for (int i = 0; i < attachmentsColumns.length; i++) {
96	TableColumn column = new TableColumn(attachmentsTable, SWT.LEFT, i);
97	column.setText(attachmentsColumns[i]);
98	column.setWidth(attachmentsColumnWidths[i]);
99	}
100	// size column
101	attachmentsTable.getColumn(2).setAlignment(SWT.RIGHT);
102
103	TableViewer attachmentsViewer = new TableViewer(attachmentsTable);
104	attachmentsViewer.setUseHashlookup(true);
105	attachmentsViewer.setColumnProperties(attachmentsColumns);
106	ColumnViewerToolTipSupport.enableFor(attachmentsViewer, ToolTip.NO_RECREATE);
107		86
108	attachmentsViewer.setSorter(new ViewerSorter() {	87	@Override
109	@Override	88	protected void adjustColumInfos() {
110	public int compare(Viewer viewer, Object e1, Object e2) {	89	boolean showAttachmentID = TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
111	ITaskAttachment attachment1 = (ITaskAttachment) e1;	90	ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID);
112	ITaskAttachment attachment2 = (ITaskAttachment) e2;	91	int idWidth = columnInfos.get(0).getWidths();
113	Date created1 = attachment1.getCreationDate();	92	if (!showAttachmentID && idWidth > 0) {
114	Date created2 = attachment2.getCreationDate();	93	columnInfos.get(0).setWidths(0);
115	if (created1 != null && created2 != null) {	94	} else if (showAttachmentID && idWidth == 0) {
116	return created1.compareTo(created2);	95	columnInfos.get(0).setWidths(70);
117	} else if (created1 == null && created2 != null) {	96	}
118	return -1;	97
119	} else if (created1 != null && created2 == null) {	98	}
120	return 1;	99
121	} else {	100	@Override
122	return 0;	101	protected void setDefaultColumnInfos() {
		102	columnInfos.add(new ColumnState(Messages.TaskEditorAttachmentPart_Id, 70));
		103	columnInfos.add(new ColumnState(Messages.TaskEditorAttachmentPart_Name, 130));
		104	columnInfos.add(new ColumnState(Messages.TaskEditorAttachmentPart_Description, 150));
		105	ColumnState columnState = new ColumnState(Messages.TaskEditorAttachmentPart_Size, 70);
		106	columnState.setAlignment(SWT.RIGHT);
		107	columnInfos.add(columnState);
		108	columnInfos.add(new ColumnState(Messages.TaskEditorAttachmentPart_Creator, 100));
		109	columnInfos.add(new ColumnState(Messages.TaskEditorAttachmentPart_Created, 100));
		110
		111	orderArray = new int[6];
		112	for (int i = 0; i < 6; i++) {
		113	orderArray[i] = i;
		114	}
		115
		116	}
		117
		118	@Override
		119	protected void setupTableViewer() {
		120	tableViewer.setUseHashlookup(true);
		121	ColumnViewerToolTipSupport.enableFor(tableViewer, ToolTip.NO_RECREATE);
		122
		123	tableViewer.setSorter(new ViewerSorter() {
		124	@Override
		125	public int compare(Viewer viewer, Object e1, Object e2) {
		126	ITaskAttachment attachment1 = (ITaskAttachment) e1;
		127	ITaskAttachment attachment2 = (ITaskAttachment) e2;
		128	Date created1 = attachment1.getCreationDate();
		129	Date created2 = attachment2.getCreationDate();
		130	if (created1 != null && created2 != null) {
		131	return created1.compareTo(created2);
		132	} else if (created1 == null && created2 != null) {
		133	return -1;
		134	} else if (created1 != null && created2 == null) {
		135	return 1;
		136	} else {
		137	return 0;
		138	}
123	}	139	}
		140	});
		141	List<ITaskAttachment> attachmentList = new ArrayList<ITaskAttachment>(attachments.size());
		142	for (TaskAttribute attribute : attachments) {
		143	TaskAttachment taskAttachment = new TaskAttachment(getModel().getTaskRepository(),
		144	getModel().getTask(), attribute);
		145	getTaskData().getAttributeMapper().updateTaskAttachment(taskAttachment, attribute);
		146	attachmentList.add(taskAttachment);
124	}	147	}
125	});	148	tableViewer.setContentProvider(new ArrayContentProvider());
		149	tableViewer.setLabelProvider(new AttachmentTableLabelProvider(getModel(),
		150	getTaskEditorPage().getAttributeEditorToolkit(), 0));
		151	tableViewer.addOpenListener(new IOpenListener() {
		152	public void open(OpenEvent event) {
		153	if (!event.getSelection().isEmpty()) {
		154	StructuredSelection selection = (StructuredSelection) event.getSelection();
		155	ITaskAttachment attachment = (ITaskAttachment) selection.getFirstElement();
		156	TasksUiUtil.openUrl(attachment.getUrl());
		157	}
		158	}
		159	});
		160	tableViewer.addSelectionChangedListener(getTaskEditorPage());
		161	tableViewer.setInput(attachmentList.toArray());
		162	}
		163
		164	}
		165
		166	private AttachmentTableViewer attachmentsViewer;
126		167
127	List<ITaskAttachment> attachmentList = new ArrayList<ITaskAttachment>(attachments.size());	168	private boolean propertyListenerIstalled = false;
128	for (TaskAttribute attribute : attachments) {	169
129	TaskAttachment taskAttachment = new TaskAttachment(getModel().getTaskRepository(), getModel().getTask(),	170	private final org.eclipse.jface.util.IPropertyChangeListener PROPERTY_LISTENER = new org.eclipse.jface.util.IPropertyChangeListener() {
130	attribute);	171
131	getTaskData().getAttributeMapper().updateTaskAttachment(taskAttachment, attribute);	172	public void propertyChange(org.eclipse.jface.util.PropertyChangeEvent event) {
132	attachmentList.add(taskAttachment);	173	if (event.getProperty().equals(ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD)) {
133	}	174	if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
134	attachmentsViewer.setContentProvider(new ArrayContentProvider());	175	ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD)) {
135	attachmentsViewer.setLabelProvider(new AttachmentTableLabelProvider(getModel(),	176	attachmentsViewer.resetColumnInfosToDefault();
136	getTaskEditorPage().getAttributeEditorToolkit()));	177	if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
137	attachmentsViewer.addOpenListener(new IOpenListener() {	178	ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID)) {
138	public void open(OpenEvent event) {	179	attachmentsViewer.getTable().getColumn(0).setWidth(70);
139	if (!event.getSelection().isEmpty()) {	180	} else {
140	StructuredSelection selection = (StructuredSelection) event.getSelection();	181	attachmentsViewer.getTable().getColumn(0).setWidth(0);
141	ITaskAttachment attachment = (ITaskAttachment) selection.getFirstElement();	182	}
142	TasksUiUtil.openUrl(attachment.getUrl());	183	TasksUiPlugin.getDefault().getPreferenceStore().setValue(
		184	ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD, false);
		185	}
		186	} else if (event.getProperty().equals(ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID)) {
		187	if (TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
		188	ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID)) {
		189	attachmentsViewer.getTable().getColumn(0).setWidth(70);
		190	} else {
		191	attachmentsViewer.getTable().getColumn(0).setWidth(0);
143	}	192	}
144	}	193	}
145	});	194
146	attachmentsViewer.addSelectionChangedListener(getTaskEditorPage());	195	}
147	attachmentsViewer.setInput(attachmentList.toArray());	196	};
		197
		198	public TaskEditorAttachmentPart() {
		199	setPartName(Messages.TaskEditorAttachmentPart_Attachments);
		200	}
		201
		202	private void createAttachmentTable(FormToolkit toolkit, final Composite attachmentsComposite) {
		203	IPath stateLocation = Platform.getStateLocation(TasksUiPlugin.getDefault().getBundle());
		204	File attachmentStateFile = stateLocation.append("TaskEditorAttachment.obj").toFile(); //$NON-NLS-1$
		205	attachmentsViewer = new AttachmentTableViewer(attachmentStateFile);
		206	attachmentsViewer.create(toolkit, attachmentsComposite, 5);
148		207
149	menuManager = new MenuManager();	208	menuManager = new MenuManager();
150	menuManager.setRemoveAllWhenShown(true);	209	menuManager.setRemoveAllWhenShown(true);
Lines 154-161 Link Here
154	}	213	}
155	});	214	});
156	getTaskEditorPage().getEditorSite().registerContextMenu(ID_POPUP_MENU, menuManager, attachmentsViewer, true);	215	getTaskEditorPage().getEditorSite().registerContextMenu(ID_POPUP_MENU, menuManager, attachmentsViewer, true);
157	Menu menu = menuManager.createContextMenu(attachmentsTable);	216	Menu menu = menuManager.createContextMenu(attachmentsViewer.getTable());
158	attachmentsTable.setMenu(menu);	217	attachmentsViewer.getTable().setMenu(menu);
159	}	218	}
160		219
161	private void createButtons(Composite attachmentsComposite, FormToolkit toolkit) {	220	private void createButtons(Composite attachmentsComposite, FormToolkit toolkit) {
Lines 191-197 Link Here
191	initialize();	250	initialize();
192		251
193	final Section section = createSection(parent, toolkit, hasIncoming);	252	final Section section = createSection(parent, toolkit, hasIncoming);
194	section.setText(getPartName() + " (" + attachments.size() + ")"); //$NON-NLS-1$ //$NON-NLS-2$	253	section.setText(getPartName() + " (" + attachments.size() + ")");
195	if (hasIncoming) {	254	if (hasIncoming) {
196	expandSection(toolkit, section);	255	expandSection(toolkit, section);
197	} else {	256	} else {
Lines 237-242 Link Here
237	}	296	}
238		297
239	private void initialize() {	298	private void initialize() {
		299	if (!propertyListenerIstalled) {
		300	TasksUiPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER);
		301	propertyListenerIstalled = true;
		302	}
240	attachments = getTaskData().getAttributeMapper().getAttributesByType(getTaskData(),	303	attachments = getTaskData().getAttributeMapper().getAttributesByType(getTaskData(),
241	TaskAttribute.TYPE_ATTACHMENT);	304	TaskAttribute.TYPE_ATTACHMENT);
242	for (TaskAttribute attachmentAttribute : attachments) {	305	for (TaskAttribute attachmentAttribute : attachments) {
Lines 260-263 Link Here
260	toolBarManager.add(attachFileAction);	323	toolBarManager.add(attachFileAction);
261	}	324	}
262		325
		326	public void selectAttachment(ScrolledForm form, TaskAttribute attribute) {
		327	TableViewer tv = attachmentsViewer.getTableViewer();
		328	int anz = tv.getTable().getItemCount();
		329	int i = 0;
		330	tv.getTable().setSelection(0, 0);
		331	EditorUtil.focusOn(form, tv.getControl());
		332	for (; i < anz; i++) {
		333	TaskAttachment tableItem = (TaskAttachment) tv.getElementAt(i);
		334	if (tableItem.getTaskAttribute().equals(attribute)) {
		335	tv.getTable().setSelection(i, i);
		336	break;
		337	}
		338	}
		339	}
		340
		341	public void resetSelectedAttachment(ScrolledForm form) {
		342	TableViewer tv = attachmentsViewer.getTableViewer();
		343	tv.getTable().deselectAll();
		344	}
263	}	345	}

Lines 62-67 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/messages.properties (+2 lines)
62	TaskEditorAttachmentPart_Created=Created	62	TaskEditorAttachmentPart_Created=Created
63	TaskEditorAttachmentPart_Creator=Creator	63	TaskEditorAttachmentPart_Creator=Creator
64	TaskEditorAttachmentPart_Description=Description	64	TaskEditorAttachmentPart_Description=Description
		65	TaskEditorAttachmentPart_Id=Id
65	TaskEditorAttachmentPart_Name=Name	66	TaskEditorAttachmentPart_Name=Name
66	TaskEditorAttachmentPart_No_attachments=No attachments	67	TaskEditorAttachmentPart_No_attachments=No attachments
67	TaskEditorAttachmentPart_Size=Size	68	TaskEditorAttachmentPart_Size=Size
Lines 89-94 Link Here
89	TaskEditorOutlineNode_Description=Description	90	TaskEditorOutlineNode_Description=Description
90	TaskEditorOutlineNode_New_Comment=New Comment	91	TaskEditorOutlineNode_New_Comment=New Comment
91	TaskEditorOutlineNode_Task_=Task	92	TaskEditorOutlineNode_Task_=Task
		93	TaskEditorOutlineNode_Attachments=Attachments
92		94
93	TaskEditorPeoplePart_People=People	95	TaskEditorPeoplePart_People=People
94		96

Lines 115-120 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/Messages.java (+4 lines)
115		115
116	public static String TaskEditorAttachmentPart_Description;	116	public static String TaskEditorAttachmentPart_Description;
117		117
		118	public static String TaskEditorAttachmentPart_Id;
		119
118	public static String TaskEditorAttachmentPart_Name;	120	public static String TaskEditorAttachmentPart_Name;
119		121
120	public static String TaskEditorAttachmentPart_No_attachments;	122	public static String TaskEditorAttachmentPart_No_attachments;
Lines 161-166 Link Here
161		163
162	public static String TaskEditorOutlineNode_Task_;	164	public static String TaskEditorOutlineNode_Task_;
163		165
		166	public static String TaskEditorOutlineNode_Attachments;
		167
164	public static String TaskEditorPeoplePart_People;	168	public static String TaskEditorPeoplePart_People;
165		169
166	public static String TaskEditorPlanningPart_0_SECOUNDS;	170	public static String TaskEditorPlanningPart_0_SECOUNDS;

Lines 18-23 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorOutlineNode.java (+40 lines)
18	import org.eclipse.core.runtime.Assert;	18	import org.eclipse.core.runtime.Assert;
19	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;	19	import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
20	import org.eclipse.mylyn.tasks.core.IRepositoryPerson;	20	import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
		21	import org.eclipse.mylyn.tasks.core.ITaskAttachment;
21	import org.eclipse.mylyn.tasks.core.ITaskComment;	22	import org.eclipse.mylyn.tasks.core.ITaskComment;
22	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;	23	import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
23	import org.eclipse.mylyn.tasks.core.data.TaskData;	24	import org.eclipse.mylyn.tasks.core.data.TaskData;
Lines 35-40 Link Here
35		36
36	public static final String LABEL_NEW_COMMENT = Messages.TaskEditorOutlineNode_New_Comment;	37	public static final String LABEL_NEW_COMMENT = Messages.TaskEditorOutlineNode_New_Comment;
37		38
		39	public static final String LABEL_ATTACHMENTS = Messages.TaskEditorOutlineNode_Attachments;
		40
38	private static TaskEditorOutlineNode createNode(TaskData taskData, String attributeId, String label) {	41	private static TaskEditorOutlineNode createNode(TaskData taskData, String attributeId, String label) {
39	TaskAttribute taskAttribute = taskData.getRoot().getMappedAttribute(attributeId);	42	TaskAttribute taskAttribute = taskData.getRoot().getMappedAttribute(attributeId);
40	if (taskAttribute != null) {	43	if (taskAttribute != null) {
Lines 69-74 Link Here
69	node.setTaskComment(taskComment);	72	node.setTaskComment(taskComment);
70	return node;	73	return node;
71	}	74	}
		75	} else if (TaskAttribute.TYPE_ATTACHMENT.equals(type)) {
		76	ITaskAttachment taskAttachment = TasksUiPlugin.getRepositoryModel().createTaskAttachment(taskAttribute);
		77	if (taskAttachment != null) {
		78	taskAttribute.getTaskData().getAttributeMapper().updateTaskAttachment(taskAttachment, taskAttribute);
		79	StringBuilder sb = new StringBuilder();
		80	sb.append(taskAttachment.getTaskAttribute().getValue());
		81	sb.append(": "); //$NON-NLS-1$
		82	sb.append(taskAttachment.getFileName());
		83
		84	TaskEditorOutlineNode node = new TaskEditorOutlineNode(sb.toString(), taskAttribute);
		85	node.setTaskAttachment(taskAttachment);
		86	return node;
		87	}
72	} else {	88	} else {
73	String label = taskAttribute.getTaskData().getAttributeMapper().getValueLabel(taskAttribute);	89	String label = taskAttribute.getTaskData().getAttributeMapper().getValueLabel(taskAttribute);
74	return new TaskEditorOutlineNode(label, taskAttribute);	90	return new TaskEditorOutlineNode(label, taskAttribute);
Lines 82-87 Link Here
82	rootNode = new TaskEditorOutlineNode(Messages.TaskEditorOutlineNode_Task_ + taskData.getTaskId());	98	rootNode = new TaskEditorOutlineNode(Messages.TaskEditorOutlineNode_Task_ + taskData.getTaskId());
83	}	99	}
84	addNode(rootNode, taskData, TaskAttribute.DESCRIPTION, LABEL_DESCRIPTION);	100	addNode(rootNode, taskData, TaskAttribute.DESCRIPTION, LABEL_DESCRIPTION);
		101
		102	List<TaskAttribute> attachments = taskData.getAttributeMapper().getAttributesByType(taskData,
		103	TaskAttribute.TYPE_ATTACHMENT);
		104	if (attachments.size() > 0) {
		105	TaskEditorOutlineNode attachmentNode = new TaskEditorOutlineNode(LABEL_ATTACHMENTS);
		106	rootNode.addChild(attachmentNode);
		107	for (TaskAttribute attachmentAttribute : attachments) {
		108	TaskEditorOutlineNode node = createNode(attachmentAttribute);
		109	if (node != null) {
		110	attachmentNode.addChild(node);
		111	}
		112	}
		113	}
		114
85	List<TaskAttribute> comments = taskData.getAttributeMapper().getAttributesByType(taskData,	115	List<TaskAttribute> comments = taskData.getAttributeMapper().getAttributesByType(taskData,
86	TaskAttribute.TYPE_COMMENT);	116	TaskAttribute.TYPE_COMMENT);
87	if (comments.size() > 0) {	117	if (comments.size() > 0) {
Lines 118-123 Link Here
118		148
119	private ITaskComment taskComment;	149	private ITaskComment taskComment;
120		150
		151	private ITaskAttachment taskAttachment;
		152
121	public TaskEditorOutlineNode(String label) {	153	public TaskEditorOutlineNode(String label) {
122	this(label, null);	154	this(label, null);
123	}	155	}
Lines 183-186 Link Here
183	return getLabel();	215	return getLabel();
184	}	216	}
185		217
		218	public ITaskAttachment getTaskAttachment() {
		219	return taskAttachment;
		220	}
		221
		222	public void setTaskAttachment(ITaskAttachment taskAttachment) {
		223	this.taskAttachment = taskAttachment;
		224	}
		225
186	}	226	}

Lines 153-159 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java (-1 / +1 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();




					ISelection selection = event.getSelection();
					if (selection instanceof StructuredSelection) {
						Object select = ((StructuredSelection) selection).getFirstElement();
						TaskEditorAttachmentPart attachmentPart = (TaskEditorAttachmentPart) getPart(ID_PART_ATTACHMENTS);
						if (select instanceof TaskEditorOutlineNode) {
							TaskEditorOutlineNode node = (TaskEditorOutlineNode) select;
							TaskAttribute attribute = node.getData();

											}
										}
									}
									attachmentPart.resetSelectedAttachment(form);
									EditorUtil.reveal(form, attribute.getId());
								} else if (TaskAttribute.TYPE_ATTACHMENT.equals(attribute.getMetaData().getType())) {
									AbstractTaskEditorPart actionPart = getPart(ID_PART_ATTACHMENTS);
									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);
													}
												}
											}
										}
									}
									attachmentPart.selectAttachment(form, attribute);
								}
								EditorUtil.reveal(form, attribute.getId());
							} else {
								attachmentPart.resetSelectedAttachment(form);
								EditorUtil.reveal(form, node.getLabel());
							}
							getEditor().setActivePage(getId());

Lines 88-91 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/Messages.java (+7 lines)
88	public static String TasksUiPreferencePage_Web_Browser;	88	public static String TasksUiPreferencePage_Web_Browser;
89		89
90	public static String TasksUiPreferencePage_Week_Start;	90	public static String TasksUiPreferencePage_Week_Start;
		91
		92	public static String TasksUiPreferencePage_Attachment_Table;
		93
		94	public static String TasksUiPreferencePage_Attachment_Show_Id;
		95
		96	public static String TasksUiPreferencePage_Attachment_Coloumn_To_Std;
		97
91	}	98	}

Lines 75-80 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java (-1 / +37 lines)
75		75
76	private Button useRichEditor;	76	private Button useRichEditor;
77		77
		78	private Button attachmentShowID;
		79
		80	private Button attachmentColumnUseStdWidth;
		81
78	private Button useWebBrowser;	82	private Button useWebBrowser;
79		83
80	private Text synchScheduleTime = null;	84	private Text synchScheduleTime = null;
Lines 122-127 Link Here
122	createSchedulingGroup(container);	126	createSchedulingGroup(container);
123	createOpenWith(container);	127	createOpenWith(container);
124	createTaskActivityGroup(container);	128	createTaskActivityGroup(container);
		129
125	Composite advanced = createAdvancedSection(container);	130	Composite advanced = createAdvancedSection(container);
126	createTaskDataControl(advanced);	131	createTaskDataControl(advanced);
127		132
Lines 132-137 Link Here
132	}	137	}
133		138
134	createLinks(advanced);	139	createLinks(advanced);
		140	createAttachmentTable(advanced);
135	updateRefreshGroupEnablements();	141	updateRefreshGroupEnablements();
136	applyDialogFont(container);	142	applyDialogFont(container);
137	return container;	143	return container;
Lines 237-242 Link Here
237	// shouldn't get here	243	// shouldn't get here
238	}	244	}
239	}	245	}
		246	getPreferenceStore().setValue(ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID, attachmentShowID.getSelection());
		247	getPreferenceStore().setValue(ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD,
		248	attachmentColumnUseStdWidth.getSelection());
		249	attachmentColumnUseStdWidth.setSelection(false);
240		250
241	return true;	251	return true;
242	}	252	}
Lines 274-279 Link Here
274	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(	284	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getBoolean(
275	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));	285	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
276		286
		287	attachmentShowID.setSelection(getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID));
		288	attachmentColumnUseStdWidth.setSelection(getPreferenceStore().getBoolean(
		289	ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD));
277	return true;	290	return true;
278	}	291	}
279		292
Lines 322-327 Link Here
322	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(	335	activityTrackingEnabledButton.setSelection(MonitorUiPlugin.getDefault().getPreferenceStore().getDefaultBoolean(
323	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));	336	MonitorUiPlugin.ACTIVITY_TRACKING_ENABLED));
324		337
		338	attachmentShowID.setSelection(getPreferenceStore().getDefaultBoolean(
		339	ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID));
		340	attachmentColumnUseStdWidth.setSelection(getPreferenceStore().getDefaultBoolean(
		341	ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD));
		342
325	updateRefreshGroupEnablements();	343	updateRefreshGroupEnablements();
326	}	344	}
327		345
Lines 369-378 Link Here
369		387
370	}	388	}
371		389
		390	private void createAttachmentTable(Composite parent) {
		391	Group attachmentContainer = new Group(parent, SWT.SHADOW_ETCHED_IN);
		392	attachmentContainer.setLayout(new GridLayout(2, false));
		393	attachmentContainer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		394	attachmentContainer.setText(Messages.TasksUiPreferencePage_Attachment_Table);
		395
		396	attachmentColumnUseStdWidth = new Button(attachmentContainer, SWT.CHECK);
		397	attachmentColumnUseStdWidth.setText(Messages.TasksUiPreferencePage_Attachment_Coloumn_To_Std);
		398	attachmentColumnUseStdWidth.setSelection(getPreferenceStore().getBoolean(
		399	ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD));
		400
		401	attachmentShowID = new Button(attachmentContainer, SWT.CHECK);
		402	attachmentShowID.setText(Messages.TasksUiPreferencePage_Attachment_Show_Id);
		403	attachmentShowID.setSelection(getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID));
		404
		405	}
		406
372	private void createOpenWith(Composite parent) {	407	private void createOpenWith(Composite parent) {
373	Group container = new Group(parent, SWT.SHADOW_ETCHED_IN);	408	Group container = new Group(parent, SWT.SHADOW_ETCHED_IN);
374	container.setLayout(new GridLayout(3, false));	409	container.setLayout(new GridLayout(2, false));
375	container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	410	container.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		411	// container.setLayoutData(new GridData(SWT.LEFT, 1, true, true));
376		412
377	container.setText(Messages.TasksUiPreferencePage_Task_Editing);	413	container.setText(Messages.TasksUiPreferencePage_Task_Editing);
378	useRichEditor = new Button(container, SWT.RADIO);	414	useRichEditor = new Button(container, SWT.RADIO);

Lines 40-42 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/preferences/messages.properties (+3 lines)
40	TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks=Use the Restore dialog to recover missing tasks	40	TasksUiPreferencePage_Use_the_Restore_dialog_to_recover_missing_tasks=Use the Restore dialog to recover missing tasks
41	TasksUiPreferencePage_Web_Browser=Web Browser	41	TasksUiPreferencePage_Web_Browser=Web Browser
42	TasksUiPreferencePage_Week_Start=Week Start:	42	TasksUiPreferencePage_Week_Start=Week Start:
		43	TasksUiPreferencePage_Attachment_Table=Task Editor Attachment Table
		44	TasksUiPreferencePage_Attachment_Show_Id=Show Attachment ID
		45	TasksUiPreferencePage_Attachment_Coloumn_To_Std=use standard ColumnInfo (undo not supported)

Lines 58-63 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/ITasksUiPreferenceConstants.java (+4 lines)
58		58
59	public static final String EDITOR_TASKS_RICH = "org.eclipse.mylyn.tasks.ui.reporting.open.editor"; //$NON-NLS-1$	59	public static final String EDITOR_TASKS_RICH = "org.eclipse.mylyn.tasks.ui.reporting.open.editor"; //$NON-NLS-1$
60		60
		61	public static final String ATTACHMENT_SHOW_ID = "org.eclipse.mylyn.tasks.ui.attachment.showid"; //$NON-NLS-1$
		62
		63	public static final String ATTACHMENT_COLUMN_TO_STD = "org.eclipse.mylyn.tasks.ui.attachment.column.to.std"; //$NON-NLS-1$
		64
61	public static final String USE_STRIKETHROUGH_FOR_COMPLETED = "org.eclipse.mylyn.tasks.ui.strikethrough.for.completed"; //$NON-NLS-1$	65	public static final String USE_STRIKETHROUGH_FOR_COMPLETED = "org.eclipse.mylyn.tasks.ui.strikethrough.for.completed"; //$NON-NLS-1$
62		66
63	public static final String REPOSITORY_SYNCH_SCHEDULE_ENABLED = "org.eclipse.mylyn.tasks.ui.repositories.synch.schedule"; //$NON-NLS-1$	67	public static final String REPOSITORY_SYNCH_SCHEDULE_ENABLED = "org.eclipse.mylyn.tasks.ui.repositories.synch.schedule"; //$NON-NLS-1$

Lines 889-894 Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java (+3 lines)
889	store.setDefault(ITasksUiPreferenceConstants.PLANNING_ENDHOUR, 18);	889	store.setDefault(ITasksUiPreferenceConstants.PLANNING_ENDHOUR, 18);
890		890
891	store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);	891	store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);
		892
		893	store.setDefault(ITasksUiPreferenceConstants.ATTACHMENT_SHOW_ID, false);
		894	store.setDefault(ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD, true);
892	}	895	}
893		896
894	public static TaskActivityManager getTaskActivityManager() {	897	public static TaskActivityManager getTaskActivityManager() {




/*******************************************************************************
 * Copyright (c) 2009 Frank Becker 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:
 *     Frank Becker - initial API and implementation
 *******************************************************************************/

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

import java.io.Serializable;

import org.eclipse.swt.SWT;
import org.eclipse.ui.IMemento;

public class ColumnState implements Serializable {

	private static final long serialVersionUID = -3746488897344479189L;

	private String name;

	private int widths;

	private int alignment;

	public ColumnState(String name, int widths) {
		super();
		this.name = name;
		this.widths = widths;
		alignment = SWT.LEFT;
	}

	public String getName() {
		return name;
	}

	public void setName(String name) {
		this.name = name;
	}

	public int getWidths() {
		return widths;
	}

	public void setWidths(int widths) {
		this.widths = widths;
	}

	public int getAlignment() {
		return alignment;
	}

	public void setAlignment(int alignment) {
		this.alignment = alignment;
	}

	public void saveState(IMemento memento) {
		IMemento child = memento.createChild("ColumnState"); //$NON-NLS-1$
		child.putString("name", name); //$NON-NLS-1$
		child.putInteger("widths", widths); //$NON-NLS-1$
		child.putInteger("alignment", alignment); //$NON-NLS-1$

	}

	public static ColumnState createState(IMemento memento) {
		ColumnState erg;
		erg = new ColumnState(memento.getString("name"), memento.getInteger("widths"));
		erg.setAlignment(memento.getInteger("alignment"));
		return erg;
	}

}




/*******************************************************************************
 * Copyright (c) 2009 Frank Becker 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:
 *     Frank Becker - initial API and implementation
 *******************************************************************************/

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

import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.mylyn.commons.core.StatusHandler;
import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.internal.tasks.ui.editors.ColumnState;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.XMLMemento;
import org.eclipse.ui.forms.widgets.FormToolkit;

public abstract class AbstractTableViewerConfigurator implements ISelectionProvider {
	protected TableViewer tableViewer;

	protected Table table;

	private final File stateFile;

	protected ArrayList<ColumnState> columnInfos;

	protected int[] orderArray;

	public AbstractTableViewerConfigurator(File stateFile) {
		super();
		this.stateFile = stateFile;
	}

	abstract protected void setDefaultColumnInfos();

	abstract protected void setupTableViewer();

	private void readStateFile() {
		if (stateFile.exists()) {
			try {
				FileReader reader = new FileReader(stateFile);
				try {
					XMLMemento memento = XMLMemento.createReadRoot(reader);
					IMemento child = memento.getChild("Columns"); //$NON-NLS-1$
					int size = child.getInteger("count"); //$NON-NLS-1$
					IMemento[] children = memento.getChildren("ColumnState"); //$NON-NLS-1$
					for (int i = 0; i < size; i++) {
						columnInfos.add(ColumnState.createState(children[i]));
					}
					String orderString = child.getString("order"); //$NON-NLS-1$
					String[] orderStringArray = orderString.split(","); //$NON-NLS-1$
					orderArray = new int[orderStringArray.length];
					for (int i = 0; i < orderStringArray.length; i++) {
						orderArray[i] = Integer.parseInt(orderStringArray[i]);
					}
				} catch (WorkbenchException e) {
					StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN,
							"The TableViewerState cache could not be read", e)); //$NON-NLS-1$
				} finally {
					reader.close();
				}
			} catch (IOException e) {
				StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN,
						"The TableViewerState cache could not be read", e)); //$NON-NLS-1$
			}
		}

	}

	protected void writeStateFile() {

		if (stateFile == null) {
			return;
		}

		XMLMemento memento = XMLMemento.createWriteRoot("TableViewerState"); //$NON-NLS-1$
		IMemento child = memento.createChild("Columns"); //$NON-NLS-1$
		child.putInteger("count", columnInfos.size()); //$NON-NLS-1$
		for (ColumnState col : columnInfos) {
			col.saveState(memento);
		}

		int[] colOrder = table.getColumnOrder();
		String orderString = ""; //$NON-NLS-1$
		for (int colPos : colOrder) {
			if (orderString.length() > 0) {
				orderString += ","; //$NON-NLS-1$
			}
			orderString += colPos;
		}
		child.putString("order", orderString); //$NON-NLS-1$

		try {
			FileWriter writer = new FileWriter(stateFile);
			try {
				memento.save(writer);
			} finally {
				writer.close();
			}
		} catch (IOException e) {
			StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN,
					"The TaskEditorAttachment cache could not be written", e)); //$NON-NLS-1$
		}
	}

	protected void adjustColumInfos() {

	}

	public void create(FormToolkit toolkit, Composite parent, int initialColumnCount) {
		table = createTable(parent, toolkit);
		columnInfos = new ArrayList<ColumnState>(initialColumnCount);
		readStateFile();
		if (columnInfos.size() == 0) {
			setDefaultColumnInfos();
		}
		adjustColumInfos();
		for (int index = 0; index < columnInfos.size(); index++) {
			ColumnState colState = columnInfos.get(index);
			final TableColumn column = new TableColumn(table, colState.getAlignment(), index);
			column.setText(colState.getName());
			column.setWidth(colState.getWidths());
			column.setMoveable(true);
			column.addControlListener(createColumnControlListener(table, column, index));
		}

		tableViewer = new TableViewer(table);
		table.setColumnOrder(orderArray);
		setupTableViewer();
	}

	protected ControlListener createColumnControlListener(Table table, final TableColumn column, final int index) {
		return new ControlListener() {

			public void controlResized(ControlEvent e) {
				if (!TasksUiPlugin.getDefault().getPreferenceStore().getBoolean(
						ITasksUiPreferenceConstants.ATTACHMENT_COLUMN_TO_STD)) {
					columnInfos.get(index).setWidths(column.getWidth());
					writeStateFile();
				}
			}

			public void controlMoved(ControlEvent e) {
				writeStateFile();
			}
		};

	}

	protected Table createTable(Composite parent, FormToolkit toolkit) {
		Table table = toolkit.createTable(parent, SWT.MULTI | SWT.FULL_SELECTION);
		table.setLinesVisible(true);
		table.setHeaderVisible(true);
		table.setLayout(new GridLayout());
		GridDataFactory.fillDefaults()
				.align(SWT.FILL, SWT.FILL)
				.grab(true, false)
				.hint(500, SWT.DEFAULT)
				.applyTo(table);
		table.setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TREE_BORDER);

		return table;
	}

	public Table getTable() {
		return table;
	}

	public void resetColumnInfosToDefault() {
		columnInfos.clear();
		setDefaultColumnInfos();
		for (int index = 0; index < columnInfos.size(); index++) {
			TableColumn col = table.getColumn(index);
			ColumnState colState = columnInfos.get(index);
			col.setAlignment(colState.getAlignment());
			col.setWidth(colState.getWidths());
			col.setText(colState.getName());
		}
		table.setColumnOrder(orderArray);
	}

	public void addSelectionChangedListener(ISelectionChangedListener listener) {
		tableViewer.addSelectionChangedListener(listener);
	}

	public ISelection getSelection() {
		return tableViewer.getSelection();
	}

	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
		tableViewer.removeSelectionChangedListener(listener);
	}

	public void setSelection(ISelection selection) {
		tableViewer.setSelection(selection);
	}

	public TableViewer getTableViewer() {
		return tableViewer;
	}

}

Return to bug 178474

Lines 1033-1038 Link Here

(-)src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java (-1 / +21 lines)
1033	ISelection selection = event.getSelection();	1033	ISelection selection = event.getSelection();
1034	if (selection instanceof StructuredSelection) {	1034	if (selection instanceof StructuredSelection) {
1035	Object select = ((StructuredSelection) selection).getFirstElement();	1035	Object select = ((StructuredSelection) selection).getFirstElement();
		1036	TaskEditorAttachmentPart attachmentPart = (TaskEditorAttachmentPart) getPart(ID_PART_ATTACHMENTS);
1036	if (select instanceof TaskEditorOutlineNode) {	1037	if (select instanceof TaskEditorOutlineNode) {
1037	TaskEditorOutlineNode node = (TaskEditorOutlineNode) select;	1038	TaskEditorOutlineNode node = (TaskEditorOutlineNode) select;
1038	TaskAttribute attribute = node.getData();	1039	TaskAttribute attribute = node.getData();
Lines 1053-1061 Link Here
1053	}	1054	}
1054	}	1055	}
1055	}	1056	}
		1057	attachmentPart.resetSelectedAttachment(form);
		1058	EditorUtil.reveal(form, attribute.getId());
		1059	} else if (TaskAttribute.TYPE_ATTACHMENT.equals(attribute.getMetaData().getType())) {
		1060	AbstractTaskEditorPart actionPart = getPart(ID_PART_ATTACHMENTS);
		1061	if (actionPart != null && actionPart.getControl() instanceof ExpandableComposite) {
		1062	CommonFormUtil.setExpanded((ExpandableComposite) actionPart.getControl(), true);
		1063	if (actionPart.getControl() instanceof Section) {
		1064	Control client = ((Section) actionPart.getControl()).getClient();
		1065	if (client instanceof Composite) {
		1066	for (Control control : ((Composite) client).getChildren()) {
		1067	// toggle subsections
		1068	if (control instanceof Section) {
		1069	CommonFormUtil.setExpanded((Section) control, true);
		1070	}
		1071	}
		1072	}
		1073	}
		1074	}
		1075	attachmentPart.selectAttachment(form, attribute);
1056	}	1076	}
1057	EditorUtil.reveal(form, attribute.getId());
1058	} else {	1077	} else {
		1078	attachmentPart.resetSelectedAttachment(form);
1059	EditorUtil.reveal(form, node.getLabel());	1079	EditorUtil.reveal(form, node.getLabel());
1060	}	1080	}
1061	getEditor().setActivePage(getId());	1081	getEditor().setActivePage(getId());

Added Link Here

(-)src/org/eclipse/mylyn/internal/tasks/ui/editors/ColumnState.java (+75 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 Frank Becker 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	* Frank Becker - initial API and implementation
10	*******************************************************************************/
11
12	package org.eclipse.mylyn.internal.tasks.ui.editors;
13
14	import java.io.Serializable;
15
16	import org.eclipse.swt.SWT;
17	import org.eclipse.ui.IMemento;
18
19	public class ColumnState implements Serializable {
20
21	private static final long serialVersionUID = -3746488897344479189L;
22
23	private String name;
24
25	private int widths;
26
27	private int alignment;
28
29	public ColumnState(String name, int widths) {
30	super();
31	this.name = name;
32	this.widths = widths;
33	alignment = SWT.LEFT;
34	}
35
36	public String getName() {
37	return name;
38	}
39
40	public void setName(String name) {
41	this.name = name;
42	}
43
44	public int getWidths() {
45	return widths;
46	}
47
48	public void setWidths(int widths) {
49	this.widths = widths;
50	}
51
52	public int getAlignment() {
53	return alignment;
54	}
55
56	public void setAlignment(int alignment) {
57	this.alignment = alignment;
58	}
59
60	public void saveState(IMemento memento) {
61	IMemento child = memento.createChild("ColumnState"); //$NON-NLS-1$
62	child.putString("name", name); //$NON-NLS-1$
63	child.putInteger("widths", widths); //$NON-NLS-1$
64	child.putInteger("alignment", alignment); //$NON-NLS-1$
65
66	}
67
68	public static ColumnState createState(IMemento memento) {
69	ColumnState erg;
70	erg = new ColumnState(memento.getString("name"), memento.getInteger("widths"));
71	erg.setAlignment(memento.getInteger("alignment"));
72	return erg;
73	}
74
75	}