View | Details | Raw Unified | Return to bug 35130 | Differences between
and this patch

Collapse All | Expand All

(-)ui/org/eclipse/jdt/internal/ui/compare/CompareDialog.java (+1 lines)
Lines 94-99 Link Here
94
		if (fInput != null)
94
		if (fInput != null)
95
			fContentPane.setInput(fInput);
95
			fContentPane.setInput(fInput);
96
			
96
			
97
		applyDialogFont(parent);		
97
		return parent;
98
		return parent;
98
	}
99
	}
99
	
100
	
(-)ui/org/eclipse/jdt/internal/ui/dialogs/BuildPathDialog.java (+1 lines)
Lines 64-69 Link Here
64
		fBlock= new BuildPathsBlock(listener, 0);
64
		fBlock= new BuildPathsBlock(listener, 0);
65
		fBlock.init(fProject, null, null);
65
		fBlock.init(fProject, null, null);
66
		fBlock.createControl(result).setLayoutData(new GridData(GridData.FILL_BOTH));
66
		fBlock.createControl(result).setLayoutData(new GridData(GridData.FILL_BOTH));
67
		applyDialogFont(result);		
67
		return result;
68
		return result;
68
	}
69
	}
69
70
(-)ui/org/eclipse/jdt/internal/ui/dialogs/ListDialog.java (+2 lines)
Lines 75-80 Link Here
75
		GridData gd= new GridData(GridData.FILL_BOTH);
75
		GridData gd= new GridData(GridData.FILL_BOTH);
76
		gd.widthHint= convertWidthInCharsToPixels(55);
76
		gd.widthHint= convertWidthInCharsToPixels(55);
77
		label.setLayoutData(gd);
77
		label.setLayoutData(gd);
78
		applyDialogFont(label);
78
		return label;
79
		return label;
79
	}
80
	}
80
	
81
	
Lines 90-95 Link Here
90
		gd.widthHint= convertWidthInCharsToPixels(55);
91
		gd.widthHint= convertWidthInCharsToPixels(55);
91
		gd.heightHint= convertHeightInCharsToPixels(15);
92
		gd.heightHint= convertHeightInCharsToPixels(15);
92
		table.setLayoutData(gd);
93
		table.setLayoutData(gd);
94
		applyDialogFont(parent);		
93
		return parent;
95
		return parent;
94
	}
96
	}
95
	
97
	
(-)ui/org/eclipse/jdt/internal/ui/dialogs/MultiElementListSelectionDialog.java (-1 / +2 lines)
Lines 120-125 Link Here
120
		fCurrentPage= 0;
120
		fCurrentPage= 0;
121
		setPageData();
121
		setPageData();
122
		
122
		
123
		applyDialogFont(contents);		
123
		return contents;
124
		return contents;
124
	}
125
	}
125
126
Lines 157-163 Link Here
157
		data= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
158
		data= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
158
		data.horizontalAlignment= GridData.END;
159
		data.horizontalAlignment= GridData.END;
159
		fPageInfoLabel.setLayoutData(data);
160
		fPageInfoLabel.setLayoutData(data);
160
		
161
		applyDialogFont(messageLabel);
161
		return messageLabel;
162
		return messageLabel;
162
	}
163
	}
163
	
164
	
(-)ui/org/eclipse/jdt/internal/ui/dialogs/OptionalMessageDialog.java (+1 lines)
Lines 78-83 Link Here
78
				setDialogEnabled(fId, !((Button)e.widget).getSelection());
78
				setDialogEnabled(fId, !((Button)e.widget).getSelection());
79
			}
79
			}
80
		});
80
		});
81
		applyDialogFont(fHideDialogCheckBox);
81
		return fHideDialogCheckBox;
82
		return fHideDialogCheckBox;
82
	}
83
	}
83
84
(-)ui/org/eclipse/jdt/internal/ui/dialogs/ProblemDialog.java (+1 lines)
Lines 80-85 Link Here
80
		}
80
		}
81
		if (i < childCount && label != null)
81
		if (i < childCount && label != null)
82
			label.setImage(fImage);
82
			label.setImage(fImage);
83
		applyDialogFont(composite);		
83
		return composite;
84
		return composite;
84
	}
85
	}
85
86
(-)ui/org/eclipse/jdt/internal/ui/dialogs/StatusDialog.java (-1 / +1 lines)
Lines 138-144 Link Here
138
		fStatusLine.setAlignment(SWT.LEFT);
138
		fStatusLine.setAlignment(SWT.LEFT);
139
		fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
139
		fStatusLine.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
140
		fStatusLine.setErrorStatus(null); //$NON-NLS-1$
140
		fStatusLine.setErrorStatus(null); //$NON-NLS-1$
141
141
		applyDialogFont(composite);
142
		super.createButtonBar(composite);
142
		super.createButtonBar(composite);
143
		return composite;
143
		return composite;
144
	}
144
	}
(-)ui/org/eclipse/jdt/internal/ui/filters/CustomFiltersDialog.java (+1 lines)
Lines 154-159 Link Here
154
		if (fBuiltInFilters.length > 0)
154
		if (fBuiltInFilters.length > 0)
155
			createCheckBoxList(group);
155
			createCheckBoxList(group);
156
				
156
				
157
		applyDialogFont(parent);		
157
		return parent;
158
		return parent;
158
	}
159
	}
159
160
(-)ui/org/eclipse/jdt/internal/ui/jarpackager/ConfirmSaveModifiedResourcesDialog.java (+1 lines)
Lines 78-83 Link Here
78
		data.widthHint= convertWidthInCharsToPixels(20);
78
		data.widthHint= convertWidthInCharsToPixels(20);
79
		data.heightHint= convertHeightInCharsToPixels(5);
79
		data.heightHint= convertHeightInCharsToPixels(5);
80
		control.setLayoutData(data);
80
		control.setLayoutData(data);
81
		applyDialogFont(control);
81
		return control;
82
		return control;
82
	}
83
	}
83
84
(-)ui/org/eclipse/jdt/internal/ui/jarpackager/JarManifestWizardPage.java (+2 lines)
Lines 43-48 Link Here
43
import org.eclipse.swt.widgets.Listener;
43
import org.eclipse.swt.widgets.Listener;
44
import org.eclipse.swt.widgets.Text;
44
import org.eclipse.swt.widgets.Text;
45
45
46
import org.eclipse.jface.dialogs.Dialog;
46
import org.eclipse.jface.dialogs.DialogPage;
47
import org.eclipse.jface.dialogs.DialogPage;
47
import org.eclipse.jface.dialogs.IDialogSettings;
48
import org.eclipse.jface.dialogs.IDialogSettings;
48
import org.eclipse.jface.resource.JFaceResources;
49
import org.eclipse.jface.resource.JFaceResources;
Lines 189-194 Link Here
189
		setControl(composite);
190
		setControl(composite);
190
		update();
191
		update();
191
192
193
		Dialog.applyDialogFont(composite);
192
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JARMANIFEST_WIZARD_PAGE);								
194
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JARMANIFEST_WIZARD_PAGE);								
193
			
195
			
194
	}
196
	}
(-)ui/org/eclipse/jdt/internal/ui/jarpackager/JarOptionsPage.java (-1 / +2 lines)
Lines 30-35 Link Here
30
import org.eclipse.swt.widgets.Listener;
30
import org.eclipse.swt.widgets.Listener;
31
import org.eclipse.swt.widgets.Text;
31
import org.eclipse.swt.widgets.Text;
32
32
33
import org.eclipse.jface.dialogs.Dialog;
33
import org.eclipse.jface.dialogs.IDialogSettings;
34
import org.eclipse.jface.dialogs.IDialogSettings;
34
import org.eclipse.jface.resource.JFaceResources;
35
import org.eclipse.jface.resource.JFaceResources;
35
import org.eclipse.jface.wizard.IWizardPage;
36
import org.eclipse.jface.wizard.IWizardPage;
Lines 110-117 Link Here
110
		setControl(composite);
111
		setControl(composite);
111
		update();
112
		update();
112
113
114
		Dialog.applyDialogFont(composite);
113
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAROPTIONS_WIZARD_PAGE);								
115
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAROPTIONS_WIZARD_PAGE);								
114
		
115
	}
116
	}
