Attachment #4188 for bug #35130

Lines 34-39 Link Here

(-)src/org/eclipse/jdt/internal/junit/launcher/JUnitMainTab.java (+2 lines)
34	import org.eclipse.swt.widgets.Shell;	34	import org.eclipse.swt.widgets.Shell;
35	import org.eclipse.swt.widgets.Text;	35	import org.eclipse.swt.widgets.Text;
36		36
		37	import org.eclipse.jface.dialogs.Dialog;
37	import org.eclipse.jface.dialogs.ProgressMonitorDialog;	38	import org.eclipse.jface.dialogs.ProgressMonitorDialog;
38	import org.eclipse.jface.resource.ImageDescriptor;	39	import org.eclipse.jface.resource.ImageDescriptor;
39	import org.eclipse.jface.viewers.ILabelProvider;	40	import org.eclipse.jface.viewers.ILabelProvider;
Lines 114-119 Link Here
114	createTestSelectionGroup(comp);	115	createTestSelectionGroup(comp);
115	createTestContainerSelectionGroup(comp);	116	createTestContainerSelectionGroup(comp);
116	createKeepAliveGroup(comp);	117	createKeepAliveGroup(comp);
		118	Dialog.applyDialogFont(comp);
117	}	119	}
118		120
119	private void createTestContainerSelectionGroup(Composite comp) {	121	private void createTestContainerSelectionGroup(Composite comp) {

Lines 26-31 Link Here

(-)src/org/eclipse/jdt/internal/junit/ui/JUnitPreferencePage.java (-1 / +3 lines)
26	import org.eclipse.jdt.ui.IJavaElementSearchConstants;	26	import org.eclipse.jdt.ui.IJavaElementSearchConstants;
27	import org.eclipse.jdt.ui.ISharedImages;	27	import org.eclipse.jdt.ui.ISharedImages;
28	import org.eclipse.jdt.ui.JavaUI;	28	import org.eclipse.jdt.ui.JavaUI;
		29
		30	import org.eclipse.jface.dialogs.Dialog;
29	import org.eclipse.jface.dialogs.IDialogConstants;	31	import org.eclipse.jface.dialogs.IDialogConstants;
30	import org.eclipse.jface.dialogs.ProgressMonitorDialog;	32	import org.eclipse.jface.dialogs.ProgressMonitorDialog;
31	import org.eclipse.jface.preference.IPreferenceStore;	33	import org.eclipse.jface.preference.IPreferenceStore;
Lines 329-335 Link Here
329	composite.setLayoutData(data);	331	composite.setLayoutData(data);
330		332
331	createStackFilterPreferences(composite);	333	createStackFilterPreferences(composite);
332		334	Dialog.applyDialogFont(composite);
333	return composite;	335	return composite;
334	}	336	}
335		337

Lines 222-227 Link Here

(-)src/org/eclipse/jdt/internal/junit/util/CheckedTableSelectionDialog.java (+1 lines)
222	treeWidget.setEnabled(false);	222	treeWidget.setEnabled(false);
223	buttonComposite.setEnabled(false);	223	buttonComposite.setEnabled(false);
224	}	224	}
		225	applyDialogFont(composite);
225	return composite;	226	return composite;
226	}	227	}
227		228

Lines 31-36 Link Here

(-)src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage.java (+2 lines)
31	import org.eclipse.swt.widgets.Label;	31	import org.eclipse.swt.widgets.Label;
32	import org.eclipse.swt.widgets.Text;	32	import org.eclipse.swt.widgets.Text;
33		33
		34	import org.eclipse.jface.dialogs.Dialog;
34	import org.eclipse.jface.dialogs.IDialogSettings;	35	import org.eclipse.jface.dialogs.IDialogSettings;
35	import org.eclipse.jface.viewers.IStructuredSelection;	36	import org.eclipse.jface.viewers.IStructuredSelection;
36		37
Lines 268-273 Link Here
268	//set default and focus	269	//set default and focus
269	fClassToTestText.setText(fDefaultClassToTest);	270	fClassToTestText.setText(fDefaultClassToTest);
270	restoreWidgetValues();	271	restoreWidgetValues();
		272	Dialog.applyDialogFont(composite);
271	WorkbenchHelp.setHelp(composite, IJUnitHelpContextIds.NEW_TESTCASE_WIZARD_PAGE);	273	WorkbenchHelp.setHelp(composite, IJUnitHelpContextIds.NEW_TESTCASE_WIZARD_PAGE);
272		274
273	}	275	}

Lines 22-27 Link Here

