Attachment 65220 Details for Bug 173481 – Patch

[patch] Patch

173481 (text/plain), 5.11 KB, created by Tod Creasey

on 2007-04-27 11:35:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2007-04-27 11:35:28 EDT

Size: 5.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java,v
>retrieving revision 1.17
>diff -u -r1.17 MarkerResolutionDialog.java
>--- src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java	11 Apr 2007 15:09:35 -0000	1.17
>+++ src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java	27 Apr 2007 15:30:09 -0000
>@@ -23,7 +23,7 @@
> import org.eclipse.jface.resource.JFaceResources;
> import org.eclipse.jface.viewers.CheckStateChangedEvent;
> import org.eclipse.jface.viewers.CheckboxTableViewer;
>-import org.eclipse.jface.viewers.ColumnPixelData;
>+import org.eclipse.jface.viewers.ColumnWeightData;
> import org.eclipse.jface.viewers.ICheckStateListener;
> import org.eclipse.jface.viewers.ILabelProviderListener;
> import org.eclipse.jface.viewers.ISelection;
>@@ -155,7 +155,8 @@
> 
> 		resolutionsLabel.setLayoutData(new FormData());
> 
>-		resolutionsList = new ListViewer(control, SWT.BORDER | SWT.SINGLE);
>+		resolutionsList = new ListViewer(control, SWT.BORDER | SWT.SINGLE
>+				| SWT.V_SCROLL);
> 		resolutionsList.setContentProvider(new IStructuredContentProvider() {
> 			public Object[] getElements(Object inputElement) {
> 				return resolutions;
>@@ -252,13 +253,44 @@
> 
> 		Dialog.applyDialogFont(control);
> 
>-		setMessage(NLS.bind(MarkerMessages.MarkerResolutionDialog_Description,
>-				Util.getProperty(IMarker.MESSAGE, originalMarker)));
>+		String message = NLS.bind(
>+				MarkerMessages.MarkerResolutionDialog_Description, Util
>+						.getProperty(IMarker.MESSAGE, originalMarker));
>+		if (message.length() > 50) {
>+			// Add a carriage return in the middle if we can
>+			int insertionIndex = chooseWhitespace(message);
>+			if (insertionIndex > 0) {
>+				StringBuffer buffer = new StringBuffer();
>+				buffer.append(message.substring(0, insertionIndex));
>+				buffer.append("\n"); //$NON-NLS-1$
>+				buffer.append(message.substring(insertionIndex, message
>+						.length()));
>+				message = buffer.toString();
>+			}
>+		}
>+
>+		setMessage(message);
> 		return mainArea;
> 
> 	}
> 
> 	/**
>+	 * Choose a good whitespace position for a page break. Start in the middle
>+	 * of the message.
>+	 * 
>+	 * @param message
>+	 * @return int -1 if there is no whitespace to choose.
>+	 */
>+	private int chooseWhitespace(String message) {
>+
>+		for (int i = message.length() / 2; i < message.length(); i++) {
>+			if (Character.isWhitespace(message.charAt(i)))
>+				return i;
>+		}
>+		return -1;
>+	}
>+
>+	/**
> 	 * Create the resolutions sorter.
> 	 */
> 	private void initializeResolutionsSorter() {
>@@ -606,19 +638,17 @@
> 	 */
> 	private void createTableColumns() {
> 		TableLayout layout = new TableLayout();
>-		int width = convertWidthInCharsToPixels(20);
>-		
> 
> 		Table table = markersTable.getTable();
> 		table.setLayout(layout);
> 		table.setLinesVisible(true);
> 		table.setHeaderVisible(true);
> 
>-		layout.addColumnData(new ColumnPixelData(width, true, true));
>+		layout.addColumnData(new ColumnWeightData(70, true));
> 		TableColumn tc = new TableColumn(table, SWT.NONE, 0);
> 		tc
> 				.setText(MarkerMessages.MarkerResolutionDialog_Problems_List_Location);
>-		layout.addColumnData(new ColumnPixelData(width, true, true));
>+		layout.addColumnData(new ColumnWeightData(30, true));
> 		tc = new TableColumn(table, SWT.NONE, 0);
> 		tc
> 				.setText(MarkerMessages.MarkerResolutionDialog_Problems_List_Resource);
>Index: src/org/eclipse/ui/views/markers/internal/messages.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/messages.properties,v
>retrieving revision 1.50
>diff -u -r1.50 messages.properties
>--- src/org/eclipse/ui/views/markers/internal/messages.properties	12 Apr 2007 17:23:12 -0000	1.50
>+++ src/org/eclipse/ui/views/markers/internal/messages.properties	27 Apr 2007 15:30:09 -0000
>@@ -118,10 +118,6 @@
> deleteCompletedAction_title = Delete Completed &Tasks
> markCompletedAction_title = &Mark Completed
> 
>-resolveMarkerAction_title = &Quick Fix
>-resolveMarkerAction_dialogTitle = Quick Fix
>-resolveMarkerAction_computationAction = Finding fixes for {0}
>-
> deleteCompletedTasks_dialogTitle = Delete Completed Tasks
> deleteCompletedTasks_noneCompleted = No user-editable completed tasks to delete.
> deleteCompletedTasks_permanentPlural = Do you want to permanently delete the {0} completed tasks?
>@@ -210,9 +206,13 @@
> 
> MarkerResolutionDialog_AddOthers = Find Si&milar Problems
> 
>-MarkerResolutionDialog_Title = Quick Fix
>+MarkerResolutionDialog_Title = Select a fix
> MarkerResolutionDialog_CalculatingTask = Calculating Possible Resolutions
> MarkerResolutionDialog_WorkingSubTask = Working on: {0}
>+resolveMarkerAction_title = &Quick Fix
>+resolveMarkerAction_dialogTitle = Quick Fix
>+resolveMarkerAction_computationAction = Finding fixes for {0}
>+
> 
> Util_ProjectRoot = project root
> Util_WorkspaceRoot = workspace root

Actions: View | Diff

Attachments on bug 173481: 58571 | 65220