Index: ui/org/eclipse/jdt/internal/ui/compare/CompareDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/compare/CompareDialog.java,v retrieving revision 1.9 diff -u -r1.9 CompareDialog.java --- ui/org/eclipse/jdt/internal/ui/compare/CompareDialog.java 10 Mar 2003 23:27:06 -0000 1.9 +++ ui/org/eclipse/jdt/internal/ui/compare/CompareDialog.java 18 Mar 2003 18:09:13 -0000 @@ -94,6 +94,7 @@ if (fInput != null) fContentPane.setInput(fInput); + applyDialogFont(parent); return parent; } Index: ui/org/eclipse/jdt/internal/ui/dialogs/BuildPathDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/BuildPathDialog.java,v retrieving revision 1.2 diff -u -r1.2 BuildPathDialog.java --- ui/org/eclipse/jdt/internal/ui/dialogs/BuildPathDialog.java 10 Mar 2003 21:56:47 -0000 1.2 +++ ui/org/eclipse/jdt/internal/ui/dialogs/BuildPathDialog.java 18 Mar 2003 18:09:14 -0000 @@ -64,6 +64,7 @@ fBlock= new BuildPathsBlock(listener, 0); fBlock.init(fProject, null, null); fBlock.createControl(result).setLayoutData(new GridData(GridData.FILL_BOTH)); + applyDialogFont(result); return result; } Index: ui/org/eclipse/jdt/internal/ui/dialogs/ListDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/ListDialog.java,v retrieving revision 1.3 diff -u -r1.3 ListDialog.java --- ui/org/eclipse/jdt/internal/ui/dialogs/ListDialog.java 10 Mar 2003 21:56:47 -0000 1.3 +++ ui/org/eclipse/jdt/internal/ui/dialogs/ListDialog.java 18 Mar 2003 18:09:15 -0000 @@ -75,6 +75,7 @@ GridData gd= new GridData(GridData.FILL_BOTH); gd.widthHint= convertWidthInCharsToPixels(55); label.setLayoutData(gd); + applyDialogFont(label); return label; } @@ -90,6 +91,7 @@ gd.widthHint= convertWidthInCharsToPixels(55); gd.heightHint= convertHeightInCharsToPixels(15); table.setLayoutData(gd); + applyDialogFont(parent); return parent; } Index: ui/org/eclipse/jdt/internal/ui/dialogs/MultiElementListSelectionDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/MultiElementListSelectionDialog.java,v retrieving revision 1.28 diff -u -r1.28 MultiElementListSelectionDialog.java --- ui/org/eclipse/jdt/internal/ui/dialogs/MultiElementListSelectionDialog.java 10 Mar 2003 21:56:47 -0000 1.28 +++ ui/org/eclipse/jdt/internal/ui/dialogs/MultiElementListSelectionDialog.java 18 Mar 2003 18:09:16 -0000 @@ -120,6 +120,7 @@ fCurrentPage= 0; setPageData(); + applyDialogFont(contents); return contents; } @@ -157,7 +158,7 @@ data= new GridData(GridData.HORIZONTAL_ALIGN_FILL); data.horizontalAlignment= GridData.END; fPageInfoLabel.setLayoutData(data); - + applyDialogFont(messageLabel); return messageLabel; } Index: ui/org/eclipse/jdt/internal/ui/dialogs/OptionalMessageDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/OptionalMessageDialog.java,v retrieving revision 1.5 diff -u -r1.5 OptionalMessageDialog.java --- ui/org/eclipse/jdt/internal/ui/dialogs/OptionalMessageDialog.java 13 Mar 2003 16:25:47 -0000 1.5 +++ ui/org/eclipse/jdt/internal/ui/dialogs/OptionalMessageDialog.java 18 Mar 2003 18:09:17 -0000 @@ -78,6 +78,7 @@ setDialogEnabled(fId, !((Button)e.widget).getSelection()); } }); + applyDialogFont(fHideDialogCheckBox); return fHideDialogCheckBox; } Index: ui/org/eclipse/jdt/internal/ui/dialogs/ProblemDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/ProblemDialog.java,v retrieving revision 1.6 diff -u -r1.6 ProblemDialog.java --- ui/org/eclipse/jdt/internal/ui/dialogs/ProblemDialog.java 10 Mar 2003 21:56:47 -0000 1.6 +++ ui/org/eclipse/jdt/internal/ui/dialogs/ProblemDialog.java 18 Mar 2003 18:09:18 -0000 @@ -80,6 +80,7 @@ } if (i < childCount && label != null) label.setImage(fImage); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/dialogs/StatusDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/dialogs/StatusDialog.java,v retrieving revision 1.21 diff -u -r1.21 StatusDialog.java --- ui/org/eclipse/jdt/internal/ui/dialogs/StatusDialog.java 10 Mar 2003 21:56:47 -0000 1.21 +++ ui/org/eclipse/jdt/internal/ui/dialogs/StatusDialog.java 18 Mar 2003 18:09:19 -0000 @@ -138,7 +138,7 @@ fStatusLine.setAlignment(SWT.LEFT); fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fStatusLine.setErrorStatus(null); //$NON-NLS-1$ - + applyDialogFont(composite); super.createButtonBar(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java,v retrieving revision 1.9 diff -u -r1.9 CustomFiltersDialog.java --- ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java 10 Mar 2003 23:27:06 -0000 1.9 +++ ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java 18 Mar 2003 18:09:21 -0000 @@ -154,6 +154,7 @@ if (fBuiltInFilters.length > 0) createCheckBoxList(group); + applyDialogFont(parent); return parent; } Index: ui/org/eclipse/jdt/internal/ui/jarpackager/ConfirmSaveModifiedResourcesDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/ConfirmSaveModifiedResourcesDialog.java,v retrieving revision 1.11 diff -u -r1.11 ConfirmSaveModifiedResourcesDialog.java --- ui/org/eclipse/jdt/internal/ui/jarpackager/ConfirmSaveModifiedResourcesDialog.java 10 Mar 2003 21:56:44 -0000 1.11 +++ ui/org/eclipse/jdt/internal/ui/jarpackager/ConfirmSaveModifiedResourcesDialog.java 18 Mar 2003 18:09:22 -0000 @@ -78,6 +78,7 @@ data.widthHint= convertWidthInCharsToPixels(20); data.heightHint= convertHeightInCharsToPixels(5); control.setLayoutData(data); + applyDialogFont(control); return control; } Index: ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java,v retrieving revision 1.51 diff -u -r1.51 JarManifestWizardPage.java --- ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java 10 Mar 2003 21:56:44 -0000 1.51 +++ ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java 18 Mar 2003 18:09:29 -0000 @@ -43,6 +43,7 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.resource.JFaceResources; @@ -189,6 +190,7 @@ setControl(composite); update(); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JARMANIFEST_WIZARD_PAGE); } Index: ui/org/eclipse/jdt/internal/ui/jarpackager/JarOptionsPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarOptionsPage.java,v retrieving revision 1.28 diff -u -r1.28 JarOptionsPage.java --- ui/org/eclipse/jdt/internal/ui/jarpackager/JarOptionsPage.java 10 Mar 2003 21:56:44 -0000 1.28 +++ ui/org/eclipse/jdt/internal/ui/jarpackager/JarOptionsPage.java 18 Mar 2003 18:09:32 -0000 @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.wizard.IWizardPage; @@ -110,8 +111,8 @@ setControl(composite); update(); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAROPTIONS_WIZARD_PAGE); - } /** Index: ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java,v retrieving revision 1.43 diff -u -r1.43 JarPackageWizardPage.java --- ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java 10 Mar 2003 21:56:44 -0000 1.43 +++ ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java 18 Mar 2003 18:09:36 -0000 @@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -158,6 +159,7 @@ update(); giveFocusToDestination(); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JARPACKAGER_WIZARD_PAGE); } Index: ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java,v retrieving revision 1.29 diff -u -r1.29 JavadocSpecificsWizardPage.java --- ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java 10 Mar 2003 22:13:52 -0000 1.29 +++ ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java 18 Mar 2003 18:09:38 -0000 @@ -28,6 +28,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.core.IJavaProject; @@ -92,6 +94,7 @@ createAntGroup(fLowerComposite); setControl(fLowerComposite); + Dialog.applyDialogFont(fLowerComposite); WorkbenchHelp.setHelp(fLowerComposite, IJavaHelpContextIds.JAVADOC_SPECIFICS_PAGE); } //end method createControl Index: ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java,v retrieving revision 1.21 diff -u -r1.21 JavadocStandardWizardPage.java --- ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java 10 Mar 2003 22:13:52 -0000 1.21 +++ ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java 18 Mar 2003 18:09:42 -0000 @@ -38,6 +38,8 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.core.IClasspathEntry; @@ -122,6 +124,7 @@ createStyleSheetGroup(fUpperComposite); setControl(fUpperComposite); + Dialog.applyDialogFont(fUpperComposite); WorkbenchHelp.setHelp(fUpperComposite, IJavaHelpContextIds.JAVADOC_STANDARD_PAGE); } private void createBasicOptionsGroup(Composite composite) { @@ -571,6 +574,7 @@ Composite composite= (Composite) super.createDialogArea(parent); Control inner= fJavadocConfigurationBlock.createContents(composite); inner.setLayoutData(new GridData(GridData.FILL_BOTH)); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java,v retrieving revision 1.34 diff -u -r1.34 JavadocTreeWizardPage.java --- ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java 10 Mar 2003 22:13:52 -0000 1.34 +++ ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java 18 Mar 2003 18:09:46 -0000 @@ -38,6 +38,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -143,6 +144,7 @@ createOptionsSet(composite); setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAVADOC_TREE_PAGE); } Index: ui/org/eclipse/jdt/internal/ui/packageview/SelectionTransferDropAdapter.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/packageview/SelectionTransferDropAdapter.java,v retrieving revision 1.39 diff -u -r1.39 SelectionTransferDropAdapter.java --- ui/org/eclipse/jdt/internal/ui/packageview/SelectionTransferDropAdapter.java 10 Mar 2003 23:27:06 -0000 1.39 +++ ui/org/eclipse/jdt/internal/ui/packageview/SelectionTransferDropAdapter.java 18 Mar 2003 18:09:51 -0000 @@ -448,6 +448,7 @@ Composite result= (Composite)super.createDialogArea(parent); addUpdateReferenceComponent(result); addUpdateQualifiedNameComponent(result, ((GridLayout)result.getLayout()).marginWidth); + applyDialogFont(result); return result; } private void updateButtons() { Index: ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java,v retrieving revision 1.27 diff -u -r1.27 AppearancePreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java 10 Mar 2003 23:27:13 -0000 1.27 +++ ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java 18 Mar 2003 18:09:53 -0000 @@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; @@ -185,6 +186,7 @@ initFields(); + Dialog.applyDialogFont(result); return result; } Index: ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java,v retrieving revision 1.20 diff -u -r1.20 BuildPathsPropertyPage.java --- ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java 10 Mar 2003 23:27:13 -0000 1.20 +++ ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java 18 Mar 2003 18:09:54 -0000 @@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -64,13 +65,16 @@ noDefaultAndApplyButton(); IProject project= getProject(); + Control result; if (project == null || !isJavaProject(project)) { - return createWithoutJava(parent); + result= createWithoutJava(parent); } else if (!project.isOpen()) { - return createForClosedProject(parent); + result= createForClosedProject(parent); } else { - return createWithJava(parent, project); + result= createWithJava(parent, project); } + Dialog.applyDialogFont(result); + return result; } private IDialogSettings getSettings() { Index: ui/org/eclipse/jdt/internal/ui/preferences/ClasspathVariablesPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ClasspathVariablesPreferencePage.java,v retrieving revision 1.32 diff -u -r1.32 ClasspathVariablesPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/ClasspathVariablesPreferencePage.java 10 Mar 2003 23:27:13 -0000 1.32 +++ ui/org/eclipse/jdt/internal/ui/preferences/ClasspathVariablesPreferencePage.java 18 Mar 2003 18:09:55 -0000 @@ -13,6 +13,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.ui.IWorkbench; @@ -47,7 +48,9 @@ */ protected Control createContents(Composite parent) { WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.CP_VARIABLES_PREFERENCE_PAGE); - return fVariableBlock.createContents(parent); + Control result= fVariableBlock.createContents(parent); + Dialog.applyDialogFont(result); + return result; } /* Index: ui/org/eclipse/jdt/internal/ui/preferences/CodeFormatterPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeFormatterPreferencePage.java,v retrieving revision 1.46 diff -u -r1.46 CodeFormatterPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/CodeFormatterPreferencePage.java 10 Mar 2003 23:27:13 -0000 1.46 +++ ui/org/eclipse/jdt/internal/ui/preferences/CodeFormatterPreferencePage.java 18 Mar 2003 18:09:55 -0000 @@ -15,6 +15,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.ui.IWorkbench; @@ -61,7 +62,9 @@ * @see PreferencePage#createContents(Composite) */ protected Control createContents(Composite parent) { - return fConfigurationBlock.createContents(parent); + Control result= fConfigurationBlock.createContents(parent); + Dialog.applyDialogFont(result); + return result; } /* Index: ui/org/eclipse/jdt/internal/ui/preferences/CodeGenerationPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CodeGenerationPreferencePage.java,v retrieving revision 1.26 diff -u -r1.26 CodeGenerationPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/CodeGenerationPreferencePage.java 17 Mar 2003 17:18:21 -0000 1.26 +++ ui/org/eclipse/jdt/internal/ui/preferences/CodeGenerationPreferencePage.java 18 Mar 2003 18:10:00 -0000 @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.ui.IWorkbench; @@ -94,6 +95,7 @@ item.setText(PreferencesMessages.getString("CodeGenerationPreferencePage.tab.templates.tabtitle")); //$NON-NLS-1$ item.setControl(templateControl); + Dialog.applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/CompilerPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CompilerPreferencePage.java,v retrieving revision 1.39 diff -u -r1.39 CompilerPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/CompilerPreferencePage.java 10 Mar 2003 23:27:13 -0000 1.39 +++ ui/org/eclipse/jdt/internal/ui/preferences/CompilerPreferencePage.java 18 Mar 2003 18:10:00 -0000 @@ -15,6 +15,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.ui.IWorkbench; @@ -61,7 +62,9 @@ * @see PreferencePage#createContents(Composite) */ protected Control createContents(Composite parent) { - return fConfigurationBlock.createContents(parent); + Control result= fConfigurationBlock.createContents(parent); + Dialog.applyDialogFont(result); + return result; } /* Index: ui/org/eclipse/jdt/internal/ui/preferences/CompilerPropertyPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/CompilerPropertyPage.java,v retrieving revision 1.8 diff -u -r1.8 CompilerPropertyPage.java --- ui/org/eclipse/jdt/internal/ui/preferences/CompilerPropertyPage.java 17 Mar 2003 17:18:21 -0000 1.8 +++ ui/org/eclipse/jdt/internal/ui/preferences/CompilerPropertyPage.java 18 Mar 2003 18:10:02 -0000 @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.jface.dialogs.ControlEnableState; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.IPreferencePage; import org.eclipse.jface.preference.PreferenceDialog; @@ -126,6 +127,7 @@ fUseWorkspaceSettings.setSelection(!useProjectSettings); updateEnableState(); + Dialog.applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java,v retrieving revision 1.37 diff -u -r1.37 EditTemplateDialog.java --- ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java 17 Mar 2003 19:22:59 -0000 1.37 +++ ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java 18 Mar 2003 18:10:05 -0000 @@ -309,6 +309,7 @@ } initializeActions(); + applyDialogFont(parent); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java,v retrieving revision 1.14 diff -u -r1.14 ImportOrganizeInputDialog.java --- ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java 10 Mar 2003 23:27:13 -0000 1.14 +++ ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java 18 Mar 2003 18:10:06 -0000 @@ -106,6 +106,7 @@ fNameDialogField.postSetFocusOnDialogField(parent.getDisplay()); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizePreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizePreferencePage.java,v retrieving revision 1.33 diff -u -r1.33 ImportOrganizePreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizePreferencePage.java 10 Mar 2003 23:27:13 -0000 1.33 +++ ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizePreferencePage.java 18 Mar 2003 18:10:09 -0000 @@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; @@ -228,6 +229,7 @@ fIgnoreLowerCaseTypesField.doFillIntoGrid(composite, 2); + Dialog.applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java,v retrieving revision 1.55 diff -u -r1.55 JavaBasePreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java 10 Mar 2003 23:27:13 -0000 1.55 +++ ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java 18 Mar 2003 18:10:11 -0000 @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; @@ -232,6 +233,7 @@ addRadioButton(typeHierarchyGroup, PreferencesMessages.getString("JavaBasePreferencePage.inPerspective"), OPEN_TYPE_HIERARCHY, OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE); //$NON-NLS-1$ addRadioButton(typeHierarchyGroup, PreferencesMessages.getString("JavaBasePreferencePage.inView"), OPEN_TYPE_HIERARCHY, OPEN_TYPE_HIERARCHY_IN_VIEW_PART); //$NON-NLS-1$ + Dialog.applyDialogFont(result); return result; } Index: ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java,v retrieving revision 1.19 diff -u -r1.19 JavaEditorHoverConfigurationBlock.java --- ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java 10 Mar 2003 23:27:13 -0000 1.19 +++ ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java 18 Mar 2003 18:10:13 -0000 @@ -215,6 +215,7 @@ initialize(); + Dialog.applyDialogFont(hoverComposite); return hoverComposite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java,v retrieving revision 1.103 diff -u -r1.103 JavaEditorPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java 13 Mar 2003 13:54:24 -0000 1.103 +++ ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java 18 Mar 2003 18:10:24 -0000 @@ -51,6 +51,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.jface.action.Action; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.preference.PreferencePage; @@ -1192,6 +1193,7 @@ initialize(); + Dialog.applyDialogFont(folder); return folder; } Index: ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java,v retrieving revision 1.19 diff -u -r1.19 JavaElementInfoPage.java --- ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java 10 Mar 2003 23:27:13 -0000 1.19 +++ ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java 18 Mar 2003 18:10:25 -0000 @@ -20,6 +20,8 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.dialogs.PropertyPage; import org.eclipse.ui.help.WorkbenchHelp; @@ -126,7 +128,7 @@ } } WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAVA_ELEMENT_INFO_PAGE); - + Dialog.applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java,v retrieving revision 1.17 diff -u -r1.17 JavadocConfigurationPropertyPage.java --- ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java 10 Mar 2003 23:27:13 -0000 1.17 +++ ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java 18 Mar 2003 18:10:26 -0000 @@ -22,6 +22,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.dialogs.PropertyPage; import org.eclipse.ui.help.WorkbenchHelp; @@ -80,6 +82,7 @@ Control control= fJavadocConfigurationBlock.createContents(parent); WorkbenchHelp.setHelp(control, IJavaHelpContextIds.JAVADOC_CONFIGURATION_PROPERTY_PAGE); + Dialog.applyDialogFont(control); return control; } Index: ui/org/eclipse/jdt/internal/ui/preferences/JavadocPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavadocPreferencePage.java,v retrieving revision 1.15 diff -u -r1.15 JavadocPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/JavadocPreferencePage.java 10 Mar 2003 23:27:13 -0000 1.15 +++ ui/org/eclipse/jdt/internal/ui/preferences/JavadocPreferencePage.java 18 Mar 2003 18:10:27 -0000 @@ -21,6 +21,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; @@ -126,6 +127,7 @@ initFields(); + Dialog.applyDialogFont(fComposite); return fComposite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/MembersOrderPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/MembersOrderPreferencePage.java,v retrieving revision 1.15 diff -u -r1.15 MembersOrderPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/MembersOrderPreferencePage.java 10 Mar 2003 23:27:13 -0000 1.15 +++ ui/org/eclipse/jdt/internal/ui/preferences/MembersOrderPreferencePage.java 18 Mar 2003 18:10:29 -0000 @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.resource.ImageDescriptor; @@ -135,6 +136,7 @@ composite.setLayoutData(data); createSortOrderListDialogField(composite, 3); + Dialog.applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/NameConventionConfigurationBlock.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/NameConventionConfigurationBlock.java,v retrieving revision 1.8 diff -u -r1.8 NameConventionConfigurationBlock.java --- ui/org/eclipse/jdt/internal/ui/preferences/NameConventionConfigurationBlock.java 10 Mar 2003 23:27:13 -0000 1.8 +++ ui/org/eclipse/jdt/internal/ui/preferences/NameConventionConfigurationBlock.java 18 Mar 2003 18:10:31 -0000 @@ -137,6 +137,7 @@ fPrefixField.postSetFocusOnDialogField(parent.getDisplay()); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java,v retrieving revision 1.15 diff -u -r1.15 NewJavaProjectPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java 10 Mar 2003 23:27:13 -0000 1.15 +++ ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java 18 Mar 2003 18:10:34 -0000 @@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; @@ -366,6 +367,7 @@ validateFolders(); + Dialog.applyDialogFont(result); return result; } Index: ui/org/eclipse/jdt/internal/ui/preferences/SourceAttachmentPropertyPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/SourceAttachmentPropertyPage.java,v retrieving revision 1.30 diff -u -r1.30 SourceAttachmentPropertyPage.java --- ui/org/eclipse/jdt/internal/ui/preferences/SourceAttachmentPropertyPage.java 10 Mar 2003 23:27:13 -0000 1.30 +++ ui/org/eclipse/jdt/internal/ui/preferences/SourceAttachmentPropertyPage.java 18 Mar 2003 18:10:35 -0000 @@ -27,6 +27,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -69,7 +70,9 @@ try { fRoot= getJARPackageFragmentRoot(); if (fRoot == null || fRoot.getKind() != IPackageFragmentRoot.K_BINARY) { - return createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message")); //$NON-NLS-1$ + Control result= createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message")); //$NON-NLS-1$ + Dialog.applyDialogFont(result); + return result; } IPath containerPath= null; @@ -85,15 +88,21 @@ if (entry == null) { IClasspathContainer container= JavaCore.getClasspathContainer(containerPath, jproject); String containerName= container != null ? container.getDescription() : containerPath.toString(); - return createMessageContent(composite, PreferencesMessages.getFormattedString("SourceAttachmentPropertyPage.containerentry.message", containerName)); //$NON-NLS-1$ + Control result= createMessageContent(composite, PreferencesMessages.getFormattedString("SourceAttachmentPropertyPage.containerentry.message", containerName)); //$NON-NLS-1$ + Dialog.applyDialogFont(result); + return result; } } } fSourceAttachmentBlock= new SourceAttachmentBlock(this, entry, containerPath, jproject); - return fSourceAttachmentBlock.createControl(composite); + Control result= fSourceAttachmentBlock.createControl(composite); + Dialog.applyDialogFont(result); + return result; } catch (CoreException e) { JavaPlugin.log(e); - return createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message")); //$NON-NLS-1$ + Control result= createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message")); //$NON-NLS-1$ + Dialog.applyDialogFont(result); + return result; } } Index: ui/org/eclipse/jdt/internal/ui/preferences/TemplatePreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TemplatePreferencePage.java,v retrieving revision 1.47 diff -u -r1.47 TemplatePreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/TemplatePreferencePage.java 10 Mar 2003 23:27:13 -0000 1.47 +++ ui/org/eclipse/jdt/internal/ui/preferences/TemplatePreferencePage.java 18 Mar 2003 18:10:40 -0000 @@ -37,6 +37,7 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; @@ -320,6 +321,7 @@ WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.TEMPLATE_PREFERENCE_PAGE); + Dialog.applyDialogFont(parent); return parent; } Index: ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java,v retrieving revision 1.5 diff -u -r1.5 TodoTaskInputDialog.java --- ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java 17 Mar 2003 17:18:21 -0000 1.5 +++ ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java 18 Mar 2003 18:10:41 -0000 @@ -131,6 +131,7 @@ fNameDialogField.postSetFocusOnDialogField(parent.getDisplay()); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPreferencePage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPreferencePage.java,v retrieving revision 1.5 diff -u -r1.5 TodoTaskPreferencePage.java --- ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPreferencePage.java 10 Mar 2003 23:27:13 -0000 1.5 +++ ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPreferencePage.java 18 Mar 2003 18:10:41 -0000 @@ -15,6 +15,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.ui.IWorkbench; @@ -64,7 +65,9 @@ * @see PreferencePage#createContents(Composite) */ protected Control createContents(Composite parent) { - return fConfigurationBlock.createContents(parent); + Control result= fConfigurationBlock.createContents(parent); + Dialog.applyDialogFont(result); + return result; } /* Index: ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPropertyPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPropertyPage.java,v retrieving revision 1.6 diff -u -r1.6 TodoTaskPropertyPage.java --- ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPropertyPage.java 10 Mar 2003 23:27:13 -0000 1.6 +++ ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPropertyPage.java 18 Mar 2003 18:10:42 -0000 @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.jface.dialogs.ControlEnableState; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.preference.IPreferenceNode; import org.eclipse.jface.preference.IPreferencePage; import org.eclipse.jface.preference.PreferenceDialog; @@ -130,6 +131,7 @@ fUseWorkspaceSettings.setSelection(!useProjectSettings); updateEnableState(); + Dialog.applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/reorg/JdtMoveAction.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/reorg/JdtMoveAction.java,v retrieving revision 1.32 diff -u -r1.32 JdtMoveAction.java --- ui/org/eclipse/jdt/internal/ui/reorg/JdtMoveAction.java 13 Mar 2003 16:47:55 -0000 1.32 +++ ui/org/eclipse/jdt/internal/ui/reorg/JdtMoveAction.java 18 Mar 2003 18:10:45 -0000 @@ -316,6 +316,7 @@ Composite result= (Composite)super.createDialogArea(parent); addUpdateReferenceComponent(result); addUpdateQualifiedNameComponent(result, ((GridLayout)result.getLayout()).marginWidth); + applyDialogFont(result); return result; } Index: ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java,v retrieving revision 1.60 diff -u -r1.60 JavaSearchPage.java --- ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java 10 Mar 2003 21:56:44 -0000 1.60 +++ ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java 18 Mar 2003 18:10:49 -0000 @@ -35,6 +35,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.text.ITextSelection; @@ -361,6 +362,7 @@ setControl(result); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(result, IJavaHelpContextIds.JAVA_SEARCH_PAGE); } Index: ui/org/eclipse/jdt/internal/ui/typehierarchy/HistoryListAction.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/typehierarchy/HistoryListAction.java,v retrieving revision 1.20 diff -u -r1.20 HistoryListAction.java --- ui/org/eclipse/jdt/internal/ui/typehierarchy/HistoryListAction.java 10 Mar 2003 22:13:52 -0000 1.20 +++ ui/org/eclipse/jdt/internal/ui/typehierarchy/HistoryListAction.java 18 Mar 2003 18:10:54 -0000 @@ -102,6 +102,7 @@ LayoutUtil.setHeigthHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12)); LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null)); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/util/SWTUtil.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/util/SWTUtil.java,v retrieving revision 1.10 diff -u -r1.10 SWTUtil.java --- ui/org/eclipse/jdt/internal/ui/util/SWTUtil.java 10 Mar 2003 23:27:14 -0000 1.10 +++ ui/org/eclipse/jdt/internal/ui/util/SWTUtil.java 18 Mar 2003 18:10:56 -0000 @@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Widget; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.util.Assert; /** @@ -74,6 +75,8 @@ * Returns a width hint for a button control. */ public static int getButtonWidthHint(Button button) { + if (button.getFont().equals(JFaceResources.getDefaultFont())) + 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); @@ -83,6 +86,8 @@ * Returns a height hint for a button control. */ public static int getButtonHeigthHint(Button button) { + if (button.getFont().equals(JFaceResources.getDefaultFont())) + button.setFont(JFaceResources.getDialogFont()); PixelConverter converter= new PixelConverter(button); return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT); } @@ -105,6 +110,8 @@ } public static int getTableHeightHint(Table table, int rows) { + if (table.getFont().equals(JFaceResources.getDefaultFont())) + table.setFont(JFaceResources.getDialogFont()); int result= table.getItemHeight() * rows + table.getHeaderHeight(); if (table.getLinesVisible()) result+= table.getGridLineWidth() * (rows - 1); Index: ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java,v retrieving revision 1.21 diff -u -r1.21 NewSourceFolderWizardPage.java --- ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java 12 Mar 2003 17:18:04 -0000 1.21 +++ ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java 18 Mar 2003 18:11:01 -0000 @@ -31,6 +31,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITreeContentProvider; @@ -208,6 +209,7 @@ LayoutUtil.setWidthHint(fRootDialogField.getTextControl(null), maxFieldWidth); setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_PACKAGEROOT_WIZARD_PAGE); } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java,v retrieving revision 1.100 diff -u -r1.100 BuildPathsBlock.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java 17 Mar 2003 12:02:29 -0000 1.100 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java 18 Mar 2003 18:11:06 -0000 @@ -42,6 +42,7 @@ import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.Widget; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; @@ -250,6 +251,7 @@ }); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.BUILD_PATH_BLOCK); + Dialog.applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java,v retrieving revision 1.5 diff -u -r1.5 ClasspathContainerDefaultPage.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java 10 Mar 2003 23:27:10 -0000 1.5 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java 18 Mar 2003 18:11:07 -0000 @@ -30,6 +30,9 @@ import org.eclipse.jdt.ui.wizards.NewElementWizardPage; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; + +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; /** @@ -90,6 +93,7 @@ fEntryField.setFocus(); setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.CLASSPATH_CONTAINER_DEFAULT_PAGE); } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java,v retrieving revision 1.9 diff -u -r1.9 ClasspathContainerSelectionPage.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java 10 Mar 2003 23:27:09 -0000 1.9 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java 18 Mar 2003 18:11:08 -0000 @@ -15,6 +15,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; @@ -101,6 +102,7 @@ fListViewer.getList().select(selectionIndex); validatePage(); setControl(fListViewer.getList()); + Dialog.applyDialogFont(fListViewer.getList()); } /** Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java,v retrieving revision 1.5 diff -u -r1.5 EditVariableEntryDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java 10 Mar 2003 23:27:09 -0000 1.5 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java 18 Mar 2003 18:11:09 -0000 @@ -112,6 +112,7 @@ fFileNameField.postSetFocusOnDialogField(parent.getDisplay()); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.SOURCE_ATTACHMENT_BLOCK); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternDialog.java,v retrieving revision 1.10 diff -u -r1.10 ExclusionPatternDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternDialog.java 10 Mar 2003 23:27:08 -0000 1.10 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternDialog.java 18 Mar 2003 18:11:11 -0000 @@ -138,6 +138,7 @@ fExclusionPatternList.doFillIntoGrid(inner, 3); LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternEntryDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternEntryDialog.java,v retrieving revision 1.7 diff -u -r1.7 ExclusionPatternEntryDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternEntryDialog.java 10 Mar 2003 23:27:09 -0000 1.7 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternEntryDialog.java 18 Mar 2003 18:11:16 -0000 @@ -123,6 +123,7 @@ LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null)); fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay()); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/FolderSelectionDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/FolderSelectionDialog.java,v retrieving revision 1.5 diff -u -r1.5 FolderSelectionDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/FolderSelectionDialog.java 10 Mar 2003 23:27:09 -0000 1.5 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/FolderSelectionDialog.java 18 Mar 2003 18:11:17 -0000 @@ -67,6 +67,7 @@ button.setLayoutData(data); fNewFolderButton= button; + applyDialogFont(result); return result; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java,v retrieving revision 1.75 diff -u -r1.75 LibrariesWorkbookPage.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java 10 Mar 2003 23:27:08 -0000 1.75 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java 18 Mar 2003 18:11:21 -0000 @@ -751,6 +751,7 @@ Composite composite= (Composite) super.createDialogArea(parent); Control inner= fJavadocConfigurationBlock.createContents(composite); inner.setLayoutData(new GridData(GridData.FILL_BOTH)); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java,v retrieving revision 1.12 diff -u -r1.12 NewContainerDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java 10 Mar 2003 23:27:08 -0000 1.12 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java 18 Mar 2003 18:11:22 -0000 @@ -88,6 +88,7 @@ LayoutUtil.setHorizontalGrabbing(fContainerDialogField.getTextControl(null)); fContainerDialogField.postSetFocusOnDialogField(parent.getDisplay()); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewSourceFolderDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewSourceFolderDialog.java,v retrieving revision 1.5 diff -u -r1.5 NewSourceFolderDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewSourceFolderDialog.java 10 Mar 2003 23:27:09 -0000 1.5 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewSourceFolderDialog.java 18 Mar 2003 18:11:23 -0000 @@ -121,6 +121,7 @@ control.setLayoutData(data); fContainerDialogField.postSetFocusOnDialogField(parent.getDisplay()); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java,v retrieving revision 1.15 diff -u -r1.15 NewVariableEntryDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java 10 Mar 2003 23:27:09 -0000 1.15 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java 18 Mar 2003 18:11:25 -0000 @@ -169,6 +169,7 @@ listData.grabExcessHorizontalSpace= true; listData.heightHint= convertHeightInCharsToPixels(10); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java,v retrieving revision 1.9 diff -u -r1.9 OutputLocationDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java 10 Mar 2003 23:27:10 -0000 1.9 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java 18 Mar 2003 18:11:26 -0000 @@ -127,6 +127,7 @@ buttonData.heightHint= SWTUtil.getButtonHeigthHint(buttonControl); buttonControl.setLayoutData(buttonData); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java,v retrieving revision 1.3 diff -u -r1.3 SourceAttachmentDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java 10 Mar 2003 23:27:10 -0000 1.3 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java 18 Mar 2003 18:11:27 -0000 @@ -96,6 +96,7 @@ Control inner= createSourceAttachmentControls(composite); inner.setLayoutData(new GridData(GridData.FILL_BOTH)); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java,v retrieving revision 1.27 diff -u -r1.27 VariableCreationDialog.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java 10 Mar 2003 23:27:08 -0000 1.27 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java 18 Mar 2003 18:11:29 -0000 @@ -147,6 +147,7 @@ DialogField focusField= (fElement == null) ? fNameField : fPathField; focusField.postSetFocusOnDialogField(parent.getDisplay()); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariablePathDialogField.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariablePathDialogField.java,v retrieving revision 1.12 diff -u -r1.12 VariablePathDialogField.java --- ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariablePathDialogField.java 10 Mar 2003 23:27:09 -0000 1.12 +++ ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariablePathDialogField.java 18 Mar 2003 18:11:30 -0000 @@ -67,6 +67,7 @@ fVariableBlock.addDoubleClickListener(this); fVariableBlock.addSelectionChangedListener(this); + applyDialogFont(composite); return composite; } Index: ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringButtonStatusDialogField.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringButtonStatusDialogField.java,v retrieving revision 1.8 diff -u -r1.8 StringButtonStatusDialogField.java --- ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringButtonStatusDialogField.java 10 Mar 2003 21:56:47 -0000 1.8 +++ ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringButtonStatusDialogField.java 18 Mar 2003 18:11:31 -0000 @@ -21,6 +21,8 @@ import org.eclipse.swt.layout.GridData; +import org.eclipse.jface.resource.JFaceResources; + /** * Dialog field containing a label, text control, status label and a button control. * The status label can be either a image or text label, and can be usd to give @@ -119,6 +121,7 @@ gd.horizontalIndent= 0; if (fWidthHintString != null) { GC gc= new GC(aControl); + gc.setFont(JFaceResources.getDialogFont()); gd.widthHint= gc.textExtent(fWidthHintString).x; gc.dispose(); } else if (fWidthHint != -1) { Index: ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java,v retrieving revision 1.22 diff -u -r1.22 JavaWorkingSetPage.java --- ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java 12 Mar 2003 12:15:39 -0000 1.22 +++ ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java 18 Mar 2003 18:11:34 -0000 @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.util.Assert; import org.eclipse.jface.viewers.CheckStateChangedEvent; @@ -171,6 +172,7 @@ disableClosedProjects(); validateInput(); + Dialog.applyDialogFont(composite); // Set help for the page JavaUIHelp.setHelp(fTree, IJavaHelpContextIds.JAVA_WORKING_SET_PAGE); } Index: ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java,v retrieving revision 1.20 diff -u -r1.20 FindStringsToExternalizeAction.java --- ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java 10 Mar 2003 21:56:48 -0000 1.20 +++ ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java 18 Mar 2003 18:11:37 -0000 @@ -361,6 +361,7 @@ } }); getTableViewer().getTable().setFocus(); + applyDialogFont(result); return result; } Index: ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java,v retrieving revision 1.12 diff -u -r1.12 JavaCapabilityConfigurationPage.java --- ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java 17 Mar 2003 10:27:06 -0000 1.12 +++ ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java 18 Mar 2003 18:11:40 -0000 @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.ui.help.WorkbenchHelp; @@ -111,7 +112,7 @@ public void createControl(Composite parent) { Control control= fBuildPathsBlock.createControl(parent); setControl(control); - + Dialog.applyDialogFont(control); WorkbenchHelp.setHelp(control, IJavaHelpContextIds.NEW_JAVAPROJECT_WIZARD_PAGE); } Index: ui/org/eclipse/jdt/ui/wizards/NewClassWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewClassWizardPage.java,v retrieving revision 1.12 diff -u -r1.12 NewClassWizardPage.java --- ui/org/eclipse/jdt/ui/wizards/NewClassWizardPage.java 10 Mar 2003 21:56:49 -0000 1.12 +++ ui/org/eclipse/jdt/ui/wizards/NewClassWizardPage.java 18 Mar 2003 18:11:42 -0000 @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; @@ -159,6 +160,7 @@ setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_CLASS_WIZARD_PAGE); } Index: ui/org/eclipse/jdt/ui/wizards/NewInterfaceWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewInterfaceWizardPage.java,v retrieving revision 1.8 diff -u -r1.8 NewInterfaceWizardPage.java --- ui/org/eclipse/jdt/ui/wizards/NewInterfaceWizardPage.java 10 Mar 2003 21:56:49 -0000 1.8 +++ ui/org/eclipse/jdt/ui/wizards/NewInterfaceWizardPage.java 18 Mar 2003 18:11:42 -0000 @@ -16,6 +16,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.help.WorkbenchHelp; @@ -121,6 +122,7 @@ setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_INTERFACE_WIZARD_PAGE); } Index: ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java,v retrieving revision 1.33 diff -u -r1.33 NewJavaProjectWizardPage.java --- ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java 10 Mar 2003 21:56:48 -0000 1.33 +++ ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java 18 Mar 2003 18:11:44 -0000 @@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.util.Assert; @@ -197,6 +198,7 @@ public void createControl(Composite parent) { Control control= fBuildPathsBlock.createControl(parent); setControl(control); + Dialog.applyDialogFont(control); WorkbenchHelp.setHelp(control, IJavaHelpContextIds.NEW_JAVAPROJECT_WIZARD_PAGE); } Index: ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java,v retrieving revision 1.15 diff -u -r1.15 NewPackageWizardPage.java --- ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java 12 Mar 2003 17:40:53 -0000 1.15 +++ ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java 18 Mar 2003 18:11:46 -0000 @@ -24,6 +24,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; @@ -141,6 +142,7 @@ createPackageControls(composite, nColumns); setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_PACKAGE_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java,v retrieving revision 1.21 diff -u -r1.21 ChangeParametersControl.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java 10 Mar 2003 21:56:46 -0000 1.21 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java 18 Mar 2003 18:11:50 -0000 @@ -227,8 +227,10 @@ } GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL); - gd.heightHint= table.getHeaderHeight() + table.getGridLineWidth() * (ROW_COUNT + 1) + table.getItemHeight() * ROW_COUNT; + gd.heightHint= SWTUtil.getTableHeightHint(table, ROW_COUNT); gd.widthHint= 40; + gd.verticalAlignment= GridData.BEGINNING; + gd.grabExcessVerticalSpace= true; layouter.setLayoutData(gd); fTableViewer= new TableViewer(table); Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureInputPage.java,v retrieving revision 1.17 diff -u -r1.17 ChangeSignatureInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureInputPage.java 10 Mar 2003 22:53:23 -0000 1.17 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureInputPage.java 18 Mar 2003 18:11:51 -0000 @@ -19,6 +19,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.core.JavaModelException; @@ -29,7 +31,6 @@ import org.eclipse.jdt.internal.ui.IJavaHelpContextIds; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.util.ExceptionHandler; -import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; class ChangeSignatureInputPage extends UserInputWizardPage { @@ -75,6 +76,7 @@ update(false); setControl(composite); + Dialog.applyDialogFont(composite); } catch (JavaModelException e) { ExceptionHandler.handle(e, RefactoringMessages.getString("ChangeSignatureInputPage.Change_Signature"), RefactoringMessages.getString("ChangeSignatureInputPage.Internal_Error")); //$NON-NLS-1$ //$NON-NLS-2$ } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java,v retrieving revision 1.3 diff -u -r1.3 ComboSelectionDialog.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java 10 Mar 2003 21:56:47 -0000 1.3 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java 18 Mar 2003 18:11:51 -0000 @@ -79,6 +79,7 @@ fSelection= combo.getItem(combo.getSelectionIndex()); } }); + applyDialogFont(composite); return composite; } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedInputPage.java,v retrieving revision 1.6 diff -u -r1.6 ConvertAnonymousToNestedInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedInputPage.java 10 Mar 2003 21:56:47 -0000 1.6 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedInputPage.java 18 Mar 2003 18:11:52 -0000 @@ -22,11 +22,12 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.internal.corext.refactoring.code.ConvertAnonymousToNestedRefactoring; import org.eclipse.jdt.internal.ui.IJavaHelpContextIds; -import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; class ConvertAnonymousToNestedInputPage extends UserInputWizardPage { @@ -52,6 +53,7 @@ textField.setFocus(); setPageComplete(false); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.CONVERT_ANONYMOUS_TO_NESTED_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java,v retrieving revision 1.34 diff -u -r1.34 ErrorWizardPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java 10 Mar 2003 21:56:47 -0000 1.34 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java 18 Mar 2003 18:11:53 -0000 @@ -14,6 +14,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.ui.help.WorkbenchHelp; @@ -72,6 +73,7 @@ public void createControl(Composite parent) { initializeDialogUnits(parent); setControl(fViewer= new RefactoringStatusViewer(parent, SWT.NONE)); + Dialog.applyDialogFont(fViewer); WorkbenchHelp.setHelp(getControl(), fHelpContextID); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractConstantInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractConstantInputPage.java,v retrieving revision 1.6 diff -u -r1.6 ExtractConstantInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractConstantInputPage.java 10 Mar 2003 21:56:47 -0000 1.6 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractConstantInputPage.java 18 Mar 2003 18:11:54 -0000 @@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.ui.help.WorkbenchHelp; @@ -32,7 +33,6 @@ import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.util.ExceptionHandler; import org.eclipse.jdt.internal.ui.util.RowLayouter; -import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; class ExtractConstantInputPage extends TextInputWizardPage { @@ -74,6 +74,7 @@ validateTextField(text.getText()); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_CONSTANT_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceInputPage.java,v retrieving revision 1.18 diff -u -r1.18 ExtractInterfaceInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceInputPage.java 10 Mar 2003 21:56:47 -0000 1.18 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceInputPage.java 18 Mar 2003 18:11:56 -0000 @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ILabelProvider; @@ -80,6 +81,7 @@ gd.horizontalSpan= 2; tableLabel.setLayoutData(gd); + Dialog.applyDialogFont(result); addMemberListComposite(result); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractTempInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractTempInputPage.java,v retrieving revision 1.17 diff -u -r1.17 ExtractTempInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractTempInputPage.java 10 Mar 2003 21:56:47 -0000 1.17 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractTempInputPage.java 18 Mar 2003 18:11:57 -0000 @@ -20,6 +20,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.core.JavaModelException; @@ -66,6 +68,7 @@ validateTextField(text.getText()); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_TEMP_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineConstantInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineConstantInputPage.java,v retrieving revision 1.6 diff -u -r1.6 InlineConstantInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineConstantInputPage.java 10 Mar 2003 21:56:46 -0000 1.6 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineConstantInputPage.java 18 Mar 2003 18:11:58 -0000 @@ -19,9 +19,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.jdt.internal.corext.refactoring.code.InlineConstantRefactoring; -import org.eclipse.jdt.internal.ui.refactoring.UserInputWizardPage; -import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; class InlineConstantInputPage extends UserInputWizardPage { @@ -98,6 +98,7 @@ fRefactoring.setReplaceAllReferences(false); } }); + Dialog.applyDialogFont(result); } /* Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineTempInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineTempInputPage.java,v retrieving revision 1.3 diff -u -r1.3 InlineTempInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineTempInputPage.java 10 Mar 2003 21:56:47 -0000 1.3 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineTempInputPage.java 18 Mar 2003 18:11:58 -0000 @@ -16,6 +16,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.jdt.internal.corext.refactoring.code.InlineTempRefactoring; public class InlineTempInputPage extends UserInputWizardPage { @@ -50,5 +52,6 @@ } label.setText(message); + Dialog.applyDialogFont(result); } } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToToplnputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToToplnputPage.java,v retrieving revision 1.9 diff -u -r1.9 MoveInnerToToplnputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToToplnputPage.java 10 Mar 2003 21:56:47 -0000 1.9 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToToplnputPage.java 18 Mar 2003 18:11:59 -0000 @@ -20,12 +20,13 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus; import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInnerToTopRefactoring; import org.eclipse.jdt.internal.ui.IJavaHelpContextIds; -import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; class MoveInnerToToplnputPage extends TextInputWizardPage{ @@ -66,6 +67,7 @@ getMoveRefactoring().setMarkInstanceFieldAsFinal(finalCheckBox.getSelection()); } }); + Dialog.applyDialogFont(newControl); } /* Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodInputPage.java,v retrieving revision 1.9 diff -u -r1.9 MoveInstanceMethodInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodInputPage.java 10 Mar 2003 21:56:47 -0000 1.9 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodInputPage.java 18 Mar 2003 18:12:00 -0000 @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ILabelProvider; @@ -53,7 +54,6 @@ import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus; import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring; import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring.INewReceiver; -import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; class MoveInstanceMethodInputPage extends UserInputWizardPage { @@ -137,6 +137,7 @@ createNewReceiverList(result); createNewMethodNameField(result); createOriginalReceiverParameterNameField(result); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.MOVE_MEMBERS_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersInputPage.java,v retrieving revision 1.18 diff -u -r1.18 MoveMembersInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersInputPage.java 10 Mar 2003 21:56:47 -0000 1.18 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersInputPage.java 18 Mar 2003 18:12:06 -0000 @@ -96,6 +96,7 @@ setPageComplete(false); setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.MOVE_MEMBERS_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java,v retrieving revision 1.2 diff -u -r1.2 ParameterEditDialog.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java 10 Mar 2003 21:56:47 -0000 1.2 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java 18 Mar 2003 18:12:06 -0000 @@ -114,6 +114,7 @@ } }); } + applyDialogFont(result); return result; } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PreviewWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PreviewWizardPage.java,v retrieving revision 1.34 diff -u -r1.34 PreviewWizardPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PreviewWizardPage.java 10 Mar 2003 21:56:47 -0000 1.34 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PreviewWizardPage.java 18 Mar 2003 18:12:09 -0000 @@ -26,6 +26,7 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.ICheckStateListener; @@ -353,6 +354,7 @@ GridData gd= new GridData(GridData.FILL_BOTH); gd.widthHint= convertWidthInCharsToPixels(80); sashForm.setLayoutData(gd); + Dialog.applyDialogFont(result); return result; } @@ -365,6 +367,7 @@ Label label= new Label(result, SWT.CENTER); label.setText(RefactoringMessages.getString("PreviewWizardPage.no_source_code_change")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + Dialog.applyDialogFont(result); return result; } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempInputPage.java,v retrieving revision 1.6 diff -u -r1.6 PromoteTempInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempInputPage.java 10 Mar 2003 21:56:47 -0000 1.6 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempInputPage.java 18 Mar 2003 18:12:11 -0000 @@ -23,6 +23,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.internal.corext.Assert; @@ -65,6 +67,7 @@ addDeclareStaticCheckbox(result); addDeclareFinalCheckbox(result); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PROMOTE_TEMP_TO_FIELD_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage1.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage1.java,v retrieving revision 1.18 diff -u -r1.18 PullUpInputPage1.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage1.java 10 Mar 2003 21:56:47 -0000 1.18 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage1.java 18 Mar 2003 18:12:15 -0000 @@ -318,6 +318,7 @@ createStatusLine(composite); setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PULL_UP_WIZARD_PAGE); } @@ -418,6 +419,8 @@ fEditButton= new Button(composite, SWT.PUSH); fEditButton.setText(RefactoringMessages.getString("PullUpInputPage1.Edit")); //$NON-NLS-1$ + + GridData gd= new GridData(); fEditButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); fEditButton.setEnabled(false); SWTUtil.setButtonDimensionHint(fEditButton); Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage2.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage2.java,v retrieving revision 1.6 diff -u -r1.6 PullUpInputPage2.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage2.java 10 Mar 2003 21:56:46 -0000 1.6 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage2.java 18 Mar 2003 18:12:19 -0000 @@ -34,8 +34,10 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Tree; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocumentPartitioner; @@ -62,6 +64,7 @@ import org.eclipse.jdt.ui.JavaElementLabelProvider; import org.eclipse.jdt.ui.JavaElementSorter; +import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration; import org.eclipse.jdt.ui.text.JavaTextTools; @@ -73,7 +76,6 @@ import org.eclipse.jdt.internal.corext.Assert; import org.eclipse.jdt.internal.corext.refactoring.structure.PullUpRefactoring; import org.eclipse.jdt.internal.corext.refactoring.util.JavaElementUtil; -import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages; class PullUpInputPage2 extends UserInputWizardPage { @@ -242,14 +244,15 @@ * @see IDialogPage#createControl(Composite) */ public void createControl(Composite parent) { - Composite composite= new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout()); + Composite composite= new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout()); - createTreeAndSourceViewer(composite); - createButtonComposite(composite); - setControl(composite); + createTreeAndSourceViewer(composite); + createButtonComposite(composite); + setControl(composite); - WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PULL_UP_WIZARD_PAGE); + Dialog.applyDialogFont(composite); + WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PULL_UP_WIZARD_PAGE); } private void createButtonComposite(Composite superComposite) { @@ -405,7 +408,8 @@ fSourceViewer= new SourceViewer(c, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION); fSourceViewer.configure(new JavaSourceViewerConfiguration(getJavaTextTools(), null)); fSourceViewer.setEditable(false); - fSourceViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); + fSourceViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH)); + fSourceViewer.getControl().setFont(JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT)); } private void createSourceViewerLabel(Composite c) { Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownInputPage.java,v retrieving revision 1.13 diff -u -r1.13 PushDownInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownInputPage.java 10 Mar 2003 21:56:47 -0000 1.13 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownInputPage.java 18 Mar 2003 18:12:22 -0000 @@ -201,6 +201,7 @@ createStatusLine(composite); setControl(composite); + Dialog.applyDialogFont(composite); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PUSH_DOWN_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringSaveHelper.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringSaveHelper.java,v retrieving revision 1.3 diff -u -r1.3 RefactoringSaveHelper.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringSaveHelper.java 10 Mar 2003 21:56:47 -0000 1.3 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringSaveHelper.java 18 Mar 2003 18:12:23 -0000 @@ -97,6 +97,7 @@ RefactoringPreferences.setSaveAllEditors(check.getSelection()); } }); + applyDialogFont(result); return result; } }; Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringStatusDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringStatusDialog.java,v retrieving revision 1.5 diff -u -r1.5 RefactoringStatusDialog.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringStatusDialog.java 10 Mar 2003 21:56:46 -0000 1.5 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringStatusDialog.java 18 Mar 2003 18:12:23 -0000 @@ -77,6 +77,7 @@ RefactoringStatusViewer viewer= new RefactoringStatusViewer(result, SWT.NONE); viewer.setLayoutData(new GridData(GridData.FILL_BOTH)); viewer.setStatus(fStatus); + applyDialogFont(result); return result; } protected void buttonPressed(int buttonId) { Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringWizardDialog2.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringWizardDialog2.java,v retrieving revision 1.13 diff -u -r1.13 RefactoringWizardDialog2.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringWizardDialog2.java 10 Mar 2003 21:56:47 -0000 1.13 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringWizardDialog2.java 18 Mar 2003 18:12:26 -0000 @@ -510,6 +510,7 @@ updateMessage(); updateButtons(); + applyDialogFont(result); return result; } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java,v retrieving revision 1.16 diff -u -r1.16 RenameFieldInputWizardPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java 10 Mar 2003 21:56:47 -0000 1.16 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java 18 Mar 2003 18:12:27 -0000 @@ -20,6 +20,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.JavaModelException; @@ -76,6 +78,7 @@ }); updateGetterSetterLabels(); + Dialog.applyDialogFont(composite); } private void getGetterSetterRenamingEnablement() { BusyIndicator.showWhile(getShell().getDisplay(), new Runnable(){ Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameInputWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameInputWizardPage.java,v retrieving revision 1.27 diff -u -r1.27 RenameInputWizardPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameInputWizardPage.java 10 Mar 2003 21:56:46 -0000 1.27 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameInputWizardPage.java 18 Mar 2003 18:12:29 -0000 @@ -82,6 +82,7 @@ addOptionalUpdateCommentsAndStringCheckboxes(composite, layouter); addOptionalUpdateQualifiedNameComponent(composite, layouter, layout.marginWidth); + Dialog.applyDialogFont(superComposite); WorkbenchHelp.setHelp(getControl(), fHelpContextID); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/SourceContextViewer.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/SourceContextViewer.java,v retrieving revision 1.8 diff -u -r1.8 SourceContextViewer.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/SourceContextViewer.java 10 Mar 2003 21:56:47 -0000 1.8 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/SourceContextViewer.java 18 Mar 2003 18:12:29 -0000 @@ -14,12 +14,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.source.SourceViewer; import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jdt.core.ISourceRange; +import org.eclipse.jdt.ui.PreferenceConstants; + class SourceContextViewer extends SourceViewer implements IErrorContextViewer { public static class SourceContextInput { @@ -36,6 +39,7 @@ SourceContextViewer(Composite parent) { super(parent, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION); setEditable(false); + getControl().setFont(JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT)); } /* non Java-doc Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeInputPage.java,v retrieving revision 1.9 diff -u -r1.9 UseSupertypeInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeInputPage.java 10 Mar 2003 21:56:46 -0000 1.9 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeInputPage.java 18 Mar 2003 18:12:31 -0000 @@ -22,6 +22,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.ISelectionChangedListener; @@ -81,6 +82,7 @@ label.setLayoutData(new GridData()); addTableComponent(composite); + Dialog.applyDialogFont(composite); } private void addTableComponent(Composite composite) { Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/ListDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/ListDialog.java,v retrieving revision 1.8 diff -u -r1.8 ListDialog.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/ListDialog.java 10 Mar 2003 23:27:12 -0000 1.8 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/ListDialog.java 18 Mar 2003 18:12:31 -0000 @@ -85,6 +85,7 @@ gd.heightHint= convertHeightInCharsToPixels(15); gd.widthHint= convertWidthInCharsToPixels(55); table.setLayoutData(gd); + applyDialogFont(parent); return parent; } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameInputDialog.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameInputDialog.java,v retrieving revision 1.6 diff -u -r1.6 RenameInputDialog.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameInputDialog.java 10 Mar 2003 23:27:12 -0000 1.6 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameInputDialog.java 18 Mar 2003 18:12:32 -0000 @@ -60,6 +60,7 @@ ref.setUpdateReferences(checkBox.getSelection()); } }); + applyDialogFont(composite); return composite; } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/changes/ChangeExceptionHandler.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/changes/ChangeExceptionHandler.java,v retrieving revision 1.14 diff -u -r1.14 ChangeExceptionHandler.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/changes/ChangeExceptionHandler.java 10 Mar 2003 23:27:15 -0000 1.14 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/changes/ChangeExceptionHandler.java 18 Mar 2003 18:12:33 -0000 @@ -62,6 +62,7 @@ Label label= new Label(parent, SWT.NONE); label.setText(RefactoringMessages.getString("ChangeExceptionHandler.button_explanation")); //$NON-NLS-1$ label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + applyDialogFont(result); return result; } } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java,v retrieving revision 1.30 diff -u -r1.30 ExtractMethodInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java 10 Mar 2003 23:27:15 -0000 1.30 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java 18 Mar 2003 18:12:34 -0000 @@ -25,6 +25,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.ui.help.WorkbenchHelp; @@ -159,6 +160,7 @@ fPreview.setLayoutData(gd); layouter.perform(label, fPreview, 1); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_METHOD_WIZARD_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/InlineMethodInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/InlineMethodInputPage.java,v retrieving revision 1.5 diff -u -r1.5 InlineMethodInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/InlineMethodInputPage.java 10 Mar 2003 23:27:15 -0000 1.5 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/InlineMethodInputPage.java 18 Mar 2003 18:12:35 -0000 @@ -19,6 +19,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Group; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus; @@ -98,6 +100,7 @@ changeRefactoring(InlineMethodRefactoring.INLINE_SINGLE); } }); + Dialog.applyDialogFont(result); } private void changeRefactoring(int mode) { Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java,v retrieving revision 1.25 diff -u -r1.25 ExternalizeWizardPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java 10 Mar 2003 23:27:15 -0000 1.25 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java 18 Mar 2003 18:12:39 -0000 @@ -37,6 +37,7 @@ import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IInputValidator; import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.text.Document; @@ -249,6 +250,7 @@ // promote control setControl(supercomposite); + Dialog.applyDialogFont(supercomposite); WorkbenchHelp.setHelp(supercomposite, IJavaHelpContextIds.EXTERNALIZE_WIZARD_KEYVALUE_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage2.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage2.java,v retrieving revision 1.19 diff -u -r1.19 ExternalizeWizardPage2.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage2.java 10 Mar 2003 23:27:15 -0000 1.19 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage2.java 18 Mar 2003 18:12:43 -0000 @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.IWizardPage; @@ -237,6 +238,7 @@ setControl(parent); initializeFields(); + Dialog.applyDialogFont(parent); WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.EXTERNALIZE_WIZARD_PROPERTIES_FILE_PAGE); } Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchPage.java,v retrieving revision 1.26 diff -u -r1.26 NLSSearchPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchPage.java 10 Mar 2003 23:27:06 -0000 1.26 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchPage.java 18 Mar 2003 18:12:48 -0000 @@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.DialogPage; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.ProgressMonitorDialog; @@ -298,6 +299,7 @@ setControl(result); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(result, IJavaHelpContextIds.NLS_SEARCH_PAGE); } /** Index: ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java =================================================================== RCS file: /home/eclipse/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java,v retrieving revision 1.21 diff -u -r1.21 SelfEncapsulateFieldInputPage.java --- ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java 13 Mar 2003 13:54:24 -0000 1.21 +++ ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java 18 Mar 2003 18:12:49 -0000 @@ -24,6 +24,8 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jface.dialogs.Dialog; + import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.jdt.core.Flags; @@ -111,6 +113,7 @@ getter.setFocus(); + Dialog.applyDialogFont(result); WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.SEF_WIZARD_PAGE); }