(-)src/org/eclipse/jdt/internal/junit/wizards/NewTestCaseCreationWizardPage2.java (+3 lines)
22	import org.eclipse.jdt.internal.junit.ui.IJUnitHelpContextIds;	22	import org.eclipse.jdt.internal.junit.ui.IJUnitHelpContextIds;
23	import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;	23	import org.eclipse.jdt.internal.junit.ui.JUnitPlugin;
24	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;	24	import org.eclipse.jdt.internal.ui.viewsupport.AppearanceAwareLabelProvider;
		25
		26	import org.eclipse.jface.dialogs.Dialog;
25	import org.eclipse.jface.dialogs.IDialogSettings;	27	import org.eclipse.jface.dialogs.IDialogSettings;
26	import org.eclipse.jface.viewers.CheckStateChangedEvent;	28	import org.eclipse.jface.viewers.CheckStateChangedEvent;
27	import org.eclipse.jface.viewers.ICheckStateListener;	29	import org.eclipse.jface.viewers.ICheckStateListener;
Lines 86-91 Link Here
86	createTasksControls(container);	88	createTasksControls(container);
87	setControl(container);	89	setControl(container);
88	restoreWidgetValues();	90	restoreWidgetValues();
		91	Dialog.applyDialogFont(container);
89	WorkbenchHelp.setHelp(container, IJUnitHelpContextIds.NEW_TESTCASE_WIZARD_PAGE2);	92	WorkbenchHelp.setHelp(container, IJUnitHelpContextIds.NEW_TESTCASE_WIZARD_PAGE2);
90	}	93	}
91		94

Return to bug 35130

Lines 25-30 Link Here

(-)src/org/eclipse/jdt/internal/junit/util/SWTUtil.java (+5 lines)
25	import org.eclipse.swt.widgets.Widget;	25	import org.eclipse.swt.widgets.Widget;
26		26
27	import org.eclipse.jface.dialogs.IDialogConstants;	27	import org.eclipse.jface.dialogs.IDialogConstants;
		28	import org.eclipse.jface.resource.JFaceResources;
28	import org.eclipse.jface.util.Assert;	29	import org.eclipse.jface.util.Assert;
29		30
30	/**	31	/**
Lines 74-79 Link Here
74	* Returns a width hint for a button control.	75	* Returns a width hint for a button control.
75	*/	76	*/
76	public static int getButtonWidthHint(Button button) {	77	public static int getButtonWidthHint(Button button) {
		78	if (button.getFont().equals(JFaceResources.getDefaultFont()))
		79	button.setFont(JFaceResources.getDialogFont());
77	PixelConverter converter= new PixelConverter(button);	80	PixelConverter converter= new PixelConverter(button);
78	int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);	81	int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
79	return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);	82	return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
Lines 83-88 Link Here
83	* Returns a height hint for a button control.	86	* Returns a height hint for a button control.
84	*/	87	*/
85	public static int getButtonHeigthHint(Button button) {	88	public static int getButtonHeigthHint(Button button) {
		89	if (button.getFont().equals(JFaceResources.getDefaultFont()))
		90	button.setFont(JFaceResources.getDialogFont());
86	PixelConverter converter= new PixelConverter(button);	91	PixelConverter converter= new PixelConverter(button);
87	return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);	92	return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
88	}	93	}

Lines 41-46 Link Here

(-)src/org/eclipse/jdt/internal/junit/wizards/NewTestSuiteCreationWizardPage.java (-1 / +4 lines)
41	import org.eclipse.jdt.internal.junit.util.TestSearchEngine;	41	import org.eclipse.jdt.internal.junit.util.TestSearchEngine;
42	import org.eclipse.jdt.ui.JavaElementLabelProvider;	42	import org.eclipse.jdt.ui.JavaElementLabelProvider;
43	import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;	43	import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;
		44
		45	import org.eclipse.jface.dialogs.Dialog;
44	import org.eclipse.jface.dialogs.IDialogSettings;	46	import org.eclipse.jface.dialogs.IDialogSettings;
45	import org.eclipse.jface.dialogs.MessageDialog;	47	import org.eclipse.jface.dialogs.MessageDialog;
46	import org.eclipse.jface.operation.IRunnableWithProgress;	48	import org.eclipse.jface.operation.IRunnableWithProgress;
Lines 139-145 Link Here
139	createClassesInSuiteControl(composite, nColumns);	141	createClassesInSuiteControl(composite, nColumns);
140	createMethodStubSelectionControls(composite, nColumns);	142	createMethodStubSelectionControls(composite, nColumns);
141	setControl(composite);	143	setControl(composite);
142	restoreWidgetValues();	144	restoreWidgetValues();
		145	Dialog.applyDialogFont(composite);
143	WorkbenchHelp.setHelp(composite, IJUnitHelpContextIds.NEW_TESTSUITE_WIZARD_PAGE);	146	WorkbenchHelp.setHelp(composite, IJUnitHelpContextIds.NEW_TESTSUITE_WIZARD_PAGE);
144	}	147	}
145		148