116
117
117
	/**
118
	/**
(-)ui/org/eclipse/jdt/internal/ui/jarpackager/JarPackageWizardPage.java (+2 lines)
Lines 40-45 Link Here
40
import org.eclipse.swt.widgets.Text;
40
import org.eclipse.swt.widgets.Text;
41
import org.eclipse.swt.widgets.TreeItem;
41
import org.eclipse.swt.widgets.TreeItem;
42
42
43
import org.eclipse.jface.dialogs.Dialog;
43
import org.eclipse.jface.dialogs.IDialogSettings;
44
import org.eclipse.jface.dialogs.IDialogSettings;
44
import org.eclipse.jface.viewers.IStructuredSelection;
45
import org.eclipse.jface.viewers.IStructuredSelection;
45
import org.eclipse.jface.viewers.ITreeContentProvider;
46
import org.eclipse.jface.viewers.ITreeContentProvider;
Lines 158-163 Link Here
158
		update();
159
		update();
159
		giveFocusToDestination();
160
		giveFocusToDestination();
160
		
161
		
162
		Dialog.applyDialogFont(composite);
161
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JARPACKAGER_WIZARD_PAGE);
163
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JARPACKAGER_WIZARD_PAGE);
162
	}
164
	}
163
165
(-)ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocSpecificsWizardPage.java (+3 lines)
Lines 28-33 Link Here
28
import org.eclipse.swt.widgets.Control;
28
import org.eclipse.swt.widgets.Control;
29
import org.eclipse.swt.widgets.Text;
29
import org.eclipse.swt.widgets.Text;
30
30
31
import org.eclipse.jface.dialogs.Dialog;
32
31
import org.eclipse.ui.help.WorkbenchHelp;
33
import org.eclipse.ui.help.WorkbenchHelp;
32
34
33
import org.eclipse.jdt.core.IJavaProject;
35
import org.eclipse.jdt.core.IJavaProject;
Lines 92-97 Link Here
92
		createAntGroup(fLowerComposite);
94
		createAntGroup(fLowerComposite);
93
95
94
		setControl(fLowerComposite);
96
		setControl(fLowerComposite);
97
		Dialog.applyDialogFont(fLowerComposite);
95
		WorkbenchHelp.setHelp(fLowerComposite, IJavaHelpContextIds.JAVADOC_SPECIFICS_PAGE);
98
		WorkbenchHelp.setHelp(fLowerComposite, IJavaHelpContextIds.JAVADOC_SPECIFICS_PAGE);
96
99
97
	} //end method createControl
100
	} //end method createControl
(-)ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocStandardWizardPage.java (+4 lines)
Lines 38-43 Link Here
38
import org.eclipse.swt.widgets.Shell;
38
import org.eclipse.swt.widgets.Shell;
39
import org.eclipse.swt.widgets.Text;
39
import org.eclipse.swt.widgets.Text;
40
40
41
import org.eclipse.jface.dialogs.Dialog;
42
41
import org.eclipse.ui.help.WorkbenchHelp;
43
import org.eclipse.ui.help.WorkbenchHelp;
42
44
43
import org.eclipse.jdt.core.IClasspathEntry;
45
import org.eclipse.jdt.core.IClasspathEntry;
Lines 122-127 Link Here
122
		createStyleSheetGroup(fUpperComposite);
124
		createStyleSheetGroup(fUpperComposite);
123
125
124
		setControl(fUpperComposite);
126
		setControl(fUpperComposite);
127
		Dialog.applyDialogFont(fUpperComposite);
125
		WorkbenchHelp.setHelp(fUpperComposite, IJavaHelpContextIds.JAVADOC_STANDARD_PAGE);
128
		WorkbenchHelp.setHelp(fUpperComposite, IJavaHelpContextIds.JAVADOC_STANDARD_PAGE);
126
	}
129
	}
127
	private void createBasicOptionsGroup(Composite composite) {
130
	private void createBasicOptionsGroup(Composite composite) {
Lines 571-576 Link Here
571
			Composite composite= (Composite) super.createDialogArea(parent);
574
			Composite composite= (Composite) super.createDialogArea(parent);
572
			Control inner= fJavadocConfigurationBlock.createContents(composite);
575
			Control inner= fJavadocConfigurationBlock.createContents(composite);
573
			inner.setLayoutData(new GridData(GridData.FILL_BOTH));
576
			inner.setLayoutData(new GridData(GridData.FILL_BOTH));
577
			applyDialogFont(composite);		
574
			return composite;
578
			return composite;
575
		}
579
		}
576
580
(-)ui/org/eclipse/jdt/internal/ui/javadocexport/JavadocTreeWizardPage.java (+2 lines)
Lines 38-43 Link Here
38
import org.eclipse.swt.widgets.Text;
38
import org.eclipse.swt.widgets.Text;
39
import org.eclipse.swt.widgets.TreeItem;
39
import org.eclipse.swt.widgets.TreeItem;
40
40
41
import org.eclipse.jface.dialogs.Dialog;
41
import org.eclipse.jface.viewers.CheckStateChangedEvent;
42
import org.eclipse.jface.viewers.CheckStateChangedEvent;
42
import org.eclipse.jface.viewers.ICheckStateListener;
43
import org.eclipse.jface.viewers.ICheckStateListener;
43
import org.eclipse.jface.viewers.ITreeContentProvider;
44
import org.eclipse.jface.viewers.ITreeContentProvider;
Lines 143-148 Link Here
143
		createOptionsSet(composite);
144
		createOptionsSet(composite);
144
145
145
		setControl(composite);
146
		setControl(composite);
147
		Dialog.applyDialogFont(composite);
146
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAVADOC_TREE_PAGE);
148
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAVADOC_TREE_PAGE);
147
	}
149
	}
148
150
(-)ui/org/eclipse/jdt/internal/ui/packageview/SelectionTransferDropAdapter.java (+1 lines)
Lines 448-453 Link Here
448
				Composite result= (Composite)super.createDialogArea(parent);
448
				Composite result= (Composite)super.createDialogArea(parent);
449
				addUpdateReferenceComponent(result);
449
				addUpdateReferenceComponent(result);
450
				addUpdateQualifiedNameComponent(result, ((GridLayout)result.getLayout()).marginWidth);
450
				addUpdateQualifiedNameComponent(result, ((GridLayout)result.getLayout()).marginWidth);
451
				applyDialogFont(result);		
451
				return result;
452
				return result;
452
			}
453
			}
453
			private void updateButtons() {
454
			private void updateButtons() {
(-)ui/org/eclipse/jdt/internal/ui/preferences/AppearancePreferencePage.java (+2 lines)
Lines 17-22 Link Here
17
import org.eclipse.swt.widgets.Composite;
17
import org.eclipse.swt.widgets.Composite;
18
import org.eclipse.swt.widgets.Control;
18
import org.eclipse.swt.widgets.Control;
19
19
20
import org.eclipse.jface.dialogs.Dialog;
20
import org.eclipse.jface.dialogs.IDialogConstants;
21
import org.eclipse.jface.dialogs.IDialogConstants;
21
import org.eclipse.jface.preference.IPreferenceStore;
22
import org.eclipse.jface.preference.IPreferenceStore;
22
import org.eclipse.jface.preference.PreferencePage;
23
import org.eclipse.jface.preference.PreferencePage;
Lines 185-190 Link Here
185
		
186
		
186
		initFields();
187
		initFields();
187
		
188
		
189
		Dialog.applyDialogFont(result);
188
		return result;
190
		return result;
189
	}
191
	}
190
	
192
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/BuildPathsPropertyPage.java (-3 / +7 lines)
Lines 24-29 Link Here
24
import org.eclipse.swt.widgets.Label;
24
import org.eclipse.swt.widgets.Label;
25
import org.eclipse.swt.widgets.Shell;
25
import org.eclipse.swt.widgets.Shell;
26
26
27
import org.eclipse.jface.dialogs.Dialog;
27
import org.eclipse.jface.dialogs.IDialogSettings;
28
import org.eclipse.jface.dialogs.IDialogSettings;
28
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
29
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
29
import org.eclipse.jface.operation.IRunnableWithProgress;
30
import org.eclipse.jface.operation.IRunnableWithProgress;
Lines 64-76 Link Here
64
		noDefaultAndApplyButton();		
65
		noDefaultAndApplyButton();		
65
		
66
		
66
		IProject project= getProject();
67
		IProject project= getProject();
68
		Control result;
67
		if (project == null || !isJavaProject(project)) {
69
		if (project == null || !isJavaProject(project)) {
68
			return createWithoutJava(parent);
70
			result= createWithoutJava(parent);
69
		} else if (!project.isOpen()) {
71
		} else if (!project.isOpen()) {
70
			return createForClosedProject(parent);
72
			result= createForClosedProject(parent);
71
		} else {
73
		} else {
72
			return createWithJava(parent, project);
74
			result= createWithJava(parent, project);
73
		}
75
		}
76
		Dialog.applyDialogFont(result);
77
		return result;
74
	}
78
	}
75
	
79
	
76
	private IDialogSettings getSettings() {
80
	private IDialogSettings getSettings() {
(-)ui/org/eclipse/jdt/internal/ui/preferences/ClasspathVariablesPreferencePage.java (-1 / +4 lines)
Lines 13-18 Link Here
13
import org.eclipse.swt.widgets.Composite;
13
import org.eclipse.swt.widgets.Composite;
14
import org.eclipse.swt.widgets.Control;
14
import org.eclipse.swt.widgets.Control;
15
15
16
import org.eclipse.jface.dialogs.Dialog;
16
import org.eclipse.jface.preference.PreferencePage;
17
import org.eclipse.jface.preference.PreferencePage;
17
18
18
import org.eclipse.ui.IWorkbench;
19
import org.eclipse.ui.IWorkbench;
Lines 47-53 Link Here
47
	 */
48
	 */
48
	protected Control createContents(Composite parent) {
49
	protected Control createContents(Composite parent) {
49
		WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.CP_VARIABLES_PREFERENCE_PAGE);
50
		WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.CP_VARIABLES_PREFERENCE_PAGE);
50
		return fVariableBlock.createContents(parent);
51
		Control result= fVariableBlock.createContents(parent);
52
		Dialog.applyDialogFont(result);
53
		return result;
51
	}
54
	}
52
	
55
	
53
	/*
56
	/*
(-)ui/org/eclipse/jdt/internal/ui/preferences/CodeFormatterPreferencePage.java (-1 / +4 lines)
Lines 15-20 Link Here
15
import org.eclipse.swt.widgets.Composite;
15
import org.eclipse.swt.widgets.Composite;
16
import org.eclipse.swt.widgets.Control;
16
import org.eclipse.swt.widgets.Control;
17
17
18
import org.eclipse.jface.dialogs.Dialog;
18
import org.eclipse.jface.preference.PreferencePage;
19
import org.eclipse.jface.preference.PreferencePage;
19
20
20
import org.eclipse.ui.IWorkbench;
21
import org.eclipse.ui.IWorkbench;
Lines 61-67 Link Here
61
	 * @see PreferencePage#createContents(Composite)
62
	 * @see PreferencePage#createContents(Composite)
62
	 */
63
	 */
63
	protected Control createContents(Composite parent) {
64
	protected Control createContents(Composite parent) {
64
		return fConfigurationBlock.createContents(parent);
65
		Control result= fConfigurationBlock.createContents(parent);
66
		Dialog.applyDialogFont(result);
67
		return result;
65
	}
68
	}
66
69
67
	/*
70
	/*
(-)ui/org/eclipse/jdt/internal/ui/preferences/CodeGenerationPreferencePage.java (+2 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.TabFolder;
20
import org.eclipse.swt.widgets.TabFolder;
21
import org.eclipse.swt.widgets.TabItem;
21
import org.eclipse.swt.widgets.TabItem;
22
22
23
import org.eclipse.jface.dialogs.Dialog;
23
import org.eclipse.jface.preference.PreferencePage;
24
import org.eclipse.jface.preference.PreferencePage;
24
25
25
import org.eclipse.ui.IWorkbench;
26
import org.eclipse.ui.IWorkbench;
Lines 94-99 Link Here
94
		item.setText(PreferencesMessages.getString("CodeGenerationPreferencePage.tab.templates.tabtitle")); //$NON-NLS-1$
95
		item.setText(PreferencesMessages.getString("CodeGenerationPreferencePage.tab.templates.tabtitle")); //$NON-NLS-1$
95
		item.setControl(templateControl);
96
		item.setControl(templateControl);
96
		
97
		
98
		Dialog.applyDialogFont(composite);
97
		return composite;
99
		return composite;
98
	}
100
	}
99
101
(-)ui/org/eclipse/jdt/internal/ui/preferences/CompilerPreferencePage.java (-1 / +4 lines)
Lines 15-20 Link Here
15
import org.eclipse.swt.widgets.Composite;
15
import org.eclipse.swt.widgets.Composite;
16
import org.eclipse.swt.widgets.Control;
16
import org.eclipse.swt.widgets.Control;
17
17
18
import org.eclipse.jface.dialogs.Dialog;
18
import org.eclipse.jface.preference.PreferencePage;
19
import org.eclipse.jface.preference.PreferencePage;
19
20
20
import org.eclipse.ui.IWorkbench;
21
import org.eclipse.ui.IWorkbench;
Lines 61-67 Link Here
61
	 * @see PreferencePage#createContents(Composite)
62
	 * @see PreferencePage#createContents(Composite)
62
	 */
63
	 */
63
	protected Control createContents(Composite parent) {
64
	protected Control createContents(Composite parent) {
64
		return fConfigurationBlock.createContents(parent);
65
		Control result= fConfigurationBlock.createContents(parent);
66
		Dialog.applyDialogFont(result);
67
		return result;
65
	}
68
	}
