Attachment #29181 for bug #114615

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

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




public class BookmarkView extends MarkerView {

	private final ColumnPixelData[] DEFAULT_COLUMN_LAYOUTS = {
			new ColumnPixelData(0,false,false),
			new ColumnPixelData(200), new ColumnPixelData(75),
			new ColumnPixelData(150), new ColumnPixelData(60) };



	private final static String[] ROOT_TYPES = { IMarker.BOOKMARK };

	private final static String[] TABLE_COLUMN_PROPERTIES = {Util.EMPTY_STRING, IMarker.MESSAGE,
		Util.EMPTY_STRING,
		Util.EMPTY_STRING,
		Util.EMPTY_STRING
	};

	private final static String TAG_DIALOG_SECTION = "org.eclipse.ui.views.bookmark"; //$NON-NLS-1$

	private final IField[] VISIBLE_FIELDS = {new FieldHierarchy(), new FieldMessage(),
			new FieldResource(), new FieldFolder(), new FieldLineNumber() };

	private ICellModifier cellModifier = new ICellModifier() {

			if (element instanceof ConcreteMarker
					&& IMarker.MESSAGE.equals(property))
				return ((ConcreteMarker) element).getDescription();
			return null;
				return null;
		}

		public boolean canModify(Object element, String property) {


	private CellEditorActionHandler cellEditorActionHandler;

	/* (non-Javadoc)
	 * @see org.eclipse.ui.views.markers.internal.MarkerView#createPartControl(org.eclipse.swt.widgets.Composite)
	 */
	public void createPartControl(Composite parent) {
		super.createPartControl(parent);

		// TODO: Check for possible reliance on IMarker
		TreeViewer treeViewer = getViewer();
		CellEditor cellEditors[] = new CellEditor[treeViewer.getTree()
				.getColumnCount()];
		CellEditor descriptionCellEditor = new TextCellEditor(treeViewer
				.getTree());
		cellEditors[1] = descriptionCellEditor;
		treeViewer.setCellEditors(cellEditors);
		treeViewer.setCellModifier(cellModifier);
		treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);




import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Item;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.ide.IDEInternalPreferences;
import org.eclipse.ui.part.CellEditorActionHandler;

	private static final String COMPLETION = "completion"; //$NON-NLS-1$

	private final ColumnPixelData[] DEFAULT_COLUMN_LAYOUTS = {
			new ColumnPixelData(0, false, false),//hidden tree
			new ColumnPixelData(16, false, true),
			new ColumnPixelData(16, false, true), new ColumnPixelData(200),
			new ColumnPixelData(75), new ColumnPixelData(150),


	private final static String[] ROOT_TYPES = { IMarker.TASK };

	private final static String[] TABLE_COLUMN_PROPERTIES = {Util.EMPTY_STRING, COMPLETION,
			IMarker.PRIORITY, IMarker.MESSAGE, Util.EMPTY_STRING,
			Util.EMPTY_STRING,
			Util.EMPTY_STRING
	};

	private final static String TAG_DIALOG_SECTION = "org.eclipse.ui.views.task"; //$NON-NLS-1$

	private final IField[] VISIBLE_FIELDS = {new FieldHierarchy(), new FieldDone(),
			new FieldPriority(), new FieldMessage(), new FieldResource(),
			new FieldFolder(), new FieldLineNumber() };


		TreeViewer treeViewer = getViewer();
		CellEditor cellEditors[] = new CellEditor[treeViewer.getTree()
				.getColumnCount()];
		cellEditors[1] = new CheckboxCellEditor(treeViewer.getTree());

		String[] priorities = new String[] { MarkerMessages.priority_high,
				MarkerMessages.priority_normal, MarkerMessages.priority_low };

		cellEditors[2] = new ComboBoxCellEditor(treeViewer.getTree(),
				priorities, SWT.READ_ONLY);
		CellEditor descriptionCellEditor = new TextCellEditor(treeViewer
				.getTree());
		cellEditors[3] = descriptionCellEditor;
		treeViewer.setCellEditors(cellEditors);
		treeViewer.setCellModifier(cellModifier);
		treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);

		propertiesAction = new ActionTaskProperties(this, getViewer());
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.views.markers.internal.TableView#createColumns(org.eclipse.swt.widgets.Tree)
	 */
	protected void createColumns(Tree tree) {
		super.createColumns(tree);
		TreeColumn[] columns = tree.getColumns();

		if (columns != null && columns.length >= 1) {
			columns[0].setResizable(false);

			if (columns.length >= 2)
				columns[1].setResizable(false);
		}
	}

	protected void fillContextMenu(IMenuManager manager) {
		manager.add(addGlobalTaskAction);
		manager.add(new Separator());

Lines 292-297 Link Here

(-)src/org/eclipse/ui/views/markers/internal/TableView.java (+1 lines)
292	TreeColumn tc = new TreeColumn(tree, SWT.NONE, i);	292	TreeColumn tc = new TreeColumn(tree, SWT.NONE, i);
293	tc.setText(fields[i].getColumnHeaderText());	293	tc.setText(fields[i].getColumnHeaderText());
294	tc.setImage(fields[i].getColumnHeaderImage());	294	tc.setImage(fields[i].getColumnHeaderImage());
		295	tc.setResizable(columnWidths[i].resizable);
295	tc.addSelectionListener(headerListener);	296	tc.addSelectionListener(headerListener);
296	}	297	}
297	}	298	}

