Attachment 29181 Details for Bug 114615 – Patch

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

[patch] Patch

114615.txt (text/plain), 7.00 KB, created by Tod Creasey

on 2005-11-02 11:55:19 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2005-11-02 11:55:19 EST

Size: 7.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/views/markers/internal/BookmarkView.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/BookmarkView.java,v
>retrieving revision 1.19
>diff -u -r1.19 BookmarkView.java
>--- src/org/eclipse/ui/views/markers/internal/BookmarkView.java	20 Oct 2005 18:34:57 -0000	1.19
>+++ src/org/eclipse/ui/views/markers/internal/BookmarkView.java	2 Nov 2005 16:54:33 -0000
>@@ -37,6 +37,7 @@
> 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) };
> 
>@@ -44,15 +45,15 @@
> 
> 	private final static String[] ROOT_TYPES = { IMarker.BOOKMARK };
> 
>-	private final static String[] TABLE_COLUMN_PROPERTIES = { IMarker.MESSAGE,
>-			"", //$NON-NLS-1$
>-			"", //$NON-NLS-1$
>-			"" //$NON-NLS-1$
>+	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 FieldMessage(),
>+	private final IField[] VISIBLE_FIELDS = {new FieldHierarchy(), new FieldMessage(),
> 			new FieldResource(), new FieldFolder(), new FieldLineNumber() };
> 
> 	private ICellModifier cellModifier = new ICellModifier() {
>@@ -60,8 +61,7 @@
> 			if (element instanceof ConcreteMarker
> 					&& IMarker.MESSAGE.equals(property))
> 				return ((ConcreteMarker) element).getDescription();
>-			else
>-				return null;
>+			return null;
> 		}
> 
> 		public boolean canModify(Object element, String property) {
>@@ -94,16 +94,18 @@
> 
> 	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[0] = descriptionCellEditor;
>+		cellEditors[1] = descriptionCellEditor;
> 		treeViewer.setCellEditors(cellEditors);
> 		treeViewer.setCellModifier(cellModifier);
> 		treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);
>Index: src/org/eclipse/ui/views/markers/internal/TaskView.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TaskView.java,v
>retrieving revision 1.22
>diff -u -r1.22 TaskView.java
>--- src/org/eclipse/ui/views/markers/internal/TaskView.java	25 Oct 2005 19:21:36 -0000	1.22
>+++ src/org/eclipse/ui/views/markers/internal/TaskView.java	2 Nov 2005 16:54:33 -0000
>@@ -30,8 +30,6 @@
> 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;
>@@ -45,6 +43,7 @@
> 	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),
>@@ -54,15 +53,15 @@
> 
> 	private final static String[] ROOT_TYPES = { IMarker.TASK };
> 
>-	private final static String[] TABLE_COLUMN_PROPERTIES = { COMPLETION,
>-			IMarker.PRIORITY, IMarker.MESSAGE, "", //$NON-NLS-1$
>-			"", //$NON-NLS-1$
>-			"" //$NON-NLS-1$
>+	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 FieldDone(),
>+	private final IField[] VISIBLE_FIELDS = {new FieldHierarchy(), new FieldDone(),
> 			new FieldPriority(), new FieldMessage(), new FieldResource(),
> 			new FieldFolder(), new FieldLineNumber() };
> 
>@@ -138,16 +137,16 @@
> 		TreeViewer treeViewer = getViewer();
> 		CellEditor cellEditors[] = new CellEditor[treeViewer.getTree()
> 				.getColumnCount()];
>-		cellEditors[0] = new CheckboxCellEditor(treeViewer.getTree());
>+		cellEditors[1] = new CheckboxCellEditor(treeViewer.getTree());
> 
> 		String[] priorities = new String[] { MarkerMessages.priority_high,
> 				MarkerMessages.priority_normal, MarkerMessages.priority_low };
> 
>-		cellEditors[1] = new ComboBoxCellEditor(treeViewer.getTree(),
>+		cellEditors[2] = new ComboBoxCellEditor(treeViewer.getTree(),
> 				priorities, SWT.READ_ONLY);
> 		CellEditor descriptionCellEditor = new TextCellEditor(treeViewer
> 				.getTree());
>-		cellEditors[2] = descriptionCellEditor;
>+		cellEditors[3] = descriptionCellEditor;
> 		treeViewer.setCellEditors(cellEditors);
> 		treeViewer.setCellModifier(cellModifier);
> 		treeViewer.setColumnProperties(TABLE_COLUMN_PROPERTIES);
>@@ -197,23 +196,6 @@
> 		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());
>Index: src/org/eclipse/ui/views/markers/internal/TableView.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/TableView.java,v
>retrieving revision 1.19
>diff -u -r1.19 TableView.java
>--- src/org/eclipse/ui/views/markers/internal/TableView.java	25 Oct 2005 19:21:36 -0000	1.19
>+++ src/org/eclipse/ui/views/markers/internal/TableView.java	2 Nov 2005 16:54:33 -0000
>@@ -292,6 +292,7 @@
> 			TreeColumn tc = new TreeColumn(tree, SWT.NONE, i);
> 			tc.setText(fields[i].getColumnHeaderText());
> 			tc.setImage(fields[i].getColumnHeaderImage());
>+			tc.setResizable(columnWidths[i].resizable);
> 			tc.addSelectionListener(headerListener);
> 		}
> 	}

Actions: View | Diff

Attachments on bug 114615: 29181