66
69
67
	/*
70
	/*
(-)ui/org/eclipse/jdt/internal/ui/preferences/CompilerPropertyPage.java (+2 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.Control;
20
import org.eclipse.swt.widgets.Control;
21
21
22
import org.eclipse.jface.dialogs.ControlEnableState;
22
import org.eclipse.jface.dialogs.ControlEnableState;
23
import org.eclipse.jface.dialogs.Dialog;
23
import org.eclipse.jface.preference.IPreferenceNode;
24
import org.eclipse.jface.preference.IPreferenceNode;
24
import org.eclipse.jface.preference.IPreferencePage;
25
import org.eclipse.jface.preference.IPreferencePage;
25
import org.eclipse.jface.preference.PreferenceDialog;
26
import org.eclipse.jface.preference.PreferenceDialog;
Lines 126-131 Link Here
126
		fUseWorkspaceSettings.setSelection(!useProjectSettings);
127
		fUseWorkspaceSettings.setSelection(!useProjectSettings);
127
		
128
		
128
		updateEnableState();
129
		updateEnableState();
130
		Dialog.applyDialogFont(composite);
129
		return composite;
131
		return composite;
130
	}
132
	}
131
	
133
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/EditTemplateDialog.java (+1 lines)
Lines 309-314 Link Here
309
		}
309
		}
310
		initializeActions();
310
		initializeActions();
311
311
312
		applyDialogFont(parent);		
312
		return composite;
313
		return composite;
313
	}
314
	}
314
	
315
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizeInputDialog.java (+1 lines)
Lines 106-111 Link Here
106
		
106
		
107
		fNameDialogField.postSetFocusOnDialogField(parent.getDisplay());
107
		fNameDialogField.postSetFocusOnDialogField(parent.getDisplay());
108
		
108
		
109
		applyDialogFont(composite);		
109
		return composite;
110
		return composite;
110
	}
111
	}
111
	
112
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/ImportOrganizePreferencePage.java (+2 lines)
Lines 28-33 Link Here
28
import org.eclipse.swt.widgets.Control;
28
import org.eclipse.swt.widgets.Control;
29
import org.eclipse.swt.widgets.FileDialog;
29
import org.eclipse.swt.widgets.FileDialog;
30
30
31
import org.eclipse.jface.dialogs.Dialog;
31
import org.eclipse.jface.dialogs.MessageDialog;
32
import org.eclipse.jface.dialogs.MessageDialog;
32
import org.eclipse.jface.preference.IPreferenceStore;
33
import org.eclipse.jface.preference.IPreferenceStore;
33
import org.eclipse.jface.preference.PreferencePage;
34
import org.eclipse.jface.preference.PreferencePage;
Lines 228-233 Link Here
228
		
229
		
229
		fIgnoreLowerCaseTypesField.doFillIntoGrid(composite, 2);
230
		fIgnoreLowerCaseTypesField.doFillIntoGrid(composite, 2);
230
		
231
		
232
		Dialog.applyDialogFont(composite);
231
		return composite;
233
		return composite;
232
	}
234
	}
233
	
235
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/JavaBasePreferencePage.java (+2 lines)
Lines 30-35 Link Here
30
import org.eclipse.swt.widgets.Text;
30
import org.eclipse.swt.widgets.Text;
31
import org.eclipse.swt.widgets.Widget;
31
import org.eclipse.swt.widgets.Widget;
32
32
33
import org.eclipse.jface.dialogs.Dialog;
33
import org.eclipse.jface.dialogs.IDialogConstants;
34
import org.eclipse.jface.dialogs.IDialogConstants;
34
import org.eclipse.jface.preference.IPreferenceStore;
35
import org.eclipse.jface.preference.IPreferenceStore;
35
import org.eclipse.jface.preference.PreferencePage;
36
import org.eclipse.jface.preference.PreferencePage;
Lines 232-237 Link Here
232
		addRadioButton(typeHierarchyGroup, PreferencesMessages.getString("JavaBasePreferencePage.inPerspective"), OPEN_TYPE_HIERARCHY, OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE);  //$NON-NLS-1$
233
		addRadioButton(typeHierarchyGroup, PreferencesMessages.getString("JavaBasePreferencePage.inPerspective"), OPEN_TYPE_HIERARCHY, OPEN_TYPE_HIERARCHY_IN_PERSPECTIVE);  //$NON-NLS-1$
233
		addRadioButton(typeHierarchyGroup, PreferencesMessages.getString("JavaBasePreferencePage.inView"), OPEN_TYPE_HIERARCHY, OPEN_TYPE_HIERARCHY_IN_VIEW_PART); //$NON-NLS-1$
234
		addRadioButton(typeHierarchyGroup, PreferencesMessages.getString("JavaBasePreferencePage.inView"), OPEN_TYPE_HIERARCHY, OPEN_TYPE_HIERARCHY_IN_VIEW_PART); //$NON-NLS-1$
234
235
236
		Dialog.applyDialogFont(result);
235
		return result;
237
		return result;
236
	}
238
	}
237
	
239
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorHoverConfigurationBlock.java (+1 lines)
Lines 215-220 Link Here
215
215
216
		initialize();
216
		initialize();
217
217
218
		Dialog.applyDialogFont(hoverComposite);
218
		return hoverComposite;
219
		return hoverComposite;
219
	}
220
	}
220
221
(-)ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorPreferencePage.java (+2 lines)
Lines 51-56 Link Here
51
import org.eclipse.swt.widgets.Text;
51
import org.eclipse.swt.widgets.Text;
52
52
53
import org.eclipse.jface.action.Action;
53
import org.eclipse.jface.action.Action;
54
import org.eclipse.jface.dialogs.Dialog;
54
import org.eclipse.jface.preference.IPreferenceStore;
55
import org.eclipse.jface.preference.IPreferenceStore;
55
import org.eclipse.jface.preference.PreferenceConverter;
56
import org.eclipse.jface.preference.PreferenceConverter;
56
import org.eclipse.jface.preference.PreferencePage;
57
import org.eclipse.jface.preference.PreferencePage;
Lines 1192-1197 Link Here
1192
		
1193
		
1193
		initialize();
1194
		initialize();
1194
		
1195
		
1196
		Dialog.applyDialogFont(folder);
1195
		return folder;
1197
		return folder;
1196
	}
1198
	}
1197
	
1199
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/JavaElementInfoPage.java (-1 / +3 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.Control;
20
import org.eclipse.swt.widgets.Control;
21
import org.eclipse.swt.widgets.Label;
21
import org.eclipse.swt.widgets.Label;
22
22
23
import org.eclipse.jface.dialogs.Dialog;
24
23
import org.eclipse.ui.dialogs.PropertyPage;
25
import org.eclipse.ui.dialogs.PropertyPage;
24
import org.eclipse.ui.help.WorkbenchHelp;
26
import org.eclipse.ui.help.WorkbenchHelp;
25
27
Lines 126-132 Link Here
126
			}
128
			}
127
		}
129
		}
128
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAVA_ELEMENT_INFO_PAGE);		
130
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.JAVA_ELEMENT_INFO_PAGE);		
129
		
131
		Dialog.applyDialogFont(composite);		
130
		return composite;
132
		return composite;
131
	}
133
	}
132
134
(-)ui/org/eclipse/jdt/internal/ui/preferences/JavadocConfigurationPropertyPage.java (+3 lines)
Lines 22-27 Link Here
22
import org.eclipse.swt.widgets.Composite;
22
import org.eclipse.swt.widgets.Composite;
23
import org.eclipse.swt.widgets.Control;
23
import org.eclipse.swt.widgets.Control;
24
24
25
import org.eclipse.jface.dialogs.Dialog;
26
25
import org.eclipse.ui.dialogs.PropertyPage;
27
import org.eclipse.ui.dialogs.PropertyPage;
26
import org.eclipse.ui.help.WorkbenchHelp;
28
import org.eclipse.ui.help.WorkbenchHelp;
27
29
Lines 80-85 Link Here
80
		Control control= fJavadocConfigurationBlock.createContents(parent);
82
		Control control= fJavadocConfigurationBlock.createContents(parent);
81
		WorkbenchHelp.setHelp(control, IJavaHelpContextIds.JAVADOC_CONFIGURATION_PROPERTY_PAGE);
83
		WorkbenchHelp.setHelp(control, IJavaHelpContextIds.JAVADOC_CONFIGURATION_PROPERTY_PAGE);
82
84
85
		Dialog.applyDialogFont(control);
83
		return control;
86
		return control;
84
	}
87
	}
85
88
(-)ui/org/eclipse/jdt/internal/ui/preferences/JavadocPreferencePage.java (+2 lines)
Lines 21-26 Link Here
21
import org.eclipse.swt.widgets.FileDialog;
21
import org.eclipse.swt.widgets.FileDialog;
22
import org.eclipse.swt.widgets.Text;
22
import org.eclipse.swt.widgets.Text;
23
23
24
import org.eclipse.jface.dialogs.Dialog;
24
import org.eclipse.jface.preference.IPreferenceStore;
25
import org.eclipse.jface.preference.IPreferenceStore;
25
import org.eclipse.jface.preference.PreferencePage;
26
import org.eclipse.jface.preference.PreferencePage;
26
27
Lines 126-131 Link Here
126
127
127
		initFields();
128
		initFields();
128
129
130
		Dialog.applyDialogFont(fComposite);
129
		return fComposite;
131
		return fComposite;
130
	}
132
	}
131
133
(-)ui/org/eclipse/jdt/internal/ui/preferences/MembersOrderPreferencePage.java (+2 lines)
Lines 23-28 Link Here
23
import org.eclipse.swt.widgets.Composite;
23
import org.eclipse.swt.widgets.Composite;
24
import org.eclipse.swt.widgets.Control;
24
import org.eclipse.swt.widgets.Control;
25
25
26
import org.eclipse.jface.dialogs.Dialog;
26
import org.eclipse.jface.preference.IPreferenceStore;
27
import org.eclipse.jface.preference.IPreferenceStore;
27
import org.eclipse.jface.preference.PreferencePage;
28
import org.eclipse.jface.preference.PreferencePage;
28
import org.eclipse.jface.resource.ImageDescriptor;
29
import org.eclipse.jface.resource.ImageDescriptor;
Lines 135-140 Link Here
135
		composite.setLayoutData(data);
136
		composite.setLayoutData(data);
136
137
137
		createSortOrderListDialogField(composite, 3);
138
		createSortOrderListDialogField(composite, 3);
139
		Dialog.applyDialogFont(composite);
138
		return composite;
140
		return composite;
139
	}
141
	}
140
142
(-)ui/org/eclipse/jdt/internal/ui/preferences/NameConventionConfigurationBlock.java (+1 lines)
Lines 137-142 Link Here
137
			
137
			
138
			fPrefixField.postSetFocusOnDialogField(parent.getDisplay());
138
			fPrefixField.postSetFocusOnDialogField(parent.getDisplay());
139
			
139
			
140
			applyDialogFont(composite);		
140
			return composite;
141
			return composite;
141
		}
142
		}
142
		
143
		
(-)ui/org/eclipse/jdt/internal/ui/preferences/NewJavaProjectPreferencePage.java (+2 lines)
Lines 41-46 Link Here
41
import org.eclipse.swt.widgets.Text;
41
import org.eclipse.swt.widgets.Text;
42
import org.eclipse.swt.widgets.Widget;
42
import org.eclipse.swt.widgets.Widget;
43
43
44
import org.eclipse.jface.dialogs.Dialog;
44
import org.eclipse.jface.dialogs.IDialogConstants;
45
import org.eclipse.jface.dialogs.IDialogConstants;
45
import org.eclipse.jface.preference.IPreferenceStore;
46
import org.eclipse.jface.preference.IPreferenceStore;
46
import org.eclipse.jface.preference.PreferencePage;
47
import org.eclipse.jface.preference.PreferencePage;
Lines 366-371 Link Here
366
					
367
					
367
		validateFolders();
368
		validateFolders();
368
	
369
	
370
		Dialog.applyDialogFont(result);
369
		return result;
371
		return result;
370
	}
372
	}
371
	
373
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/SourceAttachmentPropertyPage.java (-4 / +13 lines)
Lines 27-32 Link Here
27
import org.eclipse.swt.widgets.Control;
27
import org.eclipse.swt.widgets.Control;
28
import org.eclipse.swt.widgets.Label;
28
import org.eclipse.swt.widgets.Label;
29
29
30
import org.eclipse.jface.dialogs.Dialog;
30
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
31
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
31
import org.eclipse.jface.operation.IRunnableWithProgress;
32
import org.eclipse.jface.operation.IRunnableWithProgress;
32
33
Lines 69-75 Link Here
69
		try {
70
		try {
70
			fRoot= getJARPackageFragmentRoot();
71
			fRoot= getJARPackageFragmentRoot();
71
			if (fRoot == null || fRoot.getKind() != IPackageFragmentRoot.K_BINARY) {
72
			if (fRoot == null || fRoot.getKind() != IPackageFragmentRoot.K_BINARY) {
72
				return createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message"));  //$NON-NLS-1$
73
				Control result= createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message"));  //$NON-NLS-1$
74
				Dialog.applyDialogFont(result);		
75
				return result;
73
			}
76
			}
74
77
75
			IPath containerPath= null;
78
			IPath containerPath= null;
Lines 85-99 Link Here
85
					if (entry == null) {
88
					if (entry == null) {
86
						IClasspathContainer container= JavaCore.getClasspathContainer(containerPath, jproject);
89
						IClasspathContainer container= JavaCore.getClasspathContainer(containerPath, jproject);
87
						String containerName= container != null ? container.getDescription() : containerPath.toString();
90
						String containerName= container != null ? container.getDescription() : containerPath.toString();
88
						return createMessageContent(composite, PreferencesMessages.getFormattedString("SourceAttachmentPropertyPage.containerentry.message", containerName));  //$NON-NLS-1$
91
						Control result= createMessageContent(composite, PreferencesMessages.getFormattedString("SourceAttachmentPropertyPage.containerentry.message", containerName));  //$NON-NLS-1$
92
						Dialog.applyDialogFont(result);		
93
						return result;
89
					}
94
					}
90
				}
95
				}
91
			}
96
			}
92
			fSourceAttachmentBlock= new SourceAttachmentBlock(this, entry, containerPath, jproject);
97
			fSourceAttachmentBlock= new SourceAttachmentBlock(this, entry, containerPath, jproject);
93
			return fSourceAttachmentBlock.createControl(composite);				
98
			Control result= fSourceAttachmentBlock.createControl(composite);				
99
			Dialog.applyDialogFont(result);
100
			return result;		
94
		} catch (CoreException e) {
101
		} catch (CoreException e) {
95
			JavaPlugin.log(e);
102
			JavaPlugin.log(e);
96
			return createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message"));  //$NON-NLS-1$
103
			Control result= createMessageContent(composite, PreferencesMessages.getString("SourceAttachmentPropertyPage.noarchive.message"));  //$NON-NLS-1$
104
			Dialog.applyDialogFont(result);
105
			return result;		
97
		}		
106
		}		
98
	}
107
	}
99
	
108
	
(-)ui/org/eclipse/jdt/internal/ui/preferences/TemplatePreferencePage.java (+2 lines)
Lines 37-42 Link Here
37
import org.eclipse.swt.widgets.Table;
37
import org.eclipse.swt.widgets.Table;
38
import org.eclipse.swt.widgets.TableColumn;
38
import org.eclipse.swt.widgets.TableColumn;
39
39
40
import org.eclipse.jface.dialogs.Dialog;
40
import org.eclipse.jface.dialogs.ErrorDialog;
41
import org.eclipse.jface.dialogs.ErrorDialog;
41
import org.eclipse.jface.dialogs.MessageDialog;
42
import org.eclipse.jface.dialogs.MessageDialog;
42
import org.eclipse.jface.preference.IPreferenceStore;
43
import org.eclipse.jface.preference.IPreferenceStore;
Lines 320-325 Link Here
320
321
321
		WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.TEMPLATE_PREFERENCE_PAGE);
322
		WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.TEMPLATE_PREFERENCE_PAGE);
322
		
323
		
324
		Dialog.applyDialogFont(parent);		
323
		return parent;
325
		return parent;
324
	}
326
	}
325
    
327
    
(-)ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskInputDialog.java (+1 lines)
Lines 131-136 Link Here
131
		
131
		
132
		fNameDialogField.postSetFocusOnDialogField(parent.getDisplay());
132
		fNameDialogField.postSetFocusOnDialogField(parent.getDisplay());
133
		
133
		
134
		applyDialogFont(composite);		
134
		return composite;
135
		return composite;
135
	}
136
	}
136
		
137
		
(-)ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPreferencePage.java (-1 / +4 lines)
Lines 15-20 Link Here
15
import org.eclipse.swt.widgets.Composite;
15
import org.eclipse.swt.widgets.Composite;
16
import org.eclipse.swt.widgets.Control;
16
import org.eclipse.swt.widgets.Control;
17
17
18
import org.eclipse.jface.dialogs.Dialog;
18
import org.eclipse.jface.preference.PreferencePage;
19
import org.eclipse.jface.preference.PreferencePage;
19
20
20
import org.eclipse.ui.IWorkbench;
21
import org.eclipse.ui.IWorkbench;
Lines 64-70 Link Here
64
	 * @see PreferencePage#createContents(Composite)
65
	 * @see PreferencePage#createContents(Composite)
65
	 */
