Attachment 166822 Details for Bug 310511 – updated fix

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

[patch] updated fix

factory_update2.patch (text/plain), 8.46 KB, created by Michael Rennie

on 2010-05-03 14:14:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Rennie

Created: 2010-05-03 14:14:58 EDT

Size: 8.46 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.debug.ui
>Index: ui/org/eclipse/debug/internal/ui/SWTFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java,v
>retrieving revision 1.12
>diff -u -r1.12 SWTFactory.java
>--- ui/org/eclipse/debug/internal/ui/SWTFactory.java	2 Feb 2010 17:17:22 -0000	1.12
>+++ ui/org/eclipse/debug/internal/ui/SWTFactory.java	3 May 2010 18:13:43 -0000
>@@ -41,7 +41,7 @@
> 	 * Returns a width hint for a button control.
> 	 */
> 	public static int getButtonWidthHint(Button button) {
>-		button.setFont(JFaceResources.getDialogFont());
>+		/*button.setFont(JFaceResources.getDialogFont());*/
> 		PixelConverter converter= new PixelConverter(button);
> 		int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
> 		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
>@@ -111,7 +111,7 @@
> 		}
> 		GridData gd = new GridData();
> 		button.setLayoutData(gd);	
>-		SWTFactory.setButtonDimensionHint(button);
>+		setButtonDimensionHint(button);
> 		return button;	
> 	}	
> 
>@@ -138,7 +138,7 @@
> 		}
> 		GridData gd = new GridData(fill);
> 		button.setLayoutData(gd);	
>-		SWTFactory.setButtonDimensionHint(button);
>+		setButtonDimensionHint(button);
> 		return button;	
> 	}	
> 	
>@@ -177,7 +177,7 @@
> 		}
> 		GridData gd = new GridData();
> 		button.setLayoutData(gd);	
>-		SWTFactory.setButtonDimensionHint(button);
>+		setButtonDimensionHint(button);
> 		return button;	
> 	}	
> 	
>@@ -201,7 +201,7 @@
> 		GridData gd = new GridData(GridData.BEGINNING);
> 		gd.horizontalSpan = hspan;
> 		button.setLayoutData(gd);	
>-		SWTFactory.setButtonDimensionHint(button);
>+		setButtonDimensionHint(button);
> 		return button;	
> 	}
> 	
>Index: ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java,v
>retrieving revision 1.109
>diff -u -r1.109 LaunchConfigurationTabGroupViewer.java
>--- ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java	6 Jan 2010 19:54:40 -0000	1.109
>+++ ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationTabGroupViewer.java	3 May 2010 18:13:43 -0000
>@@ -293,7 +293,6 @@
> 		
> 		Composite buttonComp = SWTFactory.createComposite(blComp, 2, 1, GridData.HORIZONTAL_ALIGN_END);
> 		fApplyButton = SWTFactory.createPushButton(buttonComp, LaunchConfigurationsMessages.LaunchConfigurationDialog__Apply_17, null,GridData.HORIZONTAL_ALIGN_END);
>-		SWTFactory.setButtonDimensionHint(fApplyButton);
> 		fApplyButton.addSelectionListener(new SelectionAdapter() {
> 			public void widgetSelected(SelectionEvent evt) {
> 				handleApplyPressed();
>@@ -301,7 +300,6 @@
> 		});
> 
> 		fRevertButton = SWTFactory.createPushButton(buttonComp, LaunchConfigurationsMessages.LaunchConfigurationDialog_Revert_2, null, GridData.HORIZONTAL_ALIGN_END);
>-		SWTFactory.setButtonDimensionHint(fRevertButton);
> 		fRevertButton.addSelectionListener(new SelectionAdapter() {
> 			public void widgetSelected(SelectionEvent evt) {
> 				handleRevertPressed();
>#P org.eclipse.jdt.debug.ui
>Index: ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java,v
>retrieving revision 1.8
>diff -u -r1.8 JavaBreakpointConditionEditor.java
>--- ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java	24 Mar 2010 14:57:51 -0000	1.8
>+++ ui/org/eclipse/jdt/debug/ui/breakpoints/JavaBreakpointConditionEditor.java	3 May 2010 18:13:45 -0000
>@@ -242,8 +242,11 @@
> 	 */
> 	public Control createControl(Composite parent) {
> 		Composite controls = SWTFactory.createComposite(parent, parent.getFont(), 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
>-		fConditional = new Button(controls, SWT.CHECK);
>-		fConditional.setText(processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_0));
>+		fConditional = SWTFactory.createCheckButton(controls, 
>+				processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_0), 
>+				null, 
>+				false, 
>+				1);
> 		fConditional.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
> 		fConditional.addSelectionListener(new SelectionAdapter() {
> 			public void widgetSelected(SelectionEvent e) {
>Index: ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java,v
>retrieving revision 1.30
>diff -u -r1.30 SelectImportsDialog.java
>--- ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java	1 Feb 2010 21:18:09 -0000	1.30
>+++ ui/org/eclipse/jdt/internal/debug/ui/snippeteditor/SelectImportsDialog.java	3 May 2010 18:13:45 -0000
>@@ -139,7 +139,6 @@
> 	
> 	private void createImportButtons(Composite container) {
> 		PlatformUI.getWorkbench().getHelpSystem().setHelp(container, IJavaDebugHelpContextIds.SNIPPET_IMPORTS_DIALOG);
>-		Font font = container.getFont();
> 		
> 		// button container
> 		Composite buttonContainer = new Composite(container, SWT.NONE);
>@@ -152,12 +151,10 @@
> 		buttonContainer.setLayout(buttonLayout);
> 		
> 		// Add type button
>-		fAddTypeButton = new Button(buttonContainer, SWT.PUSH);
>-		fAddTypeButton.setText(SnippetMessages.getString("SelectImportsDialog.Add_&Type_1")); //$NON-NLS-1$
>-		fAddTypeButton.setToolTipText(SnippetMessages.getString("SelectImportsDialog.Choose_a_Type_to_Add_as_an_Import_2")); //$NON-NLS-1$
>-		gd = getButtonGridData(fAddTypeButton);
>-		fAddTypeButton.setLayoutData(gd);
>-		fAddTypeButton.setFont(font);
>+		fAddTypeButton = SWTFactory.createPushButton(buttonContainer, 
>+				SnippetMessages.getString("SelectImportsDialog.Add_&Type_1"),  //$NON-NLS-1$
>+				SnippetMessages.getString("SelectImportsDialog.Choose_a_Type_to_Add_as_an_Import_2"),  //$NON-NLS-1$
>+				null);
> 		fAddTypeButton.addSelectionListener(new SelectionListener() {
> 			public void widgetSelected(SelectionEvent se) {
> 				addType();
>@@ -167,12 +164,10 @@
> 		});
> 		
> 		// Add package button
>-		fAddPackageButton = new Button(buttonContainer, SWT.PUSH);
>-		fAddPackageButton.setText(SnippetMessages.getString("SelectImportsDialog.Add_&Package_3")); //$NON-NLS-1$
>-		fAddPackageButton.setToolTipText(SnippetMessages.getString("SelectImportsDialog.Choose_a_Package_to_Add_as_an_Import_4")); //$NON-NLS-1$
>-		gd = getButtonGridData(fAddPackageButton);
>-		fAddPackageButton.setLayoutData(gd);
>-		fAddPackageButton.setFont(font);
>+		fAddPackageButton = SWTFactory.createPushButton(buttonContainer, 
>+				SnippetMessages.getString("SelectImportsDialog.Add_&Package_3"),  //$NON-NLS-1$
>+				SnippetMessages.getString("SelectImportsDialog.Choose_a_Package_to_Add_as_an_Import_4"),  //$NON-NLS-1$
>+				null);
> 		fAddPackageButton.addSelectionListener(new SelectionListener() {
> 			public void widgetSelected(SelectionEvent se) {
> 				addPackage();
>@@ -182,12 +177,10 @@
> 		});
> 		
> 		// Remove button
>-		fRemoveImportsButton = new Button(buttonContainer, SWT.PUSH);
>-		fRemoveImportsButton.setText(SnippetMessages.getString("SelectImportsDialog.&Remove_5")); //$NON-NLS-1$
>-		fRemoveImportsButton.setToolTipText(SnippetMessages.getString("SelectImportsDialog.Remove_All_Selected_Imports_6")); //$NON-NLS-1$
>-		gd = getButtonGridData(fRemoveImportsButton);
>-		fRemoveImportsButton.setLayoutData(gd);
>-		fRemoveImportsButton.setFont(font);
>+		fRemoveImportsButton = SWTFactory.createPushButton(buttonContainer, 
>+				SnippetMessages.getString("SelectImportsDialog.&Remove_5"),  //$NON-NLS-1$
>+				SnippetMessages.getString("SelectImportsDialog.Remove_All_Selected_Imports_6"),  //$NON-NLS-1$
>+				null);
> 		fRemoveImportsButton.addSelectionListener(new SelectionListener() {
> 			public void widgetSelected(SelectionEvent se) {
> 				removeImports();
>@@ -199,13 +192,6 @@
> 		
> 	}
> 	
>-	private GridData getButtonGridData(Button button) {
>-		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
>-		button.setLayoutData(gd);
>-		SWTFactory.setButtonDimensionHint(button);
>-		return gd;
>-	}
>-		
> 	private void removeImports() {
> 		IStructuredSelection selection = (IStructuredSelection)fImportsViewer.getSelection();		
> 		fImportContentProvider.removeImports(selection.toArray());

Actions: View | Diff

Attachments on bug 310511: 166109 | 166682 | 166817 | 166822