Index: Eclipse UI/org/eclipse/ui/internal/messages.properties
===================================================================
RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v
retrieving revision 1.123
diff -u -r1.123 messages.properties
--- Eclipse UI/org/eclipse/ui/internal/messages.properties	24 Jul 2003 15:06:45 -0000	1.123
+++ Eclipse UI/org/eclipse/ui/internal/messages.properties	24 Jul 2003 17:47:23 -0000
@@ -1392,13 +1392,14 @@
 WorkbenchEditorsDialog.saveSelected=&Save Selected Editors
 WorkbenchEditorsDialog.selectClean=Se&lect Clean Editors
 WorkbenchEditorsDialog.invertSelection=&Invert Selection
+WorkbenchEditorsDialog.allSelection=Select All
 WorkbenchEditorsDialog.showAllPersp=Show editors from &all windows
 WorkbenchEditorsDialog.includeRecentlyUsed=Include &recently used editors
 WorkbenchEditorsDialog.name=Name
 WorkbenchEditorsDialog.path=Path
 WorkbenchEditorsDialog.perspective=Perspective
 WorkbenchEditorsDialog.recentlyUsed=<Recently Used>
-WorkbenchEditorsDialog.activate=Activate
+WorkbenchEditorsDialog.activate=Activate Selected Editor
 WorkbenchEditorsDialog.close=Close
 
 ShowPartPaneMenuAction.text=Show &System Menu
Index: Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java
===================================================================
RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java,v
retrieving revision 1.10
diff -u -r1.10 WorkbenchEditorsDialog.java
--- Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java	10 Apr 2003 15:03:44 -0000	1.10
+++ Eclipse UI/org/eclipse/ui/internal/dialogs/WorkbenchEditorsDialog.java	24 Jul 2003 17:47:23 -0000
@@ -39,6 +39,7 @@
 	private Button closeSelected;
 	private Button selectClean;
 	private Button invertSelection;
+	private Button allSelection;
 	
 	private boolean showAllPersp = false;
 	private int sortColumn;
@@ -110,13 +111,16 @@
 	 * @see org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse.swt.widgets.Composite)
 	 */
 	protected void createButtonsForButtonBar(Composite parent) {
-		super.createButtonsForButtonBar(parent);
-		
-		Button button = getButton(IDialogConstants.OK_ID);
-		if (button != null)
-			button.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.activate")); //$NON-NLS-1$
-			
-		button = getButton(IDialogConstants.CANCEL_ID);
+		// Typically we would use the parent's createButtonsForButtonBar.
+		// However, we only want a Cancel button and not an OK button.  The
+		// OK button will be used later (in createDialogArea) to activate
+		// the selected editor.
+		createButton(
+			parent,
+			IDialogConstants.CANCEL_ID,
+			IDialogConstants.CANCEL_LABEL,
+			false);				
+		Button button = getButton(IDialogConstants.CANCEL_ID);
 		if (button != null)
 			button.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.close")); //$NON-NLS-1$
 		
@@ -189,33 +193,15 @@
 		tc.setResizable(true);
 		tc.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.path")); //$NON-NLS-1$
 		tc.addSelectionListener(headerListener);
-		//A composite for save editors and close editors buttons
+		
+		// A composite for selection option buttons
 		Composite selectionButtons = new Composite(dialogArea,SWT.NULL);
+		Label compLabel = new Label(selectionButtons,SWT.NULL);
+		compLabel.setFont(font);
 		GridLayout layout = new GridLayout();
 		layout.numColumns = 4;
 		selectionButtons.setLayout(layout);
-		//Close editors button
-		closeSelected = new Button(selectionButtons,SWT.PUSH);
-		closeSelected.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.closeSelected")); //$NON-NLS-1$
-		closeSelected.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				closeItems(editorsTable.getSelection());
-			}
-		});
-		closeSelected.setFont(font);
-		setButtonLayoutData(closeSelected);
-		
-		//Save editors button
-		saveSelected = new Button(selectionButtons,SWT.PUSH);
-		saveSelected.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.saveSelected")); //$NON-NLS-1$
-		saveSelected.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				saveItems(editorsTable.getSelection(),null);
-			}
-		});
-		saveSelected.setFont(font);
-		setButtonLayoutData(saveSelected);
-		
+
 		//Select clean editors button
 		selectClean = new Button(selectionButtons,SWT.PUSH);
 		selectClean.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.selectClean")); //$NON-NLS-1$
@@ -239,7 +225,56 @@
 		});
 		invertSelection.setFont(font);
 		setButtonLayoutData(invertSelection);
+
+		//Select all button
+		allSelection = new Button(selectionButtons,SWT.PUSH);
+		allSelection.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.allSelection")); //$NON-NLS-1$
+		allSelection.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				editorsTable.setSelection(editorsTable.getItems());
+				updateButtons();
+			}
+		});
+		allSelection.setFont(font);
+		setButtonLayoutData(allSelection);
+
+		// A composite for selected editor action buttons
+		Composite actionButtons = new Composite(dialogArea,SWT.NULL);
+		Label actLabel = new Label(actionButtons,SWT.NULL);
+		actLabel.setFont(font);
+		GridLayout actLayout = new GridLayout();
+		actLayout.numColumns = 4;
+		actionButtons.setLayout(actLayout);
+
+		// Activate selected editor button
+		createButton(
+			actionButtons,
+			IDialogConstants.OK_ID,
+			WorkbenchMessages.getString("WorkbenchEditorsDialog.activate"),
+			true);
 		
+		//Close selected editors button
+		closeSelected = new Button(actionButtons,SWT.PUSH);
+		closeSelected.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.closeSelected")); //$NON-NLS-1$
+		closeSelected.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				closeItems(editorsTable.getSelection());
+			}
+		});
+		closeSelected.setFont(font);
+		setButtonLayoutData(closeSelected);
+		
+		//Save selected editors button
+		saveSelected = new Button(actionButtons,SWT.PUSH);
+		saveSelected.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.saveSelected")); //$NON-NLS-1$
+		saveSelected.addSelectionListener(new SelectionAdapter() {
+			public void widgetSelected(SelectionEvent e) {
+				saveItems(editorsTable.getSelection(),null);
+			}
+		});
+		saveSelected.setFont(font);
+		setButtonLayoutData(saveSelected);
+				
 		//Show only active perspective button
 		final Button showAllPerspButton = new Button(dialogArea,SWT.CHECK);
 		showAllPerspButton.setText(WorkbenchMessages.getString("WorkbenchEditorsDialog.showAllPersp")); //$NON-NLS-1$