66
	 */
66
	protected Control createContents(Composite parent) {
67
	protected Control createContents(Composite parent) {
67
		return fConfigurationBlock.createContents(parent);
68
		Control result= fConfigurationBlock.createContents(parent);
69
		Dialog.applyDialogFont(result);
70
		return result;
68
	}
71
	}
69
72
70
	/*
73
	/*
(-)ui/org/eclipse/jdt/internal/ui/preferences/TodoTaskPropertyPage.java (+2 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.Control;
20
import org.eclipse.swt.widgets.Control;
21
21
22
import org.eclipse.jface.dialogs.ControlEnableState;
22
import org.eclipse.jface.dialogs.ControlEnableState;
23
import org.eclipse.jface.dialogs.Dialog;
23
import org.eclipse.jface.preference.IPreferenceNode;
24
import org.eclipse.jface.preference.IPreferenceNode;
24
import org.eclipse.jface.preference.IPreferencePage;
25
import org.eclipse.jface.preference.IPreferencePage;
25
import org.eclipse.jface.preference.PreferenceDialog;
26
import org.eclipse.jface.preference.PreferenceDialog;
Lines 130-135 Link Here
130
		fUseWorkspaceSettings.setSelection(!useProjectSettings);
131
		fUseWorkspaceSettings.setSelection(!useProjectSettings);
131
		
132
		
132
		updateEnableState();
133
		updateEnableState();
134
		Dialog.applyDialogFont(composite);
133
		return composite;
135
		return composite;
134
	}
136
	}
135
	
137
	
(-)ui/org/eclipse/jdt/internal/ui/reorg/JdtMoveAction.java (+1 lines)
Lines 316-321 Link Here
316
			Composite result= (Composite)super.createDialogArea(parent);
316
			Composite result= (Composite)super.createDialogArea(parent);
317
			addUpdateReferenceComponent(result);
317
			addUpdateReferenceComponent(result);
318
			addUpdateQualifiedNameComponent(result, ((GridLayout)result.getLayout()).marginWidth);
318
			addUpdateQualifiedNameComponent(result, ((GridLayout)result.getLayout()).marginWidth);
319
			applyDialogFont(result);		
319
			return result;
320
			return result;
320
		}
321
		}
321
322
(-)ui/org/eclipse/jdt/internal/ui/search/JavaSearchPage.java (+2 lines)
Lines 35-40 Link Here
35
import org.eclipse.swt.widgets.Label;
35
import org.eclipse.swt.widgets.Label;
36
import org.eclipse.swt.widgets.Shell;
36
import org.eclipse.swt.widgets.Shell;
37
37
38
import org.eclipse.jface.dialogs.Dialog;
38
import org.eclipse.jface.dialogs.DialogPage;
39
import org.eclipse.jface.dialogs.DialogPage;
39
import org.eclipse.jface.dialogs.IDialogSettings;
40
import org.eclipse.jface.dialogs.IDialogSettings;
40
import org.eclipse.jface.text.ITextSelection;
41
import org.eclipse.jface.text.ITextSelection;
Lines 361-366 Link Here
361
362
362
		setControl(result);
363
		setControl(result);
363
364
365
		Dialog.applyDialogFont(result);
364
		WorkbenchHelp.setHelp(result, IJavaHelpContextIds.JAVA_SEARCH_PAGE);	
366
		WorkbenchHelp.setHelp(result, IJavaHelpContextIds.JAVA_SEARCH_PAGE);	
365
	}
367
	}
366
368
(-)ui/org/eclipse/jdt/internal/ui/typehierarchy/HistoryListAction.java (+1 lines)
Lines 102-107 Link Here
102
			LayoutUtil.setHeigthHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12));
102
			LayoutUtil.setHeigthHint(fHistoryList.getListControl(null), convertHeightInCharsToPixels(12));
103
			LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null));
103
			LayoutUtil.setHorizontalGrabbing(fHistoryList.getListControl(null));
104
104
105
			applyDialogFont(composite);		
105
			return composite;
106
			return composite;
106
		}
107
		}
107
108
(-)ui/org/eclipse/jdt/internal/ui/util/SWTUtil.java (+7 lines)
Lines 26-31 Link Here
26
import org.eclipse.swt.widgets.Widget;
26
import org.eclipse.swt.widgets.Widget;
27
27
28
import org.eclipse.jface.dialogs.IDialogConstants;
28
import org.eclipse.jface.dialogs.IDialogConstants;
29
import org.eclipse.jface.resource.JFaceResources;
29
import org.eclipse.jface.util.Assert;
30
import org.eclipse.jface.util.Assert;
30
31
31
/**
32
/**
Lines 74-79 Link Here
74
	 * Returns a width hint for a button control.
75
	 * Returns a width hint for a button control.
75
	 */
76
	 */
76
	public static int getButtonWidthHint(Button button) {
77
	public static int getButtonWidthHint(Button button) {
78
		if (button.getFont().equals(JFaceResources.getDefaultFont()))
79
			button.setFont(JFaceResources.getDialogFont());
77
		PixelConverter converter= new PixelConverter(button);
80
		PixelConverter converter= new PixelConverter(button);
78
		int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
81
		int widthHint= converter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
79
		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
82
		return Math.max(widthHint, button.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
Lines 83-88 Link Here
83
	 * Returns a height hint for a button control.
86
	 * Returns a height hint for a button control.
84
	 */		
87
	 */		
85
	public static int getButtonHeigthHint(Button button) {
88
	public static int getButtonHeigthHint(Button button) {
89
		if (button.getFont().equals(JFaceResources.getDefaultFont()))
90
			button.setFont(JFaceResources.getDialogFont());
86
		PixelConverter converter= new PixelConverter(button);
91
		PixelConverter converter= new PixelConverter(button);
87
		return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
92
		return converter.convertVerticalDLUsToPixels(IDialogConstants.BUTTON_HEIGHT);
88
	}	
93
	}	
Lines 105-110 Link Here
105
	}
110
	}
106
	
111
	
107
	public static int getTableHeightHint(Table table, int rows) {
112
	public static int getTableHeightHint(Table table, int rows) {
113
		if (table.getFont().equals(JFaceResources.getDefaultFont()))
114
			table.setFont(JFaceResources.getDialogFont());
108
		int result= table.getItemHeight() * rows + table.getHeaderHeight();
115
		int result= table.getItemHeight() * rows + table.getHeaderHeight();
109
		if (table.getLinesVisible())
116
		if (table.getLinesVisible())
110
			result+= table.getGridLineWidth() * (rows - 1);
117
			result+= table.getGridLineWidth() * (rows - 1);
(-)ui/org/eclipse/jdt/internal/ui/wizards/NewSourceFolderWizardPage.java (+2 lines)
Lines 31-36 Link Here
31
import org.eclipse.swt.layout.GridLayout;
31
import org.eclipse.swt.layout.GridLayout;
32
import org.eclipse.swt.widgets.Composite;
32
import org.eclipse.swt.widgets.Composite;
33
33
34
import org.eclipse.jface.dialogs.Dialog;
34
import org.eclipse.jface.viewers.ILabelProvider;
35
import org.eclipse.jface.viewers.ILabelProvider;
35
import org.eclipse.jface.viewers.IStructuredSelection;
36
import org.eclipse.jface.viewers.IStructuredSelection;
36
import org.eclipse.jface.viewers.ITreeContentProvider;
37
import org.eclipse.jface.viewers.ITreeContentProvider;
Lines 208-213 Link Here
208
		LayoutUtil.setWidthHint(fRootDialogField.getTextControl(null), maxFieldWidth);	
209
		LayoutUtil.setWidthHint(fRootDialogField.getTextControl(null), maxFieldWidth);	
209
			
210
			
210
		setControl(composite);
211
		setControl(composite);
212
		Dialog.applyDialogFont(composite);
211
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_PACKAGEROOT_WIZARD_PAGE);		
213
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_PACKAGEROOT_WIZARD_PAGE);		
212
	}
214
	}
213
	
215
	
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/BuildPathsBlock.java (+2 lines)
Lines 42-47 Link Here
42
import org.eclipse.swt.widgets.TabItem;
42
import org.eclipse.swt.widgets.TabItem;
43
import org.eclipse.swt.widgets.Widget;
43
import org.eclipse.swt.widgets.Widget;
44
44
45
import org.eclipse.jface.dialogs.Dialog;
45
import org.eclipse.jface.dialogs.IDialogConstants;
46
import org.eclipse.jface.dialogs.IDialogConstants;
46
import org.eclipse.jface.dialogs.MessageDialog;
47
import org.eclipse.jface.dialogs.MessageDialog;
47
import org.eclipse.jface.preference.IPreferenceStore;
48
import org.eclipse.jface.preference.IPreferenceStore;
Lines 250-255 Link Here
250
		});		
251
		});		
251
252
252
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.BUILD_PATH_BLOCK);				
253
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.BUILD_PATH_BLOCK);				
254
		Dialog.applyDialogFont(composite);
253
		return composite;
255
		return composite;
254
	}
256
	}
255
	
