Attachment 36451 Details for Bug 127658 – patch to remove duplicated code

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

[patch] patch to remove duplicated code

workbench_debug_127658.txt (text/plain), 4.12 KB, created by Curtis d'Entremont

on 2006-03-16 17:50:47 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis d'Entremont

Created: 2006-03-16 17:50:47 EST

Size: 4.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.debug.ui
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java,v
>retrieving revision 1.146
>diff -u -r1.146 LaunchConfigurationsDialog.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java	13 Mar 2006 20:22:09 -0000	1.146
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsDialog.java	16 Mar 2006 22:48:29 -0000
>@@ -436,19 +436,14 @@
> 		fProgressMonitorCancelButton.setFont(font);
> 		monitorComposite.setVisible(false);
> 
>-		Composite buttonComposite = new Composite(composite, SWT.NONE);
>-		layout = new GridLayout();
>-		layout.numColumns = 0;
>-		layout.makeColumnsEqualWidth = true;
>-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
>-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
>-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
>-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
>-		buttonComposite.setLayout(layout);
>-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_CENTER);
>-		buttonComposite.setLayoutData(data);
>-		buttonComposite.setFont(composite.getFont());
>-		createButtonsForButtonBar(buttonComposite);
>+		/*
>+		 * Create the rest of the button bar, but tell it not to
>+		 * create a help button (we've already created it).
>+		 */
>+		boolean helpAvailable = isHelpAvailable();
>+		setHelpAvailable(false);
>+		super.createButtonBar(composite);
>+		setHelpAvailable(helpAvailable);
> 		return composite;
> 	}
> 
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java,v
>retrieving revision 1.12
>diff -u -r1.12 SelectionStatusDialog.java
>--- Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java	6 Mar 2006 16:22:40 -0000	1.12
>+++ Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java	16 Mar 2006 22:48:30 -0000
>@@ -188,30 +188,13 @@
>         fStatusLine.setLayoutData(statusData);
> 
> 		/*
>-		 * This code is duplicated from Dialog#createButtonBar. We do not want
>-		 * to call the TrayDialog implementation because it adds a help control.
>-		 * Since this is a custom button bar, we explicitly added the help control
>-		 * in an appropriate place above, and we use the Dialog implementation of
>-		 * createButtonBar, which does not add a help control.
>+		 * Create the rest of the button bar, but tell it not to
>+		 * create a help button (we've already created it).
> 		 */
>-		Composite buttonComposite = new Composite(composite, SWT.NONE);
>-		// create a layout with spacing and margins appropriate for the font
>-		// size.
>-		layout = new GridLayout();
>-		layout.numColumns = 0; // this is incremented by createButton
>-		layout.makeColumnsEqualWidth = true;
>-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
>-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
>-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
>-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
>-		buttonComposite.setLayout(layout);
>-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_END
>-				| GridData.VERTICAL_ALIGN_CENTER);
>-		buttonComposite.setLayoutData(data);
>-		buttonComposite.setFont(composite.getFont());
>-		
>-		// Add the buttons to the button bar.
>-		createButtonsForButtonBar(buttonComposite);
>+		boolean helpAvailable = isHelpAvailable();
>+		setHelpAvailable(false);
>+		super.createButtonBar(composite);
>+		setHelpAvailable(helpAvailable);
>         return composite;
>     }
>

Actions: View | Diff

Attachments on bug 127658: 34695 | 34776 | 36435 | 36451