Return to bug 114615

Lines 37-42 Link Here

(-)src/org/eclipse/ui/views/markers/internal/BookmarkView.java (-9 / +11 lines)
37	public class BookmarkView extends MarkerView {	37	public class BookmarkView extends MarkerView {
38		38
39	private final ColumnPixelData[] DEFAULT_COLUMN_LAYOUTS = {	39	private final ColumnPixelData[] DEFAULT_COLUMN_LAYOUTS = {
		40	new ColumnPixelData(0,false,false),
40	new ColumnPixelData(200), new ColumnPixelData(75),	41	new ColumnPixelData(200), new ColumnPixelData(75),
41	new ColumnPixelData(150), new ColumnPixelData(60) };	42	new ColumnPixelData(150), new ColumnPixelData(60) };
42		43
Lines 44-58 Link Here
44		45
45	private final static String[] ROOT_TYPES = { IMarker.BOOKMARK };	46	private final static String[] ROOT_TYPES = { IMarker.BOOKMARK };
46		47
47	private final static String[] TABLE_COLUMN_PROPERTIES = { IMarker.MESSAGE,	48	private final static String[] TABLE_COLUMN_PROPERTIES = {Util.EMPTY_STRING, IMarker.MESSAGE,
48	"", //$NON-NLS-1$	49	Util.EMPTY_STRING,
49	"", //$NON-NLS-1$	50	Util.EMPTY_STRING,
50	"" //$NON-NLS-1$	51	Util.EMPTY_STRING
51	};	52	};
52		53
53	private final static String TAG_DIALOG_SECTION = "org.eclipse.ui.views.bookmark"; //$NON-NLS-1$	54	private final static String TAG_DIALOG_SECTION = "org.eclipse.ui.views.bookmark"; //$NON-NLS-1$
54		55
55	private final IField[] VISIBLE_FIELDS = { new FieldMessage(),	56	private final IField[] VISIBLE_FIELDS = {new FieldHierarchy(), new FieldMessage(),
56	new FieldResource(), new FieldFolder(), new FieldLineNumber() };	57	new FieldResource(), new FieldFolder(), new FieldLineNumber() };
57		58
58	private ICellModifier cellModifier = new ICellModifier() {	59	private ICellModifier cellModifier = new ICellModifier() {
Lines 60-67 Link Here
60	if (element instanceof ConcreteMarker	61	if (element instanceof ConcreteMarker
61	&& IMarker.MESSAGE.equals(property))	62	&& IMarker.MESSAGE.equals(property))
62	return ((ConcreteMarker) element).getDescription();	63	return ((ConcreteMarker) element).getDescription();
63	else	64	return null;
64	return null;
65	}	65	}
66		66
67	public boolean canModify(Object element, String property) {	67	public boolean canModify(Object element, String property) {
Lines 94-109 Link Here
94		94
95	private CellEditorActionHandler cellEditorActionHandler;	95	private CellEditorActionHandler cellEditorActionHandler;
96		96
		97	/* (non-Javadoc)
		98	* @see org.eclipse.ui.views.markers.internal.MarkerView#createPartControl(org.eclipse.swt.widgets.Composite)
		99	*/
97	public void createPartControl(Composite parent) {	100	public void createPartControl(Composite parent) {
98	super.createPartControl(parent);	101	super.createPartControl(parent);
99		102
100	// TODO: Check for possible reliance on IMarker
101	TreeViewer treeViewer = getViewer();	103	TreeViewer treeViewer = getViewer();
102	CellEditor cellEditors[] = new CellEditor[treeViewer.getTree()	104	CellEditor cellEditors[] = new CellEditor[treeViewer.getTree()
103	.getColumnCount()];	105	.getColumnCount()];
104	CellEditor descriptionCellEditor = new TextCellEditor(treeViewer	106	CellEditor descriptionCellEditor = new TextCellEditor(treeViewer
105	.getTree());	107	.getTree());
106	cellEditors[0] = descriptionCellEditor;	108	cellEditors[1] = descriptionCellEditor;
107	treeViewer.setCellEditors(cellEditors);	109	treeViewer.setCellEditors(cellEditors);
108	treeViewer.setCellModifier(cellModifier);	110	treeViewer.setCellModifier(cellModifier);
109	treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);	111	treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);

Lines 30-37 Link Here

(-)src/org/eclipse/ui/views/markers/internal/TaskView.java (-27 / +9 lines)
30	import org.eclipse.swt.SWT;	30	import org.eclipse.swt.SWT;
31	import org.eclipse.swt.widgets.Composite;	31	import org.eclipse.swt.widgets.Composite;
32	import org.eclipse.swt.widgets.Item;	32	import org.eclipse.swt.widgets.Item;
33	import org.eclipse.swt.widgets.Tree;
34	import org.eclipse.swt.widgets.TreeColumn;
35	import org.eclipse.ui.PlatformUI;	33	import org.eclipse.ui.PlatformUI;
36	import org.eclipse.ui.internal.ide.IDEInternalPreferences;	34	import org.eclipse.ui.internal.ide.IDEInternalPreferences;
37	import org.eclipse.ui.part.CellEditorActionHandler;	35	import org.eclipse.ui.part.CellEditorActionHandler;
Lines 45-50 Link Here
45	private static final String COMPLETION = "completion"; //$NON-NLS-1$	43	private static final String COMPLETION = "completion"; //$NON-NLS-1$
46		44
47	private final ColumnPixelData[] DEFAULT_COLUMN_LAYOUTS = {	45	private final ColumnPixelData[] DEFAULT_COLUMN_LAYOUTS = {
		46	new ColumnPixelData(0, false, false),//hidden tree
48	new ColumnPixelData(16, false, true),	47	new ColumnPixelData(16, false, true),
49	new ColumnPixelData(16, false, true), new ColumnPixelData(200),	48	new ColumnPixelData(16, false, true), new ColumnPixelData(200),
50	new ColumnPixelData(75), new ColumnPixelData(150),	49	new ColumnPixelData(75), new ColumnPixelData(150),
Lines 54-68 Link Here
54		53
55	private final static String[] ROOT_TYPES = { IMarker.TASK };	54	private final static String[] ROOT_TYPES = { IMarker.TASK };
56		55
57	private final static String[] TABLE_COLUMN_PROPERTIES = { COMPLETION,	56	private final static String[] TABLE_COLUMN_PROPERTIES = {Util.EMPTY_STRING, COMPLETION,
58	IMarker.PRIORITY, IMarker.MESSAGE, "", //$NON-NLS-1$	57	IMarker.PRIORITY, IMarker.MESSAGE, Util.EMPTY_STRING,
59	"", //$NON-NLS-1$	58	Util.EMPTY_STRING,
60	"" //$NON-NLS-1$	59	Util.EMPTY_STRING
61	};	60	};
62		61
63	private final static String TAG_DIALOG_SECTION = "org.eclipse.ui.views.task"; //$NON-NLS-1$	62	private final static String TAG_DIALOG_SECTION = "org.eclipse.ui.views.task"; //$NON-NLS-1$
64		63
65	private final IField[] VISIBLE_FIELDS = { new FieldDone(),	64	private final IField[] VISIBLE_FIELDS = {new FieldHierarchy(), new FieldDone(),
66	new FieldPriority(), new FieldMessage(), new FieldResource(),	65	new FieldPriority(), new FieldMessage(), new FieldResource(),
67	new FieldFolder(), new FieldLineNumber() };	66	new FieldFolder(), new FieldLineNumber() };
68		67
Lines 138-153 Link Here
138	TreeViewer treeViewer = getViewer();	137	TreeViewer treeViewer = getViewer();
139	CellEditor cellEditors[] = new CellEditor[treeViewer.getTree()	138	CellEditor cellEditors[] = new CellEditor[treeViewer.getTree()
140	.getColumnCount()];	139	.getColumnCount()];
141	cellEditors[0] = new CheckboxCellEditor(treeViewer.getTree());	140	cellEditors[1] = new CheckboxCellEditor(treeViewer.getTree());
142		141
143	String[] priorities = new String[] { MarkerMessages.priority_high,	142	String[] priorities = new String[] { MarkerMessages.priority_high,
144	MarkerMessages.priority_normal, MarkerMessages.priority_low };	143	MarkerMessages.priority_normal, MarkerMessages.priority_low };
145		144
146	cellEditors[1] = new ComboBoxCellEditor(treeViewer.getTree(),	145	cellEditors[2] = new ComboBoxCellEditor(treeViewer.getTree(),
147	priorities, SWT.READ_ONLY);	146	priorities, SWT.READ_ONLY);
148	CellEditor descriptionCellEditor = new TextCellEditor(treeViewer	147	CellEditor descriptionCellEditor = new TextCellEditor(treeViewer
149	.getTree());	148	.getTree());
150	cellEditors[2] = descriptionCellEditor;	149	cellEditors[3] = descriptionCellEditor;
151	treeViewer.setCellEditors(cellEditors);	150	treeViewer.setCellEditors(cellEditors);
152	treeViewer.setCellModifier(cellModifier);	151	treeViewer.setCellModifier(cellModifier);
153	treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);	152	treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);
Lines 197-219 Link Here
197	propertiesAction = new ActionTaskProperties(this, getViewer());	196	propertiesAction = new ActionTaskProperties(this, getViewer());
198	}	197	}
199		198
200	/*
201	* (non-Javadoc)
202	*
203	* @see org.eclipse.ui.views.markers.internal.TableView#createColumns(org.eclipse.swt.widgets.Tree)
204	*/
205	protected void createColumns(Tree tree) {
206	super.createColumns(tree);
207	TreeColumn[] columns = tree.getColumns();
208
209	if (columns != null && columns.length >= 1) {
210	columns[0].setResizable(false);
211
212	if (columns.length >= 2)
213	columns[1].setResizable(false);
214	}
215	}
216
217	protected void fillContextMenu(IMenuManager manager) {	199	protected void fillContextMenu(IMenuManager manager) {
218	manager.add(addGlobalTaskAction);	200	manager.add(addGlobalTaskAction);
219	manager.add(new Separator());	201	manager.add(new Separator());