Attachment 166682 Details for Bug 310511 – patch

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

[patch] patch

dialog-font.patch (text/plain), 6.98 KB, created by Darin Wright

on 2010-04-30 16:52:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-04-30 16:52:28 EDT

Size: 6.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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	30 Apr 2010 20:51:17 -0000
>@@ -243,6 +243,7 @@
> 	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.setFont(controls.getFont());
> 		fConditional.setText(processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_0));
> 		fConditional.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
> 		fConditional.addSelectionListener(new SelectionAdapter() {
>@@ -253,9 +254,9 @@
> 			}
> 		});
> 		Composite radios = SWTFactory.createComposite(controls, controls.getFont(), 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
>-		fWhenTrue = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_1));
>+		fWhenTrue = createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_1), 1);
> 		fWhenTrue.setLayoutData(new GridData());
>-		fWhenChange = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_2));
>+		fWhenChange = createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointConditionEditor_2), 1);
> 		fWhenChange.setLayoutData(new GridData());
> 		fWhenTrue.addSelectionListener(new SelectionAdapter() {
> 			public void widgetSelected(SelectionEvent e) {
>Index: ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java,v
>retrieving revision 1.3
>diff -u -r1.3 AbstractJavaBreakpointEditor.java
>--- ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java	24 Mar 2010 14:57:51 -0000	1.3
>+++ ui/org/eclipse/jdt/internal/debug/ui/breakpoints/AbstractJavaBreakpointEditor.java	30 Apr 2010 20:51:17 -0000
>@@ -14,6 +14,10 @@
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.ListenerList;
> import org.eclipse.jface.action.LegacyActionTools;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.graphics.Image;
>+import org.eclipse.swt.layout.GridData;
>+import org.eclipse.swt.widgets.Button;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.ui.IPropertyListener;
>@@ -32,6 +36,55 @@
>     private boolean fSuppressPropertyChanges = false;
> 	
> 	/**
>+	 * Avoids the SWT Factory that sets the font to be the dialog font. Does not set dimension hints.
>+	 * 
>+	 * @param parent the parent to add the button to
>+	 * @param label the label for the button
>+	 * @param image the image for the button 
>+	 * @param checked the initial checked state of the button
>+	 * @param hspan the horizontal span to take up in the parent composite
>+	 * @return a new checked button set to the initial checked state
>+	 * @since 3.3
>+	 */
>+	public static Button createCheckButton(Composite parent, String label, Image image, boolean checked, int hspan) {
>+		Button button = new Button(parent, SWT.CHECK);
>+		button.setFont(parent.getFont());
>+		button.setSelection(checked);
>+		if(image != null) {
>+			button.setImage(image);
>+		}
>+		if(label != null) {
>+			button.setText(label);
>+		}
>+		GridData gd = new GridData();
>+		gd.horizontalSpan = hspan;
>+		button.setLayoutData(gd);
>+		return button;
>+	}
>+	
>+	/**
>+	 * Avoids SWT Factory that set the font to be the dialog font. Does not set dimension hints.
>+	 * 
>+	 * @param parent parent control
>+	 * @param label button label or <code>null</code>
>+	 * @param hspan the number of columns to span in the parent composite
>+	 * 
>+	 * @return a new radio button
>+	 * @since 3.6
>+	 */
>+	public static Button createRadioButton(Composite parent, String label, int hspan) {
>+		Button button = new Button(parent, SWT.RADIO);
>+		button.setFont(parent.getFont());
>+		if (label != null) {
>+			button.setText(label);
>+		}
>+		GridData gd = new GridData(GridData.BEGINNING);
>+		gd.horizontalSpan = hspan;
>+		button.setLayoutData(gd);	
>+		return button;	
>+	}	
>+	
>+	/**
> 	 * Adds the given property listener to this editor. Property changes
> 	 * are reported on the breakpoint being edited. Property identifiers
> 	 * are breakpoint attribute keys.
>Index: ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java,v
>retrieving revision 1.10
>diff -u -r1.10 StandardJavaBreakpointEditor.java
>--- ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java	24 Mar 2010 14:57:51 -0000	1.10
>+++ ui/org/eclipse/jdt/internal/debug/ui/breakpoints/StandardJavaBreakpointEditor.java	30 Apr 2010 20:51:17 -0000
>@@ -65,7 +65,7 @@
> 	
> 	protected Control createStandardControls(Composite parent) {
> 		Composite composite = SWTFactory.createComposite(parent, parent.getFont(), 4, 1, 0, 0, 0);
>-		fHitCountButton = SWTFactory.createCheckButton(composite, processMnemonics(PropertyPageMessages.JavaBreakpointPage_4), null, false, 1);
>+		fHitCountButton = createCheckButton(composite, processMnemonics(PropertyPageMessages.JavaBreakpointPage_4), null, false, 1);
> 		fHitCountButton.setLayoutData(new GridData());
> 		fHitCountButton.addSelectionListener(new SelectionAdapter() {
> 			public void widgetSelected(SelectionEvent event) {
>@@ -87,9 +87,9 @@
> 		});
> 		SWTFactory.createLabel(composite, "", 1); // spacer //$NON-NLS-1$
> 		Composite radios = SWTFactory.createComposite(composite, composite.getFont(), 2, 1, GridData.FILL_HORIZONTAL, 0, 0);
>-		fSuspendThread = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_7), 1);
>+		fSuspendThread = createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_7), 1);
> 		fSuspendThread.setLayoutData(new GridData());
>-		fSuspendVM = SWTFactory.createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_8), 1);
>+		fSuspendVM = createRadioButton(radios, processMnemonics(PropertyPageMessages.JavaBreakpointPage_8), 1);
> 		fSuspendVM.setLayoutData(new GridData());
> 		fSuspendThread.addSelectionListener(new SelectionAdapter() {
> 			public void widgetSelected(SelectionEvent e) {

Actions: View | Diff

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