Attachment 191892 Details for Bug 338912 – Patch v01

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

[patch] Patch v01

MarkerPreferences 01.txt (text/plain), 12.34 KB, created by Prakash Rangaraj

on 2011-03-25 05:52:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Prakash Rangaraj

Created: 2011-03-25 05:52:04 EDT

Size: 12.34 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java,v
>retrieving revision 1.58
>diff -u -r1.58 ExtendedMarkersView.java
>--- src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java	9 Mar 2011 19:40:12 -0000	1.58
>+++ src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java	25 Mar 2011 09:39:54 -0000
>@@ -369,9 +369,7 @@
> 			TreeColumn[] columns = tree.getColumns();
> 			for (int i = 0; i < columns.length; i++) {
> 				if (markerField.equals(columns[i].getData(MARKER_FIELD))) {
>-					preferredWidth = Math.max(preferredWidth,
>-							columns[i].getWidth());
>-					return preferredWidth;
>+					return columns[i].getWidth();
> 				}
> 			}
> 		}
>Index: src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java,v
>retrieving revision 1.22
>diff -u -r1.22 FiltersConfigurationDialog.java
>--- src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java	9 Mar 2011 19:40:12 -0000	1.22
>+++ src/org/eclipse/ui/internal/views/markers/FiltersConfigurationDialog.java	25 Mar 2011 09:39:54 -0000
>@@ -36,8 +36,12 @@
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.events.DisposeEvent;
> import org.eclipse.swt.events.DisposeListener;
>+import org.eclipse.swt.events.ModifyEvent;
>+import org.eclipse.swt.events.ModifyListener;
> import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
>+import org.eclipse.swt.events.VerifyEvent;
>+import org.eclipse.swt.events.VerifyListener;
> import org.eclipse.swt.layout.FillLayout;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>@@ -47,7 +51,7 @@
> import org.eclipse.swt.widgets.Group;
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Shell;
>-import org.eclipse.swt.widgets.Spinner;
>+import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.forms.events.ExpansionAdapter;
> import org.eclipse.ui.forms.events.ExpansionEvent;
> import org.eclipse.ui.forms.widgets.ExpandableComposite;
>@@ -87,7 +91,7 @@
> 	private Button orButton;
> 
> 	private Button limitButton;
>-	private Spinner limitSpinner;
>+	private Text limitText;
> 
> 	private GroupFilterConfigurationArea scopeArea = new ScopeArea();
> 	private ScrolledForm form;
>@@ -205,8 +209,8 @@
> 		boolean limitsEnabled = generator.isMarkerLimitsEnabled();
> 		limitButton.setSelection(limitsEnabled);
> 		limitsLabel.setEnabled(limitsEnabled);
>-		limitSpinner.setEnabled(limitsEnabled);
>-		limitSpinner.setSelection(limits);
>+		limitText.setEnabled(limitsEnabled);
>+		limitText.setText(Integer.toString(limits));
> 		configsTable.getTable().setFocus();
> 
> 	}
>@@ -250,7 +254,7 @@
> 
> 			public void widgetSelected(SelectionEvent e) {
> 				limitsLabel.setEnabled(limitButton.getSelection());
>-				limitSpinner.setEnabled(limitButton.getSelection());
>+				limitText.setEnabled(limitButton.getSelection());
> 			}
> 		});
> 
>@@ -263,14 +267,31 @@
> 		limitsLabel = new Label(composite, SWT.NONE);
> 		limitsLabel.setText(MarkerMessages.MarkerPreferences_VisibleItems);
> 
>-		limitSpinner = new Spinner(composite, SWT.BORDER);
>-		limitSpinner.setMinimum(1);
>-		limitSpinner.setMaximum(Integer.MAX_VALUE);
>-		limitSpinner.setIncrement(1);
>-		limitSpinner.setPageIncrement(100);
>-		GridData spinnerData = new GridData();
>-		spinnerData.minimumWidth = convertWidthInCharsToPixels(6);
>-		limitSpinner.setLayoutData(spinnerData);
>+		limitText = new Text(composite, SWT.BORDER);
>+		GridData textData = new GridData();
>+		textData.widthHint = convertWidthInCharsToPixels(10);
>+		limitText.setLayoutData(textData);
>+		limitText.addVerifyListener(new VerifyListener() {
>+
>+			public void verifyText(VerifyEvent e) {
>+				if (e.character != 0 && e.keyCode != SWT.BS
>+						&& e.keyCode != SWT.DEL
>+						&& !Character.isDigit(e.character)) {
>+					e.doit = false;
>+				}
>+			}
>+		});
>+
>+		limitText.addModifyListener(new ModifyListener() {
>+
>+			public void modifyText(ModifyEvent e) {
>+				try {
>+					Integer.parseInt(limitText.getText());
>+				} catch (NumberFormatException ex) {
>+					// ignore
>+				}
>+			}
>+		});
> 
> 	}
> 
>@@ -422,7 +443,9 @@
> 		});
> 
> 		Composite sectionClient = toolkit.createComposite(expandable);
>-		sectionClient.setLayout(new GridLayout());
>+		GridLayout gridLayout = new GridLayout();
>+		gridLayout.verticalSpacing = 3;
>+		sectionClient.setLayout(gridLayout);
> 		sectionClient.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,
> 				false));
> 		sectionClient.setBackground(form.getBackground());
>@@ -669,7 +692,7 @@
> 	protected void okPressed() {
> 
> 		generator.setMarkerLimitsEnabled(limitButton.getSelection());
>-		generator.setMarkerLimits(limitSpinner.getSelection());
>+		generator.setMarkerLimits(Integer.parseInt(limitText.getText().trim()));
> 
> 		Iterator filterGroupIterator = filterGroups.iterator();
> 		while (filterGroupIterator.hasNext()) {
>@@ -707,8 +730,8 @@
> 
> 		limitButton.setSelection(useMarkerLimits);
> 		limitsLabel.setEnabled(useMarkerLimits);
>-		limitSpinner.setEnabled(useMarkerLimits);
>-		limitSpinner.setSelection(markerLimits);
>+		limitText.setEnabled(useMarkerLimits);
>+		limitText.setText(Integer.toString(markerLimits));
> 
> 		updateRadioButtonsFromTable();
> 	}
>Index: src/org/eclipse/ui/internal/views/markers/MarkersViewColumnsDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkersViewColumnsDialog.java,v
>retrieving revision 1.3
>diff -u -r1.3 MarkersViewColumnsDialog.java
>--- src/org/eclipse/ui/internal/views/markers/MarkersViewColumnsDialog.java	23 Nov 2010 16:11:35 -0000	1.3
>+++ src/org/eclipse/ui/internal/views/markers/MarkersViewColumnsDialog.java	25 Mar 2011 09:39:54 -0000
>@@ -268,5 +268,29 @@
> 			this.width = width;
> 			visible = false;
> 		}
>+
>+		public int hashCode() {
>+			final int prime = 31;
>+			int result = 1;
>+			result = prime * result + ((field == null) ? 0 : field.hashCode());
>+			return result;
>+		}
>+
>+		public boolean equals(Object obj) {
>+			if (this == obj)
>+				return true;
>+			if (obj == null)
>+				return false;
>+			if (getClass() != obj.getClass())
>+				return false;
>+			FieldEntry other = (FieldEntry) obj;
>+			if (field == null) {
>+				if (other.field != null)
>+					return false;
>+			} else if (!field.equals(other.field))
>+				return false;
>+			return true;
>+		}
>+		
> 	}
> }
>Index: src/org/eclipse/ui/internal/views/markers/TypesConfigurationArea.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/TypesConfigurationArea.java,v
>retrieving revision 1.10
>diff -u -r1.10 TypesConfigurationArea.java
>--- src/org/eclipse/ui/internal/views/markers/TypesConfigurationArea.java	1 Jun 2010 19:22:29 -0000	1.10
>+++ src/org/eclipse/ui/internal/views/markers/TypesConfigurationArea.java	25 Mar 2011 09:39:54 -0000
>@@ -315,7 +315,7 @@
> 		gridData.widthHint = Dialog.convertVerticalDLUsToPixels(
> 				getFontMetrics(), 100);
> 		gridData.heightHint = Dialog.convertVerticalDLUsToPixels(
>-				getFontMetrics(), 75);
>+				getFontMetrics(), 50);
> 
> 		final ITreeContentProvider typesContentProvider = getTypesContentProvider();
> 		typesViewer.getControl().setLayoutData(gridData);
>Index: src/org/eclipse/ui/internal/views/markers/ViewerColumnsDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ViewerColumnsDialog.java,v
>retrieving revision 1.7
>diff -u -r1.7 ViewerColumnsDialog.java
>--- src/org/eclipse/ui/internal/views/markers/ViewerColumnsDialog.java	2 Mar 2011 10:11:15 -0000	1.7
>+++ src/org/eclipse/ui/internal/views/markers/ViewerColumnsDialog.java	25 Mar 2011 09:39:54 -0000
>@@ -27,10 +27,13 @@
> import org.eclipse.jface.viewers.ITableLabelProvider;
> import org.eclipse.jface.viewers.LabelProvider;
> import org.eclipse.jface.viewers.SelectionChangedEvent;
>+import org.eclipse.jface.viewers.StructuredSelection;
> import org.eclipse.jface.viewers.TableViewer;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.FocusAdapter;
>-import org.eclipse.swt.events.FocusEvent;
>+import org.eclipse.swt.events.ModifyEvent;
>+import org.eclipse.swt.events.ModifyListener;
>+import org.eclipse.swt.events.VerifyEvent;
>+import org.eclipse.swt.events.VerifyListener;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.layout.FillLayout;
> import org.eclipse.swt.layout.GridData;
>@@ -43,9 +46,9 @@
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Listener;
> import org.eclipse.swt.widgets.Shell;
>-import org.eclipse.swt.widgets.Spinner;
> import org.eclipse.swt.widgets.Table;
> import org.eclipse.swt.widgets.TableColumn;
>+import org.eclipse.swt.widgets.Text;
> import org.eclipse.ui.views.markers.internal.MarkerMessages;
> 
> /**
>@@ -76,7 +79,7 @@
> 	private Button toVisibleBtt, toNonVisibleBtt;
> 
> 	private Label widthLabel;
>-	private Spinner widthSpinner;
>+	private Text widthText;
> 
> 	/**
> 	 * Create a new instance of the receiver.
>@@ -127,6 +130,10 @@
> 		createVisibleTable(composite);
> 		createUpDownBtt(composite);
> 		createWidthArea(composite);
>+		Object element = visibleViewer.getElementAt(0);
>+		if (element != null)
>+			visibleViewer.setSelection(new StructuredSelection(element));
>+		visibleViewer.getTable().setFocus();
> 		return composite;
> 	}
> 	
>@@ -181,30 +188,34 @@
> 		gridData.horizontalSpan = 3;
> 		widthLabel.setLayoutData(gridData);
> 
>-		widthSpinner = new Spinner(parent, SWT.BORDER);
>-		widthSpinner.setMinimum(1);
>-		widthSpinner.setSelection(1);
>-		widthSpinner.setMaximum(10000);
>-		gridData = new GridData();
>-		gridData.minimumWidth = convertWidthInCharsToPixels(5);
>-		widthSpinner.setLayoutData(gridData);
>-		widthSpinner.addFocusListener(new FocusAdapter() {
>-			public void focusLost(FocusEvent e) {
>-				Object data = ((IStructuredSelection) visibleViewer
>-						.getSelection()).getFirstElement();
>-				if (data != null) {
>-					IColumnUpdater updater = getColumnUpdater();
>-					updater.setColumnWidth(data, widthSpinner.getSelection());
>+		widthText = new Text(parent, SWT.BORDER);
>+		widthText.addVerifyListener(new VerifyListener() {
>+
>+			public void verifyText(VerifyEvent e) {
>+				if (e.character != 0 && e.keyCode != SWT.BS
>+						&& e.keyCode != SWT.DEL
>+						&& !Character.isDigit(e.character)) {
>+					e.doit = false;
> 				}
> 			}
> 		});
>+
>+		gridData = new GridData();
>+		gridData.widthHint = convertWidthInCharsToPixels(5);
>+		widthText.setLayoutData(gridData);
>+		widthText.addModifyListener(new ModifyListener() {
>+
>+			public void modifyText(ModifyEvent e) {
>+				updateWidth();
>+			}
>+		});
> 		setWidthEnabled(false);
>-		return widthSpinner;
>+		return widthText;
> 	}
> 	
> 	private void setWidthEnabled(boolean enabled) {
> 		widthLabel.setEnabled(enabled);
>-		widthSpinner.setEnabled(enabled);
>+		widthText.setEnabled(enabled);
> 	}
> 
> 	/**
>@@ -406,10 +417,10 @@
> 				.isColumnResizable(selVCols.get(0)) : false;
> 		setWidthEnabled(edit);
> 		if (edit) {
>-			widthSpinner.setSelection(infoProvider
>-					.getColumnWidth(selVCols.get(0)));
>+			int width = infoProvider.getColumnWidth(selVCols.get(0));
>+			widthText.setText(Integer.toString(width));
> 		} else {
>-			widthSpinner.setSelection(0);
>+			widthText.setText(""); //$NON-NLS-1$
> 		}
> 	}
> 
>@@ -536,7 +547,15 @@
> 	}
> 	
> 	protected void performDefaults() {
>+		
>+		ISelection nonVisibleSelection = nonVisibleViewer.getSelection();
>+		ISelection visibleSelection = visibleViewer.getSelection();
>+		
> 		refreshViewers();
>+		
>+		nonVisibleViewer.setSelection(nonVisibleSelection);
>+		visibleViewer.setSelection(visibleSelection);
>+		
> 		super.performDefaults();
> 	}
> 
>@@ -629,6 +648,23 @@
> 	protected abstract IColumnUpdater getColumnUpdater();
> 
> 	/**
>+	 * 
>+	 */
>+	private void updateWidth() {
>+		try {
>+			int width = Integer.parseInt(widthText.getText());
>+			Object data = ((IStructuredSelection) visibleViewer
>+					.getSelection()).getFirstElement();
>+			if (data != null) {
>+				IColumnUpdater updater = getColumnUpdater();
>+				updater.setColumnWidth(data, width);
>+			}
>+		} catch (NumberFormatException ex) {
>+			//ignore
>+		}
>+	}
>+
>+	/**
> 	 * Update various aspects of a columns from a viewer such
> 	 * {@link TableViewer}
> 	 */

Actions: View | Diff

Attachments on bug 338912: 191892