257
	
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerDefaultPage.java (+4 lines)
Lines 30-35 Link Here
30
import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
30
import org.eclipse.jdt.ui.wizards.NewElementWizardPage;
31
import org.eclipse.swt.SWT;
31
import org.eclipse.swt.SWT;
32
import org.eclipse.swt.widgets.Composite;
32
import org.eclipse.swt.widgets.Composite;
33
34
import org.eclipse.jface.dialogs.Dialog;
35
33
import org.eclipse.ui.help.WorkbenchHelp;
36
import org.eclipse.ui.help.WorkbenchHelp;
34
37
35
/**
38
/**
Lines 90-95 Link Here
90
		fEntryField.setFocus();
93
		fEntryField.setFocus();
91
		
94
		
92
		setControl(composite);
95
		setControl(composite);
96
		Dialog.applyDialogFont(composite);
93
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.CLASSPATH_CONTAINER_DEFAULT_PAGE);
97
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.CLASSPATH_CONTAINER_DEFAULT_PAGE);
94
	}
98
	}
95
99
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ClasspathContainerSelectionPage.java (+2 lines)
Lines 15-20 Link Here
15
import org.eclipse.swt.SWT;
15
import org.eclipse.swt.SWT;
16
import org.eclipse.swt.widgets.Composite;
16
import org.eclipse.swt.widgets.Composite;
17
17
18
import org.eclipse.jface.dialogs.Dialog;
18
import org.eclipse.jface.dialogs.IDialogSettings;
19
import org.eclipse.jface.dialogs.IDialogSettings;
19
import org.eclipse.jface.viewers.DoubleClickEvent;
20
import org.eclipse.jface.viewers.DoubleClickEvent;
20
import org.eclipse.jface.viewers.IDoubleClickListener;
21
import org.eclipse.jface.viewers.IDoubleClickListener;
Lines 101-106 Link Here
101
		fListViewer.getList().select(selectionIndex);
102
		fListViewer.getList().select(selectionIndex);
102
		validatePage();
103
		validatePage();
103
		setControl(fListViewer.getList());
104
		setControl(fListViewer.getList());
105
		Dialog.applyDialogFont(fListViewer.getList());
104
	}
106
	}
105
107
106
	/**
108
	/**
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/EditVariableEntryDialog.java (+1 lines)
Lines 112-117 Link Here
112
		fFileNameField.postSetFocusOnDialogField(parent.getDisplay());
112
		fFileNameField.postSetFocusOnDialogField(parent.getDisplay());
113
				
113
				
114
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.SOURCE_ATTACHMENT_BLOCK);
114
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.SOURCE_ATTACHMENT_BLOCK);
115
		applyDialogFont(composite);		
115
		return composite;
116
		return composite;
116
	}
117
	}
117
118
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternDialog.java (+1 lines)
Lines 138-143 Link Here
138
		fExclusionPatternList.doFillIntoGrid(inner, 3);
138
		fExclusionPatternList.doFillIntoGrid(inner, 3);
139
		LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2);
139
		LayoutUtil.setHorizontalSpan(fExclusionPatternList.getLabelControl(null), 2);
140
		
140
		
141
		applyDialogFont(composite);		
141
		return composite;
142
		return composite;
142
	}
143
	}
143
	
144
	
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/ExclusionPatternEntryDialog.java (+1 lines)
Lines 123-128 Link Here
123
		LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null));
123
		LayoutUtil.setHorizontalGrabbing(fExclusionPatternDialog.getTextControl(null));
124
				
124
				
125
		fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay());
125
		fExclusionPatternDialog.postSetFocusOnDialogField(parent.getDisplay());
126
		applyDialogFont(composite);		
126
		return composite;
127
		return composite;
127
	}
128
	}
128
129
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/FolderSelectionDialog.java (+1 lines)
Lines 67-72 Link Here
67
		button.setLayoutData(data);
67
		button.setLayoutData(data);
68
		fNewFolderButton= button;
68
		fNewFolderButton= button;
69
		
69
		
70
		applyDialogFont(result);		
70
		return result;
71
		return result;
71
	}
72
	}
72
73
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/LibrariesWorkbookPage.java (+1 lines)
Lines 751-756 Link Here
751
			Composite composite= (Composite) super.createDialogArea(parent);
751
			Composite composite= (Composite) super.createDialogArea(parent);
752
			Control inner= fJavadocConfigurationBlock.createContents(composite);
752
			Control inner= fJavadocConfigurationBlock.createContents(composite);
753
			inner.setLayoutData(new GridData(GridData.FILL_BOTH));
753
			inner.setLayoutData(new GridData(GridData.FILL_BOTH));
754
			applyDialogFont(composite);		
754
			return composite;
755
			return composite;
755
		}
756
		}
756
757
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewContainerDialog.java (+1 lines)
Lines 88-93 Link Here
88
		LayoutUtil.setHorizontalGrabbing(fContainerDialogField.getTextControl(null));
88
		LayoutUtil.setHorizontalGrabbing(fContainerDialogField.getTextControl(null));
89
				
89
				
90
		fContainerDialogField.postSetFocusOnDialogField(parent.getDisplay());
90
		fContainerDialogField.postSetFocusOnDialogField(parent.getDisplay());
91
		applyDialogFont(composite);		
91
		return composite;
92
		return composite;
92
	}
93
	}
93
94
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewSourceFolderDialog.java (+1 lines)
Lines 121-126 Link Here
121
		control.setLayoutData(data);	
121
		control.setLayoutData(data);	
122
				
122
				
123
		fContainerDialogField.postSetFocusOnDialogField(parent.getDisplay());
123
		fContainerDialogField.postSetFocusOnDialogField(parent.getDisplay());
124
		applyDialogFont(composite);		
124
		return composite;
125
		return composite;
125
	}
126
	}
126
127
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/NewVariableEntryDialog.java (+1 lines)
Lines 169-174 Link Here
169
		listData.grabExcessHorizontalSpace= true;
169
		listData.grabExcessHorizontalSpace= true;
170
		listData.heightHint= convertHeightInCharsToPixels(10);
170
		listData.heightHint= convertHeightInCharsToPixels(10);
171
		
171
		
172
		applyDialogFont(composite);		
172
		return composite;
173
		return composite;
173
	}
174
	}
174
	
175
	
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/OutputLocationDialog.java (+1 lines)
Lines 127-132 Link Here
127
		buttonData.heightHint= SWTUtil.getButtonHeigthHint(buttonControl);
127
		buttonData.heightHint= SWTUtil.getButtonHeigthHint(buttonControl);
128
		buttonControl.setLayoutData(buttonData);
128
		buttonControl.setLayoutData(buttonData);
129
		
129
		
130
		applyDialogFont(composite);		
130
		return composite;
131
		return composite;
131
	}
132
	}
132
133
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/SourceAttachmentDialog.java (+1 lines)
Lines 96-101 Link Here
96
			
96
			
97
		Control inner= createSourceAttachmentControls(composite);
97
		Control inner= createSourceAttachmentControls(composite);
98
		inner.setLayoutData(new GridData(GridData.FILL_BOTH));			
98
		inner.setLayoutData(new GridData(GridData.FILL_BOTH));			
99
		applyDialogFont(composite);		
99
		return composite;
100
		return composite;
100
	}
101
	}
101
102
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariableCreationDialog.java (+1 lines)
Lines 147-152 Link Here
147
		
147
		
148
		DialogField focusField= (fElement == null) ? fNameField : fPathField;
148
		DialogField focusField= (fElement == null) ? fNameField : fPathField;
149
		focusField.postSetFocusOnDialogField(parent.getDisplay());
149
		focusField.postSetFocusOnDialogField(parent.getDisplay());
150
		applyDialogFont(composite);		
150
		return composite;
151
		return composite;
151
	}
152
	}
152
153
(-)ui/org/eclipse/jdt/internal/ui/wizards/buildpaths/VariablePathDialogField.java (+1 lines)
Lines 67-72 Link Here
67
			
67
			
68
			fVariableBlock.addDoubleClickListener(this);
68
			fVariableBlock.addDoubleClickListener(this);
69
			fVariableBlock.addSelectionChangedListener(this);
69
			fVariableBlock.addSelectionChangedListener(this);
70
			applyDialogFont(composite);		
70
			return composite;
71
			return composite;
71
		}
72
		}
72
73
(-)ui/org/eclipse/jdt/internal/ui/wizards/dialogfields/StringButtonStatusDialogField.java (+3 lines)
Lines 21-26 Link Here
21
21
22
import org.eclipse.swt.layout.GridData;
22
import org.eclipse.swt.layout.GridData;
23
23
24
import org.eclipse.jface.resource.JFaceResources;
25
24
/**
26
/**
25
 * Dialog field containing a label, text control, status label and a button control.
27
 * Dialog field containing a label, text control, status label and a button control.
26
 * The status label can be either a image or text label, and can be usd to give
28
 * The status label can be either a image or text label, and can be usd to give
Lines 119-124 Link Here
119
		gd.horizontalIndent= 0;
121
		gd.horizontalIndent= 0;
120
		if (fWidthHintString != null) {
122
		if (fWidthHintString != null) {
121
			GC gc= new GC(aControl);
123
			GC gc= new GC(aControl);
124
			gc.setFont(JFaceResources.getDialogFont());
122
			gd.widthHint= gc.textExtent(fWidthHintString).x;
125
			gd.widthHint= gc.textExtent(fWidthHintString).x;
123
			gc.dispose();
126
			gc.dispose();
124
		} else if (fWidthHint != -1) {
127
		} else if (fWidthHint != -1) {
(-)ui/org/eclipse/jdt/internal/ui/workingsets/JavaWorkingSetPage.java (+2 lines)
Lines 30-35 Link Here
30
import org.eclipse.swt.widgets.Text;
30
import org.eclipse.swt.widgets.Text;
31
import org.eclipse.swt.widgets.TreeItem;
31
import org.eclipse.swt.widgets.TreeItem;
32
32
33
import org.eclipse.jface.dialogs.Dialog;
33
import org.eclipse.jface.dialogs.MessageDialog;
34
import org.eclipse.jface.dialogs.MessageDialog;
34
import org.eclipse.jface.util.Assert;
35
import org.eclipse.jface.util.Assert;
35
import org.eclipse.jface.viewers.CheckStateChangedEvent;
36
import org.eclipse.jface.viewers.CheckStateChangedEvent;
Lines 171-176 Link Here
171
		disableClosedProjects();
172
		disableClosedProjects();
172
		validateInput();
173
		validateInput();
173
174
175
		Dialog.applyDialogFont(composite);
174
		// Set help for the page 
176
		// Set help for the page 
175
		JavaUIHelp.setHelp(fTree, IJavaHelpContextIds.JAVA_WORKING_SET_PAGE);
177
		JavaUIHelp.setHelp(fTree, IJavaHelpContextIds.JAVA_WORKING_SET_PAGE);
176
	}
178
	}
(-)ui/org/eclipse/jdt/ui/actions/FindStringsToExternalizeAction.java (+1 lines)
Lines 361-366 Link Here
361
				}
361
				}
362
			});
362
			});
363
			getTableViewer().getTable().setFocus();
363
			getTableViewer().getTable().setFocus();
364
			applyDialogFont(result);		
364
			return result;
365
			return result;
365
		}
366
		}
366
		
367
		
(-)ui/org/eclipse/jdt/ui/wizards/JavaCapabilityConfigurationPage.java (-1 / +2 lines)
Lines 23-28 Link Here
23
import org.eclipse.swt.widgets.Composite;
23
import org.eclipse.swt.widgets.Composite;
24
import org.eclipse.swt.widgets.Control;
24
import org.eclipse.swt.widgets.Control;
25
25
26
import org.eclipse.jface.dialogs.Dialog;
26
import org.eclipse.jface.operation.IRunnableWithProgress;
27
import org.eclipse.jface.operation.IRunnableWithProgress;
27
28
28
import org.eclipse.ui.help.WorkbenchHelp;
29
import org.eclipse.ui.help.WorkbenchHelp;
Lines 111-117 Link Here
111
	public void createControl(Composite parent) {
112
	public void createControl(Composite parent) {
112
		Control control= fBuildPathsBlock.createControl(parent);
113
		Control control= fBuildPathsBlock.createControl(parent);
113
		setControl(control);
114
		setControl(control);
114
		
115
		Dialog.applyDialogFont(control);
115
		WorkbenchHelp.setHelp(control, IJavaHelpContextIds.NEW_JAVAPROJECT_WIZARD_PAGE);
116
		WorkbenchHelp.setHelp(control, IJavaHelpContextIds.NEW_JAVAPROJECT_WIZARD_PAGE);
116
	}
117
	}
117
		
118
		
(-)ui/org/eclipse/jdt/ui/wizards/NewClassWizardPage.java (+2 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.Composite;
20
import org.eclipse.swt.widgets.Composite;
21
import org.eclipse.swt.widgets.Control;
21
import org.eclipse.swt.widgets.Control;
22
22
23
import org.eclipse.jface.dialogs.Dialog;
23
import org.eclipse.jface.dialogs.IDialogSettings;
24
import org.eclipse.jface.dialogs.IDialogSettings;
24
import org.eclipse.jface.viewers.IStructuredSelection;
25
import org.eclipse.jface.viewers.IStructuredSelection;
25
26
Lines 159-164 Link Here
159
		
160
		
160
		setControl(composite);
161
		setControl(composite);
161
			
162
			
163
		Dialog.applyDialogFont(composite);
162
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_CLASS_WIZARD_PAGE);	
164
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_CLASS_WIZARD_PAGE);	
163
	}
165
	}
164
	
166
	
(-)ui/org/eclipse/jdt/ui/wizards/NewInterfaceWizardPage.java (+2 lines)
Lines 16-21 Link Here
16
import org.eclipse.swt.layout.GridLayout;
16
import org.eclipse.swt.layout.GridLayout;
17
import org.eclipse.swt.widgets.Composite;
17
import org.eclipse.swt.widgets.Composite;
18
18
19
import org.eclipse.jface.dialogs.Dialog;
19
import org.eclipse.jface.viewers.IStructuredSelection;
20
import org.eclipse.jface.viewers.IStructuredSelection;
20
21
21
import org.eclipse.ui.help.WorkbenchHelp;
22
import org.eclipse.ui.help.WorkbenchHelp;
Lines 121-126 Link Here
121
						
122
						
122
		setControl(composite);
123
		setControl(composite);
123
		
124
		
125
		Dialog.applyDialogFont(composite);
124
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_INTERFACE_WIZARD_PAGE);		
126
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_INTERFACE_WIZARD_PAGE);		
125
	}
127
	}
126
128
(-)ui/org/eclipse/jdt/ui/wizards/NewJavaProjectWizardPage.java (+2 lines)
Lines 24-29 Link Here
24
import org.eclipse.swt.widgets.Composite;
24
import org.eclipse.swt.widgets.Composite;
25
import org.eclipse.swt.widgets.Control;
25
import org.eclipse.swt.widgets.Control;
26
26
27
import org.eclipse.jface.dialogs.Dialog;
27
import org.eclipse.jface.operation.IRunnableWithProgress;
28
import org.eclipse.jface.operation.IRunnableWithProgress;
28
import org.eclipse.jface.util.Assert;
29
import org.eclipse.jface.util.Assert;
29
30
Lines 197-202 Link Here
197
	public void createControl(Composite parent) {
198
	public void createControl(Composite parent) {
198
		Control control= fBuildPathsBlock.createControl(parent);
199
		Control control= fBuildPathsBlock.createControl(parent);
199
		setControl(control);
200
		setControl(control);
201
		Dialog.applyDialogFont(control);
200
		
202
		
201
		WorkbenchHelp.setHelp(control, IJavaHelpContextIds.NEW_JAVAPROJECT_WIZARD_PAGE);
203
		WorkbenchHelp.setHelp(control, IJavaHelpContextIds.NEW_JAVAPROJECT_WIZARD_PAGE);
202
	}
204
	}
(-)ui/org/eclipse/jdt/ui/wizards/NewPackageWizardPage.java (+2 lines)
Lines 24-29 Link Here
24
import org.eclipse.swt.widgets.Composite;
24
import org.eclipse.swt.widgets.Composite;
25
import org.eclipse.swt.widgets.Label;
25
import org.eclipse.swt.widgets.Label;
26
26
27
import org.eclipse.jface.dialogs.Dialog;
27
import org.eclipse.jface.operation.IRunnableWithProgress;
28
import org.eclipse.jface.operation.IRunnableWithProgress;
28
import org.eclipse.jface.viewers.IStructuredSelection;
29
import org.eclipse.jface.viewers.IStructuredSelection;
29
30
Lines 141-146 Link Here
141
		createPackageControls(composite, nColumns);
142
		createPackageControls(composite, nColumns);
142
		
143
		
143
		setControl(composite);
144
		setControl(composite);
145
		Dialog.applyDialogFont(composite);
144
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_PACKAGE_WIZARD_PAGE);
146
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_PACKAGE_WIZARD_PAGE);
145
	}
147
	}
146
	
148
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeParametersControl.java (-1 / +3 lines)
Lines 227-234 Link Here
227
		}	
227
		}	
228
		
228
		
229
		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
229
		GridData gd= new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
230
		gd.heightHint= table.getHeaderHeight() + table.getGridLineWidth() * (ROW_COUNT + 1) + table.getItemHeight() * ROW_COUNT;
230
		gd.heightHint= SWTUtil.getTableHeightHint(table, ROW_COUNT);
231
		gd.widthHint= 40;
231
		gd.widthHint= 40;
232
		gd.verticalAlignment= GridData.BEGINNING;
233
		gd.grabExcessVerticalSpace= true;
232
		layouter.setLayoutData(gd);
234
		layouter.setLayoutData(gd);
233
235
234
		fTableViewer= new TableViewer(table);
236
		fTableViewer= new TableViewer(table);
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ChangeSignatureInputPage.java (-1 / +3 lines)
Lines 19-24 Link Here
19
import org.eclipse.swt.widgets.Label;
19
import org.eclipse.swt.widgets.Label;
20
import org.eclipse.swt.widgets.Text;
20
import org.eclipse.swt.widgets.Text;
21
21
22
import org.eclipse.jface.dialogs.Dialog;
23
22
import org.eclipse.ui.help.WorkbenchHelp;
24
import org.eclipse.ui.help.WorkbenchHelp;
23
25
24
import org.eclipse.jdt.core.JavaModelException;
26
import org.eclipse.jdt.core.JavaModelException;
Lines 29-35 Link Here
29
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
31
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
30
import org.eclipse.jdt.internal.ui.JavaPlugin;
32
import org.eclipse.jdt.internal.ui.JavaPlugin;
31
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
33
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
32
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
33
34
34
class ChangeSignatureInputPage extends UserInputWizardPage {
35
class ChangeSignatureInputPage extends UserInputWizardPage {
35
36
Lines 75-80 Link Here
75
            update(false);
76
            update(false);
76
            
77
            
77
            setControl(composite);
78
            setControl(composite);
79
            Dialog.applyDialogFont(composite);
78
        } catch (JavaModelException e) {
80
        } catch (JavaModelException e) {
79
        	ExceptionHandler.handle(e, RefactoringMessages.getString("ChangeSignatureInputPage.Change_Signature"), RefactoringMessages.getString("ChangeSignatureInputPage.Internal_Error")); //$NON-NLS-1$ //$NON-NLS-2$
81
        	ExceptionHandler.handle(e, RefactoringMessages.getString("ChangeSignatureInputPage.Change_Signature"), RefactoringMessages.getString("ChangeSignatureInputPage.Internal_Error")); //$NON-NLS-1$ //$NON-NLS-2$
80
        }
82
        }
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ComboSelectionDialog.java (+1 lines)
Lines 79-84 Link Here
79
				fSelection= combo.getItem(combo.getSelectionIndex());
79
				fSelection= combo.getItem(combo.getSelectionIndex());
80
			}
80
			}
81
		});
81
		});
82
		applyDialogFont(composite);		
82
		return composite;
83
		return composite;
83
	}
84
	}
84
	
85
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ConvertAnonymousToNestedInputPage.java (-1 / +3 lines)
Lines 22-32 Link Here
22
import org.eclipse.swt.widgets.Label;
22
import org.eclipse.swt.widgets.Label;
23
import org.eclipse.swt.widgets.Text;
23
import org.eclipse.swt.widgets.Text;
24
24
25
import org.eclipse.jface.dialogs.Dialog;
26
25
import org.eclipse.ui.help.WorkbenchHelp;
27
import org.eclipse.ui.help.WorkbenchHelp;
26
28
27
import org.eclipse.jdt.internal.corext.refactoring.code.ConvertAnonymousToNestedRefactoring;
29
import org.eclipse.jdt.internal.corext.refactoring.code.ConvertAnonymousToNestedRefactoring;
28
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
30
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
29
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
30
31
31
class ConvertAnonymousToNestedInputPage extends UserInputWizardPage {
32
class ConvertAnonymousToNestedInputPage extends UserInputWizardPage {
32
33
Lines 52-57 Link Here
52
		
53
		
53
		textField.setFocus();
54
		textField.setFocus();
54
		setPageComplete(false);
55
		setPageComplete(false);
56
		Dialog.applyDialogFont(result);
55
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.CONVERT_ANONYMOUS_TO_NESTED_WIZARD_PAGE);		
57
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.CONVERT_ANONYMOUS_TO_NESTED_WIZARD_PAGE);		
56
	}
58
	}
57
59
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ErrorWizardPage.java (+2 lines)
Lines 14-19 Link Here
14
import org.eclipse.swt.SWT;
14
import org.eclipse.swt.SWT;
15
import org.eclipse.swt.widgets.Composite;
15
import org.eclipse.swt.widgets.Composite;
16
16
17
import org.eclipse.jface.dialogs.Dialog;
17
import org.eclipse.jface.wizard.IWizardPage;
18
import org.eclipse.jface.wizard.IWizardPage;
18
19
19
import org.eclipse.ui.help.WorkbenchHelp;
20
import org.eclipse.ui.help.WorkbenchHelp;
Lines 72-77 Link Here
72
	public void createControl(Composite parent) {
73
	public void createControl(Composite parent) {
73
		initializeDialogUnits(parent);
74
		initializeDialogUnits(parent);
74
		setControl(fViewer= new RefactoringStatusViewer(parent, SWT.NONE));
75
		setControl(fViewer= new RefactoringStatusViewer(parent, SWT.NONE));
76
		Dialog.applyDialogFont(fViewer);
75
		WorkbenchHelp.setHelp(getControl(), fHelpContextID);			
77
		WorkbenchHelp.setHelp(getControl(), fHelpContextID);			
76
	}
78
	}
77
	
79
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractConstantInputPage.java (-1 / +2 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.Label;
20
import org.eclipse.swt.widgets.Label;
21
import org.eclipse.swt.widgets.Text;
21
import org.eclipse.swt.widgets.Text;
22
22
23
import org.eclipse.jface.dialogs.Dialog;
23
import org.eclipse.jface.dialogs.IMessageProvider;
24
import org.eclipse.jface.dialogs.IMessageProvider;
24
25
25
import org.eclipse.ui.help.WorkbenchHelp;
26
import org.eclipse.ui.help.WorkbenchHelp;
Lines 32-38 Link Here
32
import org.eclipse.jdt.internal.ui.JavaPlugin;
33
import org.eclipse.jdt.internal.ui.JavaPlugin;
33
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
34
import org.eclipse.jdt.internal.ui.util.ExceptionHandler;
34
import org.eclipse.jdt.internal.ui.util.RowLayouter;
35
import org.eclipse.jdt.internal.ui.util.RowLayouter;
35
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
36
36
37
class ExtractConstantInputPage extends TextInputWizardPage {
37
class ExtractConstantInputPage extends TextInputWizardPage {
38
38
Lines 74-79 Link Here
74
		
74
		
75
		validateTextField(text.getText());
75
		validateTextField(text.getText());
76
		
76
		
77
		Dialog.applyDialogFont(result);
77
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_CONSTANT_WIZARD_PAGE);		
78
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_CONSTANT_WIZARD_PAGE);		
78
	}
79
	}
79
	
80
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractInterfaceInputPage.java (+2 lines)
Lines 23-28 Link Here
23
import org.eclipse.swt.widgets.Label;
23
import org.eclipse.swt.widgets.Label;
24
import org.eclipse.swt.widgets.Text;
24
import org.eclipse.swt.widgets.Text;
25
25
26
import org.eclipse.jface.dialogs.Dialog;
26
import org.eclipse.jface.viewers.ArrayContentProvider;
27
import org.eclipse.jface.viewers.ArrayContentProvider;
27
import org.eclipse.jface.viewers.CheckboxTableViewer;
28
import org.eclipse.jface.viewers.CheckboxTableViewer;
28
import org.eclipse.jface.viewers.ILabelProvider;
29
import org.eclipse.jface.viewers.ILabelProvider;
Lines 80-85 Link Here
80
		gd.horizontalSpan= 2;
81
		gd.horizontalSpan= 2;
81
		tableLabel.setLayoutData(gd);
82
		tableLabel.setLayoutData(gd);
82
		
83
		
84
		Dialog.applyDialogFont(result);
83
		addMemberListComposite(result);
85
		addMemberListComposite(result);
84
	}
86
	}
85
87
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ExtractTempInputPage.java (+3 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.Label;
20
import org.eclipse.swt.widgets.Label;
21
import org.eclipse.swt.widgets.Text;
21
import org.eclipse.swt.widgets.Text;
22
22
23
import org.eclipse.jface.dialogs.Dialog;
24
23
import org.eclipse.ui.help.WorkbenchHelp;
25
import org.eclipse.ui.help.WorkbenchHelp;
24
26
25
import org.eclipse.jdt.core.JavaModelException;
27
import org.eclipse.jdt.core.JavaModelException;
Lines 66-71 Link Here
66
		
68
		
67
		validateTextField(text.getText());
69
		validateTextField(text.getText());
68
		
70
		
71
		Dialog.applyDialogFont(result);
69
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_TEMP_WIZARD_PAGE);		
72
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_TEMP_WIZARD_PAGE);		
70
	}
73
	}
71
	
74
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineConstantInputPage.java (-2 / +3 lines)
Lines 19-27 Link Here
19
import org.eclipse.swt.widgets.Composite;
19
import org.eclipse.swt.widgets.Composite;
20
import org.eclipse.swt.widgets.Group;
20
import org.eclipse.swt.widgets.Group;
21
21
22
import org.eclipse.jface.dialogs.Dialog;
23
22
import org.eclipse.jdt.internal.corext.refactoring.code.InlineConstantRefactoring;
24
import org.eclipse.jdt.internal.corext.refactoring.code.InlineConstantRefactoring;
23
import org.eclipse.jdt.internal.ui.refactoring.UserInputWizardPage;
24
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
25
25
26
class InlineConstantInputPage extends UserInputWizardPage {
26
class InlineConstantInputPage extends UserInputWizardPage {
27
27
Lines 98-103 Link Here
98
				fRefactoring.setReplaceAllReferences(false);
98
				fRefactoring.setReplaceAllReferences(false);
99
			}
99
			}
100
		});		
100
		});		
101
		Dialog.applyDialogFont(result);
101
	}
102
	}
102
103
103
	/*
104
	/*
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/InlineTempInputPage.java (+3 lines)
Lines 16-21 Link Here
16
import org.eclipse.swt.widgets.Composite;
16
import org.eclipse.swt.widgets.Composite;
17
import org.eclipse.swt.widgets.Label;
17
import org.eclipse.swt.widgets.Label;
18
18
19
import org.eclipse.jface.dialogs.Dialog;
20
19
import org.eclipse.jdt.internal.corext.refactoring.code.InlineTempRefactoring;
21
import org.eclipse.jdt.internal.corext.refactoring.code.InlineTempRefactoring;
20
22
21
public class InlineTempInputPage extends UserInputWizardPage {
23
public class InlineTempInputPage extends UserInputWizardPage {
Lines 50-54 Link Here
50
		}
52
		}
51
		
53
		
52
		label.setText(message);
54
		label.setText(message);
55
		Dialog.applyDialogFont(result);
53
	}
56
	}
54
}
57
}
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInnerToToplnputPage.java (-1 / +3 lines)
Lines 20-31 Link Here
20
import org.eclipse.swt.widgets.Label;
20
import org.eclipse.swt.widgets.Label;
21
import org.eclipse.swt.widgets.Text;
21
import org.eclipse.swt.widgets.Text;
22
22
23
import org.eclipse.jface.dialogs.Dialog;
24
23
import org.eclipse.ui.help.WorkbenchHelp;
25
import org.eclipse.ui.help.WorkbenchHelp;
24
26
25
import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus;
27
import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus;
26
import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInnerToTopRefactoring;
28
import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInnerToTopRefactoring;
27
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
29
import org.eclipse.jdt.internal.ui.IJavaHelpContextIds;
28
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
29
30
30
class MoveInnerToToplnputPage extends TextInputWizardPage{
31
class MoveInnerToToplnputPage extends TextInputWizardPage{
31
32
Lines 66-71 Link Here
66
				getMoveRefactoring().setMarkInstanceFieldAsFinal(finalCheckBox.getSelection());
67
				getMoveRefactoring().setMarkInstanceFieldAsFinal(finalCheckBox.getSelection());
67
			}
68
			}
68
		});
69
		});
70
		Dialog.applyDialogFont(newControl);
69
	}
71
	}
70
72
71
	/*
73
	/*
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveInstanceMethodInputPage.java (-1 / +2 lines)
Lines 23-28 Link Here
23
import org.eclipse.swt.widgets.TableColumn;
23
import org.eclipse.swt.widgets.TableColumn;
24
import org.eclipse.swt.widgets.Text;
24
import org.eclipse.swt.widgets.Text;
25
25
26
import org.eclipse.jface.dialogs.Dialog;
26
import org.eclipse.jface.viewers.ArrayContentProvider;
27
import org.eclipse.jface.viewers.ArrayContentProvider;
27
import org.eclipse.jface.viewers.ColumnWeightData;
28
import org.eclipse.jface.viewers.ColumnWeightData;
28
import org.eclipse.jface.viewers.ILabelProvider;
29
import org.eclipse.jface.viewers.ILabelProvider;
Lines 53-59 Link Here
53
import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus;
54
import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus;
54
import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring;
55
import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring;
55
import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring.INewReceiver;
56
import org.eclipse.jdt.internal.corext.refactoring.structure.MoveInstanceMethodRefactoring.INewReceiver;
56
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
57
57
58
class MoveInstanceMethodInputPage extends UserInputWizardPage {
58
class MoveInstanceMethodInputPage extends UserInputWizardPage {
59
59
Lines 137-142 Link Here
137
		createNewReceiverList(result);
137
		createNewReceiverList(result);
138
		createNewMethodNameField(result);
138
		createNewMethodNameField(result);
139
		createOriginalReceiverParameterNameField(result);
139
		createOriginalReceiverParameterNameField(result);
140
		Dialog.applyDialogFont(result);
140
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.MOVE_MEMBERS_WIZARD_PAGE);		
141
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.MOVE_MEMBERS_WIZARD_PAGE);		
141
	}
142
	}
142
	
143
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/MoveMembersInputPage.java (+1 lines)
Lines 96-101 Link Here
96
		
96
		
97
		setPageComplete(false);
97
		setPageComplete(false);
98
		setControl(composite);
98
		setControl(composite);
99
		Dialog.applyDialogFont(composite);
99
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.MOVE_MEMBERS_WIZARD_PAGE);
100
		WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.MOVE_MEMBERS_WIZARD_PAGE);
100
	}
101
	}
101
102
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/ParameterEditDialog.java (+1 lines)
Lines 114-119 Link Here
114
					}
114
					}
115
				});
115
				});
116
		}
116
		}
117
		applyDialogFont(result);		
117
		return result;
118
		return result;
118
	}
119
	}
119
	
120
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PreviewWizardPage.java (+3 lines)
Lines 26-31 Link Here
26
26
27
import org.eclipse.jface.action.Action;
27
import org.eclipse.jface.action.Action;
28
import org.eclipse.jface.action.ToolBarManager;
28
import org.eclipse.jface.action.ToolBarManager;
29
import org.eclipse.jface.dialogs.Dialog;
29
import org.eclipse.jface.dialogs.IDialogConstants;
30
import org.eclipse.jface.dialogs.IDialogConstants;
30
import org.eclipse.jface.viewers.CheckStateChangedEvent;
31
import org.eclipse.jface.viewers.CheckStateChangedEvent;
31
import org.eclipse.jface.viewers.ICheckStateListener;
32
import org.eclipse.jface.viewers.ICheckStateListener;
Lines 353-358 Link Here
353
		GridData gd= new GridData(GridData.FILL_BOTH);
354
		GridData gd= new GridData(GridData.FILL_BOTH);
354
		gd.widthHint= convertWidthInCharsToPixels(80);
355
		gd.widthHint= convertWidthInCharsToPixels(80);
355
		sashForm.setLayoutData(gd);
356
		sashForm.setLayoutData(gd);
357
		Dialog.applyDialogFont(result);
356
		return result;
358
		return result;
357
	}
359
	}
358
	
360
	
Lines 365-370 Link Here
365
		Label label= new Label(result, SWT.CENTER);
367
		Label label= new Label(result, SWT.CENTER);
366
		label.setText(RefactoringMessages.getString("PreviewWizardPage.no_source_code_change")); //$NON-NLS-1$
368
		label.setText(RefactoringMessages.getString("PreviewWizardPage.no_source_code_change")); //$NON-NLS-1$
367
		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
369
		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
370
		Dialog.applyDialogFont(result);
368
		return result;
371
		return result;
369
	}
372
	}
370
	
373
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PromoteTempInputPage.java (+3 lines)
Lines 23-28 Link Here
23
import org.eclipse.swt.widgets.Label;
23
import org.eclipse.swt.widgets.Label;
24
import org.eclipse.swt.widgets.Text;
24
import org.eclipse.swt.widgets.Text;
25
25
26
import org.eclipse.jface.dialogs.Dialog;
27
26
import org.eclipse.ui.help.WorkbenchHelp;
28
import org.eclipse.ui.help.WorkbenchHelp;
27
29
28
import org.eclipse.jdt.internal.corext.Assert;
30
import org.eclipse.jdt.internal.corext.Assert;
Lines 65-70 Link Here
65
        addDeclareStaticCheckbox(result);
67
        addDeclareStaticCheckbox(result);
66
        addDeclareFinalCheckbox(result);
68
        addDeclareFinalCheckbox(result);
67
				
69
				
70
		Dialog.applyDialogFont(result);
68
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PROMOTE_TEMP_TO_FIELD_WIZARD_PAGE);		
71
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PROMOTE_TEMP_TO_FIELD_WIZARD_PAGE);		
69
	}
72
	}
70
73
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage1.java (+3 lines)
Lines 318-323 Link Here
318
		createStatusLine(composite);
318
		createStatusLine(composite);
319
				
319
				
320
		setControl(composite);
320
		setControl(composite);
321
		Dialog.applyDialogFont(composite);
321
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PULL_UP_WIZARD_PAGE);			
322
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PULL_UP_WIZARD_PAGE);			
322
	}
323
	}
323
	
324
	
Lines 418-423 Link Here
418
		
419
		
419
		fEditButton= new Button(composite, SWT.PUSH);
420
		fEditButton= new Button(composite, SWT.PUSH);
420
		fEditButton.setText(RefactoringMessages.getString("PullUpInputPage1.Edit")); //$NON-NLS-1$
421
		fEditButton.setText(RefactoringMessages.getString("PullUpInputPage1.Edit")); //$NON-NLS-1$
422
		
423
		GridData gd= new GridData();
421
		fEditButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
424
		fEditButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
422
		fEditButton.setEnabled(false);
425
		fEditButton.setEnabled(false);
423
		SWTUtil.setButtonDimensionHint(fEditButton);
426
		SWTUtil.setButtonDimensionHint(fEditButton);
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PullUpInputPage2.java (-8 / +12 lines)
Lines 34-41 Link Here
34
import org.eclipse.swt.widgets.Label;
34
import org.eclipse.swt.widgets.Label;
35
import org.eclipse.swt.widgets.Tree;
35
import org.eclipse.swt.widgets.Tree;
36
36
37
import org.eclipse.jface.dialogs.Dialog;
37
import org.eclipse.jface.dialogs.IMessageProvider;
38
import org.eclipse.jface.dialogs.IMessageProvider;
38
import org.eclipse.jface.operation.IRunnableWithProgress;
39
import org.eclipse.jface.operation.IRunnableWithProgress;
40
import org.eclipse.jface.resource.JFaceResources;
39
import org.eclipse.jface.text.Document;
41
import org.eclipse.jface.text.Document;
40
import org.eclipse.jface.text.IDocument;
42
import org.eclipse.jface.text.IDocument;
41
import org.eclipse.jface.text.IDocumentPartitioner;
43
import org.eclipse.jface.text.IDocumentPartitioner;
Lines 62-67 Link Here
62
64
63
import org.eclipse.jdt.ui.JavaElementLabelProvider;
65
import org.eclipse.jdt.ui.JavaElementLabelProvider;
64
import org.eclipse.jdt.ui.JavaElementSorter;
66
import org.eclipse.jdt.ui.JavaElementSorter;
67
import org.eclipse.jdt.ui.PreferenceConstants;
65
import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
68
import org.eclipse.jdt.ui.text.JavaSourceViewerConfiguration;
66
import org.eclipse.jdt.ui.text.JavaTextTools;
69
import org.eclipse.jdt.ui.text.JavaTextTools;
67
70
Lines 73-79 Link Here
73
import org.eclipse.jdt.internal.corext.Assert;
76
import org.eclipse.jdt.internal.corext.Assert;
74
import org.eclipse.jdt.internal.corext.refactoring.structure.PullUpRefactoring;
77
import org.eclipse.jdt.internal.corext.refactoring.structure.PullUpRefactoring;
75
import org.eclipse.jdt.internal.corext.refactoring.util.JavaElementUtil;
78
import org.eclipse.jdt.internal.corext.refactoring.util.JavaElementUtil;
76
import org.eclipse.jdt.internal.ui.refactoring.RefactoringMessages;
77
79
78
class PullUpInputPage2 extends UserInputWizardPage {
80
class PullUpInputPage2 extends UserInputWizardPage {
79
81
Lines 242-255 Link Here
242
   * @see IDialogPage#createControl(Composite)
244
   * @see IDialogPage#createControl(Composite)
243
   */
