Attachment 182753 Details for Bug 173095 – EditorSelectionDialog patch v3

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

[patch] EditorSelectionDialog patch v3

bug173095-patch-v3.txt (text/plain), 14.98 KB, created by Remy Suen

on 2010-11-09 14:11:28 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2010-11-09 14:11:28 EST

Size: 14.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java,v
>retrieving revision 1.11
>diff -u -r1.11 EditorSelectionDialog.java
>--- Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java	13 Apr 2010 16:06:46 -0000	1.11
>+++ Eclipse UI/org/eclipse/ui/dialogs/EditorSelectionDialog.java	9 Nov 2010 19:10:43 -0000
>@@ -22,12 +22,13 @@
> import org.eclipse.jface.resource.ResourceManager;
> import org.eclipse.jface.util.Util;
> import org.eclipse.jface.viewers.ArrayContentProvider;
>+import org.eclipse.jface.viewers.IOpenListener;
> import org.eclipse.jface.viewers.LabelProvider;
>+import org.eclipse.jface.viewers.OpenEvent;
> import org.eclipse.jface.viewers.TableViewer;
> import org.eclipse.osgi.util.TextProcessor;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Cursor;
>-import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.Image;
> import org.eclipse.swt.layout.GridData;
> import org.eclipse.swt.layout.GridLayout;
>@@ -39,6 +40,8 @@
> import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Listener;
> import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.TabFolder;
>+import org.eclipse.swt.widgets.TabItem;
> import org.eclipse.swt.widgets.Table;
> import org.eclipse.swt.widgets.TableItem;
> import org.eclipse.ui.IEditorDescriptor;
>@@ -49,7 +52,6 @@
> import org.eclipse.ui.internal.registry.EditorDescriptor;
> import org.eclipse.ui.internal.registry.EditorRegistry;
> 
>-
> /**
>  * This class is used to allow the user to select a dialog from the set of
>  * internal and external editors.
>@@ -60,13 +62,26 @@
> public final class EditorSelectionDialog extends Dialog {
> 	private EditorDescriptor selectedEditor;
> 
>-	private Button externalButton;
>+	/**
>+	 * The tab folder that holds the tabs for the listing of internal and
>+	 * external editors.
>+	 */
>+	private TabFolder editorsFolder;
> 
>-	private Table editorTable;
>+	/**
>+	 * The table that renders the list of internal editors to the user.
>+	 */
>+	private Table internalEditorsTable;
> 
>-	private Button browseExternalEditorsButton;
>+	/**
>+	 * The table that renders the list of external editors to the user.
>+	 */
>+	private Table externalEditorsTable;
> 
>-	private Button internalButton;
>+	/**
>+	 * The button for browsing to an external application for opening a file.
>+	 */
>+	private Button browseExternalEditorsButton;
> 
> 	private Button okButton;
> 
>@@ -85,7 +100,11 @@
> 
> 	private ResourceManager resourceManager;
> 
>-	private TableViewer editorTableViewer;
>+	private TableViewer internalEditorsTreeViewer;
>+
>+	private TableViewer externalEditorsTableViewer;
>+
>+	private LabelProvider labelProvider;
> 
> 	private static final String[] Executable_Filters;
> 
>@@ -111,13 +130,16 @@
> 	}
> 
> 	/**
>-	 * This method is called if a button has been pressed.
>+	 * This method is called if the 'OK' button has been pressed.
> 	 */
>-	protected void buttonPressed(int buttonId) {
>-		if (buttonId == IDialogConstants.OK_ID) {
>-			saveWidgetValues();
>+	protected void okPressed() {
>+		saveWidgetValues();
>+		if (editorsFolder.getSelectionIndex() == 0) {
>+			selectedEditor = (EditorDescriptor) internalEditorsTable.getSelection()[0].getData();
>+		} else {
>+			selectedEditor = (EditorDescriptor) externalEditorsTable.getSelection()[0].getData();
> 		}
>-		super.buttonPressed(buttonId);
>+		super.okPressed();
> 	}
> 
> 	/**
>@@ -151,49 +173,19 @@
> 	 * @return the dialog area control
> 	 */
> 	protected Control createDialogArea(Composite parent) {
>-		Font font = parent.getFont();
> 		// create main group
> 		Composite contents = (Composite) super.createDialogArea(parent);
>-		((GridLayout) contents.getLayout()).numColumns = 2;
> 
> 		// begin the layout
> 		Label textLabel = new Label(contents, SWT.NONE);
> 		textLabel.setText(message);
>-		GridData data = new GridData();
>-		data.horizontalSpan = 2;
>-		textLabel.setLayoutData(data);
>-		textLabel.setFont(font);
>-
>-		internalButton = new Button(contents, SWT.RADIO | SWT.LEFT);
>-		internalButton.setText(WorkbenchMessages.EditorSelection_internal);
>-		internalButton.addListener(SWT.Selection, listener);
>-		data = new GridData();
>-		data.horizontalSpan = 1;
>-		internalButton.setLayoutData(data);
>-		internalButton.setFont(font);
>-
>-		externalButton = new Button(contents, SWT.RADIO | SWT.LEFT);
>-		externalButton.setText(WorkbenchMessages.EditorSelection_external);
>-		externalButton.addListener(SWT.Selection, listener);
>-		data = new GridData();
>-		data.horizontalSpan = 1;
>-		externalButton.setLayoutData(data);
>-		externalButton.setFont(font);
> 
>-		editorTable = new Table(contents, SWT.SINGLE | SWT.BORDER);
>-		data = new GridData();
>+		editorsFolder = new TabFolder(contents, SWT.TOP);
>+		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
> 		data.widthHint = convertHorizontalDLUsToPixels(TABLE_WIDTH);
>-		data.horizontalAlignment = GridData.FILL;
>-		data.grabExcessHorizontalSpace = true;
>-		data.verticalAlignment = GridData.FILL;
>-		data.grabExcessVerticalSpace = true;
>-		data.horizontalSpan = 2;
>-		editorTable.setLayoutData(data);
>-		editorTable.setFont(font);
>-		data.heightHint = editorTable.getItemHeight() * 12;
>-		editorTableViewer = new TableViewer(editorTable);
>-		editorTableViewer.setContentProvider(ArrayContentProvider.getInstance());
>-		editorTableViewer.setLabelProvider(new LabelProvider() {
>+		editorsFolder.setLayoutData(data);
>+
>+		labelProvider = new LabelProvider() {
> 			public String getText(Object element) {
> 				IEditorDescriptor d = (IEditorDescriptor) element;
> 				return TextProcessor.process(d.getLabel(), "."); //$NON-NLS-1$
>@@ -203,36 +195,99 @@
> 				IEditorDescriptor d = (IEditorDescriptor) element;
> 				return (Image) resourceManager.get(d.getImageDescriptor());
> 			}
>-		});
>-		editorTable.addListener(SWT.Selection, listener);
>-		editorTable.addListener(SWT.DefaultSelection, listener);
>-		editorTable.addListener(SWT.MouseDoubleClick, listener);
>-
>-		browseExternalEditorsButton = new Button(contents, SWT.PUSH);
>-		browseExternalEditorsButton
>-				.setText(WorkbenchMessages.EditorSelection_browse);
>-		browseExternalEditorsButton.addListener(SWT.Selection, listener);
>-		data = new GridData();
>-		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
>-		data.widthHint = Math.max(widthHint, browseExternalEditorsButton
>-				.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
>-		browseExternalEditorsButton.setLayoutData(data);
>-		browseExternalEditorsButton.setFont(font);
>+		};
>+
>+		createInternalEditorsTable();
>+		createExternalEditorsTable();
> 
> 		restoreWidgetValues(); // Place buttons to the appropriate state
> 
>-		fillEditorTable();
>+		internalEditorsTreeViewer.setInput(getInternalEditors());
>+		handleTabSelection();
>+
>+		editorsFolder.addListener(SWT.Selection, listener);
>+		editorsFolder.addListener(SWT.DefaultSelection, listener);
> 
>-		updateEnableState();
>+		Dialog.applyDialogFont(contents);
>+
>+		int tableHeight = externalEditorsTable.getItemHeight() * 12;
>+		((GridData) internalEditorsTreeViewer.getControl().getLayoutData()).heightHint = tableHeight;
>+		((GridData) externalEditorsTable.getLayoutData()).heightHint = tableHeight;
> 
> 		return contents;
> 	}
> 
>-	protected void fillEditorTable() {
>-		if (internalButton.getSelection()) {
>-			editorTableViewer.setInput(getInternalEditors());
>+	private void createInternalEditorsTable() {
>+		TabItem internalEditorsItem = new TabItem(editorsFolder, SWT.LEAD);
>+		internalEditorsItem.setText(WorkbenchMessages.EditorSelection_internal);
>+
>+		Composite internalComposite = new Composite(editorsFolder, SWT.NONE);
>+		GridLayout layout = new GridLayout(1, false);
>+		layout.marginWidth = 0;
>+		layout.marginHeight = 0;
>+		internalComposite.setLayout(layout);
>+
>+		internalEditorsTreeViewer = new TableViewer(internalComposite, SWT.SINGLE | SWT.BORDER);
>+		internalEditorsTreeViewer.setContentProvider(ArrayContentProvider.getInstance());
>+		internalEditorsTreeViewer.setLabelProvider(labelProvider);
>+		internalEditorsTreeViewer.addOpenListener(new IOpenListener() {
>+			public void open(OpenEvent event) {
>+				okPressed();
>+			}
>+		});
>+
>+		internalEditorsTable = internalEditorsTreeViewer.getTable();
>+		internalEditorsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
>+		internalEditorsTable.addListener(SWT.Selection, listener);
>+		internalEditorsTable.addListener(SWT.DefaultSelection, listener);
>+
>+		internalEditorsItem.setControl(internalComposite);
>+	}
>+
>+	private void createExternalEditorsTable() {
>+		Composite externalComposite = new Composite(editorsFolder, SWT.NONE);
>+		GridLayout layout = new GridLayout(1, false);
>+		layout.marginWidth = 0;
>+		layout.marginHeight = 0;
>+		externalComposite.setLayout(layout);
>+
>+		TabItem externalEditorsItem = new TabItem(editorsFolder, SWT.LEAD);
>+		externalEditorsItem.setText(WorkbenchMessages.EditorSelection_external);
>+
>+		externalEditorsTableViewer = new TableViewer(externalComposite, SWT.SINGLE | SWT.BORDER);
>+		externalEditorsTableViewer.setContentProvider(ArrayContentProvider.getInstance());
>+		externalEditorsTableViewer.setLabelProvider(labelProvider);
>+		externalEditorsTableViewer.addOpenListener(new IOpenListener() {
>+			public void open(OpenEvent event) {
>+				okPressed();
>+			}
>+		});
>+
>+		externalEditorsTable = externalEditorsTableViewer.getTable();
>+		externalEditorsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
>+		externalEditorsTable.addListener(SWT.Selection, listener);
>+		externalEditorsTable.addListener(SWT.DefaultSelection, listener);
>+
>+		browseExternalEditorsButton = new Button(externalComposite, SWT.PUSH);
>+		GridData data = new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false);
>+		int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
>+		data.widthHint = Math.max(widthHint, browseExternalEditorsButton
>+				.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
>+		browseExternalEditorsButton.setLayoutData(data);
>+		browseExternalEditorsButton.setText(WorkbenchMessages.EditorSelection_browse);
>+		browseExternalEditorsButton.addListener(SWT.Selection, listener);
>+
>+		externalEditorsItem.setControl(externalComposite);
>+	}
>+
>+	private void handleTabSelection() {
>+		if (editorsFolder.getSelectionIndex() == 0) {
>+			internalEditorsTable.setFocus();
> 		} else {
>-			editorTableViewer.setInput(getExternalEditors());
>+			if (externalEditors == null) {
>+				externalEditorsTableViewer.setInput(getExternalEditors());
>+			}
>+			externalEditorsTable.setFocus();
> 		}
> 	}
> 
>@@ -344,18 +399,15 @@
> 		if (result != null) {
> 			EditorDescriptor editor = EditorDescriptor.createForProgram(result);
> 			// pretend we had obtained it from the list of os registered editors
>-			TableItem ti = new TableItem(editorTable, SWT.NULL);
>+			TableItem ti = new TableItem(externalEditorsTable, SWT.NULL);
> 			ti.setData(editor);
> 			ti.setText(editor.getLabel());
> 			Image image = editor.getImageDescriptor().createImage();
> 			ti.setImage(image);
> 
>-			// need to pass an array to setSelection -- 1FSKYVO: SWT:ALL -
>-			// inconsistent setSelection api on Table
>-			editorTable.setSelection(new TableItem[] { ti });
>-			editorTable.showSelection();
>-			editorTable.setFocus();
>-			selectedEditor = editor;
>+			externalEditorsTable.setSelection(ti);
>+			externalEditorsTable.showSelection();
>+			externalEditorsTable.setFocus();
> 
> 			/*
> 			 * add to our collection of cached external editors in case the user
>@@ -370,21 +422,13 @@
> 	}
> 
> 	/**
>-	 * Handle a double click event on the list
>-	 */
>-	protected void handleDoubleClickEvent() {
>-		buttonPressed(IDialogConstants.OK_ID);
>-	}
>-
>-	/**
> 	 * Use the dialog store to restore widget values to the values that they
> 	 * held last time this wizard was used to completion
> 	 */
> 	protected void restoreWidgetValues() {
> 		IDialogSettings settings = getDialogSettings();
> 		boolean wasExternal = settings.getBoolean(STORE_ID_INTERNAL_EXTERNAL);
>-		internalButton.setSelection(!wasExternal);
>-		externalButton.setSelection(wasExternal);
>+		editorsFolder.setSelection(wasExternal ? 1 : 0);
> 	}
> 
> 	/**
>@@ -394,8 +438,7 @@
> 	protected void saveWidgetValues() {
> 		IDialogSettings settings = getDialogSettings();
> 		// record whether use was viewing internal or external editors
>-		settings
>-				.put(STORE_ID_INTERNAL_EXTERNAL, !internalButton.getSelection());
>+		settings.put(STORE_ID_INTERNAL_EXTERNAL, editorsFolder.getSelectionIndex() == 1);
> 	}
> 
> 	/**
>@@ -418,20 +461,9 @@
> 		editorsToFilter = editors;
> 	}
> 
>-	/**
>-	 * Update enabled state.
>-	 */
>-	protected void updateEnableState() {
>-		boolean enableExternal = externalButton.getSelection();
>-		browseExternalEditorsButton.setEnabled(enableExternal);
>-		updateOkButton();
>-	}
>-
> 	protected void createButtonsForButtonBar(Composite parent) {
>-		okButton = createButton(parent, IDialogConstants.OK_ID,
>-				IDialogConstants.OK_LABEL, true);
>-		createButton(parent, IDialogConstants.CANCEL_ID,
>-				IDialogConstants.CANCEL_LABEL, false);
>+		super.createButtonsForButtonBar(parent);
>+		okButton = getButton(IDialogConstants.OK_ID);
> 		// initially there is no selection so OK button should not be enabled
> 		okButton.setEnabled(false);
> 
>@@ -442,16 +474,14 @@
> 	 */
> 	protected void updateOkButton() {
> 		// Buttons are null during dialog creation
>-		if (okButton == null) {
>-			return;
>-		}
>-		// If there is no selection, do not enable OK button
>-		if (editorTable.getSelectionCount() == 0) {
>-			okButton.setEnabled(false);
>-			return;
>+		if (okButton != null && !okButton.isDisposed()) {
>+			// only enable the 'OK' button if something was selected
>+			if (editorsFolder.getSelectionIndex() == 0) {
>+				okButton.setEnabled(internalEditorsTable.getSelectionCount() == 1);
>+			} else {
>+				okButton.setEnabled(externalEditorsTable.getSelectionCount() == 1);
>+			}
> 		}
>-		// At this point, there is a selection
>-		okButton.setEnabled(selectedEditor != null);
> 	}
> 
> 	private class DialogListener implements Listener {
>@@ -462,24 +492,12 @@
> 		 * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
> 		 */
> 		public void handleEvent(Event event) {
>-			if (event.type == SWT.MouseDoubleClick) {
>-				handleDoubleClickEvent();
>-				return;
>-			}
>-			if (event.widget == externalButton) {
>-				fillEditorTable();
>+			if (event.widget == editorsFolder) {
>+				handleTabSelection();
> 			} else if (event.widget == browseExternalEditorsButton) {
> 				promptForExternalEditor();
>-			} else if (event.widget == editorTable) {
>-				if (editorTable.getSelectionIndex() != -1) {
>-					selectedEditor = (EditorDescriptor) editorTable
>-							.getSelection()[0].getData();
>-				} else {
>-					selectedEditor = null;
>-					okButton.setEnabled(false);
>-				}
> 			}
>-			updateEnableState();
>+			updateOkButton();
> 		}
> 
> 	}

Actions: View | Diff

Attachments on bug 173095: 159378 | 164741 | 182717 | 182753 | 183292