245
   */
244
  public void createControl(Composite parent) {
246
  public void createControl(Composite parent) {
245
	  Composite composite= new Composite(parent, SWT.NONE);
247
  	Composite composite= new Composite(parent, SWT.NONE);
246
	  composite.setLayout(new GridLayout());
248
	composite.setLayout(new GridLayout());
247
		
249
		
248
	  createTreeAndSourceViewer(composite);
250
	createTreeAndSourceViewer(composite);
249
	  createButtonComposite(composite);
251
	createButtonComposite(composite);
250
	  setControl(composite);
252
	setControl(composite);
251
		
253
		
252
	  WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PULL_UP_WIZARD_PAGE);			
254
	Dialog.applyDialogFont(composite);
255
	WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PULL_UP_WIZARD_PAGE);			
253
  }
256
  }
254
257
255
	private void createButtonComposite(Composite superComposite) {
258
	private void createButtonComposite(Composite superComposite) {
Lines 405-411 Link Here
405
		  fSourceViewer= new SourceViewer(c, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION);
408
		  fSourceViewer= new SourceViewer(c, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION);
406
		  fSourceViewer.configure(new JavaSourceViewerConfiguration(getJavaTextTools(), null));
409
		  fSourceViewer.configure(new JavaSourceViewerConfiguration(getJavaTextTools(), null));
407
		  fSourceViewer.setEditable(false);
410
		  fSourceViewer.setEditable(false);
408
		  fSourceViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));			
411
		  fSourceViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
412
		  fSourceViewer.getControl().setFont(JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT));			
409
	}
413
	}
410
	
414
	
411
	private void createSourceViewerLabel(Composite c) {
415
	private void createSourceViewerLabel(Composite c) {
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/PushDownInputPage.java (+1 lines)
Lines 201-206 Link Here
201
		createStatusLine(composite);
201
		createStatusLine(composite);
202
		
202
		
203
		setControl(composite);
203
		setControl(composite);
204
		Dialog.applyDialogFont(composite);
204
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PUSH_DOWN_WIZARD_PAGE);
205
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.PUSH_DOWN_WIZARD_PAGE);
205
	}
206
	}
206
207
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringSaveHelper.java (+1 lines)
Lines 97-102 Link Here
97
						RefactoringPreferences.setSaveAllEditors(check.getSelection());
97
						RefactoringPreferences.setSaveAllEditors(check.getSelection());
98
					}
98
					}
99
				});
99
				});
100
				applyDialogFont(result);		
100
				return result;
101
				return result;
101
			}
102
			}
102
		};
103
		};
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringStatusDialog.java (+1 lines)
Lines 77-82 Link Here
77
		RefactoringStatusViewer viewer= new RefactoringStatusViewer(result, SWT.NONE);
77
		RefactoringStatusViewer viewer= new RefactoringStatusViewer(result, SWT.NONE);
78
		viewer.setLayoutData(new GridData(GridData.FILL_BOTH));
78
		viewer.setLayoutData(new GridData(GridData.FILL_BOTH));
79
		viewer.setStatus(fStatus);
79
		viewer.setStatus(fStatus);
80
		applyDialogFont(result);
80
		return result;
81
		return result;
81
	}
82
	}
82
	protected void buttonPressed(int buttonId) {
83
	protected void buttonPressed(int buttonId) {
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RefactoringWizardDialog2.java (+1 lines)
Lines 510-515 Link Here
510
				
510
				
511
		updateMessage();
511
		updateMessage();
512
		updateButtons();
512
		updateButtons();
513
		applyDialogFont(result);		
513
		return result;
514
		return result;
514
	}
515
	}
515
	
516
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameFieldInputWizardPage.java (+3 lines)
Lines 20-25 Link Here
20
import org.eclipse.swt.widgets.Composite;
20
import org.eclipse.swt.widgets.Composite;
21
import org.eclipse.swt.widgets.Label;
21
import org.eclipse.swt.widgets.Label;
22
22
23
import org.eclipse.jface.dialogs.Dialog;
24
23
import org.eclipse.jdt.core.IMethod;
25
import org.eclipse.jdt.core.IMethod;
24
import org.eclipse.jdt.core.JavaModelException;
26
import org.eclipse.jdt.core.JavaModelException;
25
27
Lines 76-81 Link Here
76
		});
78
		});
77
		
79
		
78
		updateGetterSetterLabels();
80
		updateGetterSetterLabels();
81
		Dialog.applyDialogFont(composite);
79
	}
82
	}
80
	private void getGetterSetterRenamingEnablement() {
83
	private void getGetterSetterRenamingEnablement() {
81
		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable(){
84
		BusyIndicator.showWhile(getShell().getDisplay(), new Runnable(){
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/RenameInputWizardPage.java (+1 lines)
Lines 82-87 Link Here
82
		addOptionalUpdateCommentsAndStringCheckboxes(composite, layouter);
82
		addOptionalUpdateCommentsAndStringCheckboxes(composite, layouter);
83
		addOptionalUpdateQualifiedNameComponent(composite, layouter, layout.marginWidth);
83
		addOptionalUpdateQualifiedNameComponent(composite, layouter, layout.marginWidth);
84
		
84
		
85
		Dialog.applyDialogFont(superComposite);
85
		WorkbenchHelp.setHelp(getControl(), fHelpContextID);
86
		WorkbenchHelp.setHelp(getControl(), fHelpContextID);
86
	}
87
	}
87
	
88
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/SourceContextViewer.java (+4 lines)
Lines 14-25 Link Here
14
import org.eclipse.swt.widgets.Composite;
14
import org.eclipse.swt.widgets.Composite;
15
import org.eclipse.swt.widgets.Control;
15
import org.eclipse.swt.widgets.Control;
16
16
17
import org.eclipse.jface.resource.JFaceResources;
17
import org.eclipse.jface.text.IDocument;
18
import org.eclipse.jface.text.IDocument;
18
import org.eclipse.jface.text.source.SourceViewer;
19
import org.eclipse.jface.text.source.SourceViewer;
19
import org.eclipse.jface.text.source.SourceViewerConfiguration;
20
import org.eclipse.jface.text.source.SourceViewerConfiguration;
20
21
21
import org.eclipse.jdt.core.ISourceRange;
22
import org.eclipse.jdt.core.ISourceRange;
22
23
24
import org.eclipse.jdt.ui.PreferenceConstants;
25
23
class SourceContextViewer  extends SourceViewer implements IErrorContextViewer {
26
class SourceContextViewer  extends SourceViewer implements IErrorContextViewer {
24
27
25
	public static class SourceContextInput {
28
	public static class SourceContextInput {
Lines 36-41 Link Here
36
	SourceContextViewer(Composite parent) {
39
	SourceContextViewer(Composite parent) {
37
		super(parent, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
40
		super(parent, null, SWT.V_SCROLL | SWT.H_SCROLL | SWT.MULTI | SWT.FULL_SELECTION);
38
		setEditable(false);
41
		setEditable(false);
42
		getControl().setFont(JFaceResources.getFont(PreferenceConstants.EDITOR_TEXT_FONT));
39
	}
43
	}
40
44
41
	/* non Java-doc
45
	/* non Java-doc
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/UseSupertypeInputPage.java (+2 lines)
Lines 22-27 Link Here
22
import org.eclipse.swt.widgets.Composite;
22
import org.eclipse.swt.widgets.Composite;
23
import org.eclipse.swt.widgets.Label;
23
import org.eclipse.swt.widgets.Label;
24
24
25
import org.eclipse.jface.dialogs.Dialog;
25
import org.eclipse.jface.dialogs.DialogPage;
26
import org.eclipse.jface.dialogs.DialogPage;
26
import org.eclipse.jface.viewers.ArrayContentProvider;
27
import org.eclipse.jface.viewers.ArrayContentProvider;
27
import org.eclipse.jface.viewers.ISelectionChangedListener;
28
import org.eclipse.jface.viewers.ISelectionChangedListener;
Lines 81-86 Link Here
81
		label.setLayoutData(new GridData());
82
		label.setLayoutData(new GridData());
82
		
83
		
83
		addTableComponent(composite);
84
		addTableComponent(composite);
85
		Dialog.applyDialogFont(composite);
84
	}
86
	}
85
87
86
	private void addTableComponent(Composite composite) {
88
	private void addTableComponent(Composite composite) {
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/ListDialog.java (+1 lines)
Lines 85-90 Link Here
85
		gd.heightHint= convertHeightInCharsToPixels(15);
85
		gd.heightHint= convertHeightInCharsToPixels(15);
86
		gd.widthHint= convertWidthInCharsToPixels(55);
86
		gd.widthHint= convertWidthInCharsToPixels(55);
87
		table.setLayoutData(gd);
87
		table.setLayoutData(gd);
88
		applyDialogFont(parent);		
88
		return parent;
89
		return parent;
89
	}
90
	}
90
	
91
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/actions/RenameInputDialog.java (+1 lines)
Lines 60-65 Link Here
60
					ref.setUpdateReferences(checkBox.getSelection());
60
					ref.setUpdateReferences(checkBox.getSelection());
61
				}
61
				}
62
		});		
62
		});		
63
		applyDialogFont(composite);		
63
		return composite;
64
		return composite;
64
	}
65
	}
65
66
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/changes/ChangeExceptionHandler.java (+1 lines)
Lines 62-67 Link Here
62
			Label label= new Label(parent, SWT.NONE);
62
			Label label= new Label(parent, SWT.NONE);
63
			label.setText(RefactoringMessages.getString("ChangeExceptionHandler.button_explanation")); //$NON-NLS-1$
63
			label.setText(RefactoringMessages.getString("ChangeExceptionHandler.button_explanation")); //$NON-NLS-1$
64
			label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
64
			label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
65
			applyDialogFont(result);
65
			return result;
66
			return result;
66
		}
67
		}
67
	}
68
	}
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/ExtractMethodInputPage.java (+2 lines)
Lines 25-30 Link Here
25
import org.eclipse.swt.widgets.Label;
25
import org.eclipse.swt.widgets.Label;
26
import org.eclipse.swt.widgets.Text;
26
import org.eclipse.swt.widgets.Text;
27
27
28
import org.eclipse.jface.dialogs.Dialog;
28
import org.eclipse.jface.dialogs.IDialogSettings;
29
import org.eclipse.jface.dialogs.IDialogSettings;
29
30
30
import org.eclipse.ui.help.WorkbenchHelp;
31
import org.eclipse.ui.help.WorkbenchHelp;
Lines 159-164 Link Here
159
		fPreview.setLayoutData(gd);
160
		fPreview.setLayoutData(gd);
160
		
161
		
161
		layouter.perform(label, fPreview, 1);
162
		layouter.perform(label, fPreview, 1);
163
		Dialog.applyDialogFont(result);
162
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_METHOD_WIZARD_PAGE);		
164
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.EXTRACT_METHOD_WIZARD_PAGE);		
163
	}	
165
	}	
164
166
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/code/InlineMethodInputPage.java (+3 lines)
Lines 19-24 Link Here
19
import org.eclipse.swt.widgets.Composite;
19
import org.eclipse.swt.widgets.Composite;
20
import org.eclipse.swt.widgets.Group;
20
import org.eclipse.swt.widgets.Group;
21
21
22
import org.eclipse.jface.dialogs.Dialog;
23
22
import org.eclipse.jdt.core.JavaModelException;
24
import org.eclipse.jdt.core.JavaModelException;
23
25
24
import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus;
26
import org.eclipse.jdt.internal.corext.refactoring.base.RefactoringStatus;
Lines 98-103 Link Here
98
					changeRefactoring(InlineMethodRefactoring.INLINE_SINGLE);
100
					changeRefactoring(InlineMethodRefactoring.INLINE_SINGLE);
99
			}
101
			}
100
		});		
102
		});		
103
		Dialog.applyDialogFont(result);
101
	}
104
	}
102
	
105
	
103
	private void changeRefactoring(int mode) {
106
	private void changeRefactoring(int mode) {
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage.java (+2 lines)
Lines 37-42 Link Here
37
import org.eclipse.swt.widgets.TableItem;
37
import org.eclipse.swt.widgets.TableItem;
38
import org.eclipse.swt.widgets.Text;
38
import org.eclipse.swt.widgets.Text;
39
39
40
import org.eclipse.jface.dialogs.Dialog;
40
import org.eclipse.jface.dialogs.IInputValidator;
41
import org.eclipse.jface.dialogs.IInputValidator;
41
import org.eclipse.jface.dialogs.InputDialog;
42
import org.eclipse.jface.dialogs.InputDialog;
42
import org.eclipse.jface.text.Document;
43
import org.eclipse.jface.text.Document;
Lines 249-254 Link Here
249
		
250
		
250
		// promote control
251
		// promote control
251
		setControl(supercomposite);
252
		setControl(supercomposite);
253
		Dialog.applyDialogFont(supercomposite);
252
		WorkbenchHelp.setHelp(supercomposite, IJavaHelpContextIds.EXTERNALIZE_WIZARD_KEYVALUE_PAGE);
254
		WorkbenchHelp.setHelp(supercomposite, IJavaHelpContextIds.EXTERNALIZE_WIZARD_KEYVALUE_PAGE);
253
	}
255
	}
254
	
256
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/ExternalizeWizardPage2.java (+2 lines)
Lines 23-28 Link Here
23
import org.eclipse.swt.widgets.Composite;
23
import org.eclipse.swt.widgets.Composite;
24
import org.eclipse.swt.widgets.Label;
24
import org.eclipse.swt.widgets.Label;
25
25
26
import org.eclipse.jface.dialogs.Dialog;
26
import org.eclipse.jface.viewers.ILabelProvider;
27
import org.eclipse.jface.viewers.ILabelProvider;
27
import org.eclipse.jface.window.Window;
28
import org.eclipse.jface.window.Window;
28
import org.eclipse.jface.wizard.IWizardPage;
29
import org.eclipse.jface.wizard.IWizardPage;
Lines 237-242 Link Here
237
238
238
		setControl(parent);
239
		setControl(parent);
239
		initializeFields();
240
		initializeFields();
241
		Dialog.applyDialogFont(parent);
240
		WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.EXTERNALIZE_WIZARD_PROPERTIES_FILE_PAGE);
242
		WorkbenchHelp.setHelp(parent, IJavaHelpContextIds.EXTERNALIZE_WIZARD_PROPERTIES_FILE_PAGE);
241
	}
243
	}
242
	
244
	
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/nls/search/NLSSearchPage.java (+2 lines)
Lines 41-46 Link Here
41
import org.eclipse.swt.widgets.Shell;
41
import org.eclipse.swt.widgets.Shell;
42
import org.eclipse.swt.widgets.Text;
42
import org.eclipse.swt.widgets.Text;
43
43
44
import org.eclipse.jface.dialogs.Dialog;
44
import org.eclipse.jface.dialogs.DialogPage;
45
import org.eclipse.jface.dialogs.DialogPage;
45
import org.eclipse.jface.dialogs.IDialogConstants;
46
import org.eclipse.jface.dialogs.IDialogConstants;
46
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
47
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
Lines 298-303 Link Here
298
299
299
		setControl(result);
300
		setControl(result);
300
301
302
		Dialog.applyDialogFont(result);
301
		WorkbenchHelp.setHelp(result, IJavaHelpContextIds.NLS_SEARCH_PAGE);	
303
		WorkbenchHelp.setHelp(result, IJavaHelpContextIds.NLS_SEARCH_PAGE);	
302
	}
304
	}
303
	/**
305
	/**
(-)ui refactoring/org/eclipse/jdt/internal/ui/refactoring/sef/SelfEncapsulateFieldInputPage.java (+3 lines)
Lines 24-29 Link Here
24
import org.eclipse.swt.widgets.Label;
24
import org.eclipse.swt.widgets.Label;
25
import org.eclipse.swt.widgets.Text;
25
import org.eclipse.swt.widgets.Text;
26
26
27
import org.eclipse.jface.dialogs.Dialog;
28
27
import org.eclipse.ui.help.WorkbenchHelp;
29
import org.eclipse.ui.help.WorkbenchHelp;
28
30
29
import org.eclipse.jdt.core.Flags;
31
import org.eclipse.jdt.core.Flags;
Lines 111-116 Link Here
111
		
113
		
112
		getter.setFocus();
114
		getter.setFocus();
113
		
115
		
116
		Dialog.applyDialogFont(result);
114
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.SEF_WIZARD_PAGE);		
117
		WorkbenchHelp.setHelp(getControl(), IJavaHelpContextIds.SEF_WIZARD_PAGE);		
115
	}
118
	}
116
119

Return to bug 35130