### Eclipse Workspace Patch 1.0
#P org.eclipse.wst.xml.ui
Index: src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xml/plugins/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java,v
retrieving revision 1.3
diff -u -r1.3 XMLCatalogPreferencePage.java
--- src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java	23 Mar 2006 18:40:35 -0000	1.3
+++ src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java	1 May 2006 19:07:07 -0000
@@ -118,6 +118,8 @@
         createCatalogDetailsView(composite);
         createAdvancedButton(composite);
         // catalogEntriesView.updatePage();
+        applyDialogFont(composite);
+        
         return composite;
     }
 
#P org.eclipse.wst.server.ui
Index: serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/server/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java,v
retrieving revision 1.9
diff -u -r1.9 AbstractTreeComposite.java
--- serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java	5 Nov 2005 18:35:09 -0000	1.9
+++ serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeComposite.java	1 May 2006 19:07:09 -0000
@@ -142,6 +142,7 @@
 		}
 		
 		tree.forceFocus();
+		org.eclipse.jface.dialogs.Dialog.applyDialogFont(this);
 	}
 	
 	protected abstract String getDescriptionLabel();
#P org.eclipse.jst.j2ee.ejb.annotations.xdoclet
Index: src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/jst/components/ejb/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletPreferencePage.java,v
retrieving revision 1.13
diff -u -r1.13 XDocletPreferencePage.java
--- src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletPreferencePage.java	16 Mar 2006 17:56:25 -0000	1.13
+++ src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/ui/XDocletPreferencePage.java	1 May 2006 19:07:10 -0000
@@ -185,6 +185,8 @@
 
 		xDocletPath.addModifyListener(listener);
 		xDocletVersion.addModifyListener(listener);
+		applyDialogFont(composite);
+		
 		return composite;
 	}
 
#P org.eclipse.jst.jsp.ui
Index: src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPSourcePreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/jst/components/jsp/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPSourcePreferencePage.java,v
retrieving revision 1.1
diff -u -r1.1 JSPSourcePreferencePage.java
--- src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPSourcePreferencePage.java	19 Apr 2005 03:36:25 -0000	1.1
+++ src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPSourcePreferencePage.java	1 May 2006 19:07:12 -0000
@@ -43,6 +43,7 @@
 		data = new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL);
 		data.horizontalIndent = 5;
 		contentTypeArea.getControl().setLayoutData(data);
+		this.applyDialogFont(composite);
 
 		return composite;
 	}
Index: src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPFilesPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/jst/components/jsp/plugins/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPFilesPreferencePage.java,v
retrieving revision 1.5
diff -u -r1.5 JSPFilesPreferencePage.java
--- src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPFilesPreferencePage.java	25 Jan 2006 03:47:28 -0000	1.5
+++ src/org/eclipse/jst/jsp/ui/internal/preferences/ui/JSPFilesPreferencePage.java	1 May 2006 19:07:12 -0000
@@ -62,6 +62,9 @@
 		fValidateFragments.setSelection(validateFragments);
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IHelpContextIds.JSP_PREFWEBX_FILES_HELPID);
+		// Note: The super class set the font, but we've added items so we need to set the set the font again
+		org.eclipse.jface.dialogs.Dialog.applyDialogFont(c);
+		
 		return c;
 	}
 
#P org.eclipse.wst.internet.cache
Index: src/org/eclipse/wst/internet/cache/internal/preferences/CachePreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/internet/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/preferences/CachePreferencePage.java,v
retrieving revision 1.7
diff -u -r1.7 CachePreferencePage.java
--- src/org/eclipse/wst/internet/cache/internal/preferences/CachePreferencePage.java	12 Apr 2006 14:14:45 -0000	1.7
+++ src/org/eclipse/wst/internet/cache/internal/preferences/CachePreferencePage.java	1 May 2006 19:07:14 -0000
@@ -255,6 +255,7 @@
       //TODO: Log error
     }
     setPreferenceWidgets();
+    applyDialogFont(composite);
 
     return composite;
   }
#P org.eclipse.wst.rdb.core.ui
Index: src/org/eclipse/wst/rdb/core/internal/ui/preferences/LabelDecoratorPreference.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/rdb/plugins/org.eclipse.wst.rdb.core.ui/src/org/eclipse/wst/rdb/core/internal/ui/preferences/LabelDecoratorPreference.java,v
retrieving revision 1.3
diff -u -r1.3 LabelDecoratorPreference.java
--- src/org/eclipse/wst/rdb/core/internal/ui/preferences/LabelDecoratorPreference.java	27 Feb 2006 22:32:58 -0000	1.3
+++ src/org/eclipse/wst/rdb/core/internal/ui/preferences/LabelDecoratorPreference.java	1 May 2006 19:07:15 -0000
@@ -389,6 +389,7 @@
         addMultiTabDecorations(parent);
         
         WorkbenchHelp.setHelp(container, INFOPOP);
+        applyDialogFont(parent);
         
         return parent;
     }
Index: src/org/eclipse/wst/rdb/core/internal/ui/preferences/OutputPreference.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/rdb/plugins/org.eclipse.wst.rdb.core.ui/src/org/eclipse/wst/rdb/core/internal/ui/preferences/OutputPreference.java,v
retrieving revision 1.6
diff -u -r1.6 OutputPreference.java
--- src/org/eclipse/wst/rdb/core/internal/ui/preferences/OutputPreference.java	28 Apr 2006 20:48:20 -0000	1.6
+++ src/org/eclipse/wst/rdb/core/internal/ui/preferences/OutputPreference.java	1 May 2006 19:07:15 -0000
@@ -152,7 +152,8 @@
         tMaxLobLength.setText(Integer.toString(RDBCorePlugin.getDefault().getPluginPreferences().getInt(
         		RDBCorePluginConstants.MAX_LOB_LENGTH)));
         
-        tMaxRows.setEnabled(bLimitRows.getSelection());        
+        tMaxRows.setEnabled(bLimitRows.getSelection());    
+        applyDialogFont(cmp);
         
         return cmp;
         
#P org.eclipse.wst.xsd.ui
Index: src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/xsd/plugins/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDPreferencePage.java,v
retrieving revision 1.3
diff -u -r1.3 XSDPreferencePage.java
--- src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDPreferencePage.java	18 Apr 2006 22:43:52 -0000	1.3
+++ src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDPreferencePage.java	1 May 2006 19:07:17 -0000
@@ -75,6 +75,8 @@
 
     initializeValues();
 
+    applyDialogFont(parent);
+
     return new Composite(parent, SWT.NULL);
   }
 
#P org.eclipse.wst.javascript.ui
Index: src-commonui/org/eclipse/wst/javascript/ui/internal/common/preferences/ui/JavaScriptFilesPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/javascript/plugins/org.eclipse.wst.javascript.ui/src-commonui/org/eclipse/wst/javascript/ui/internal/common/preferences/ui/JavaScriptFilesPreferencePage.java,v
retrieving revision 1.4
diff -u -r1.4 JavaScriptFilesPreferencePage.java
--- src-commonui/org/eclipse/wst/javascript/ui/internal/common/preferences/ui/JavaScriptFilesPreferencePage.java	25 Jan 2006 03:48:46 -0000	1.4
+++ src-commonui/org/eclipse/wst/javascript/ui/internal/common/preferences/ui/JavaScriptFilesPreferencePage.java	1 May 2006 19:07:19 -0000
@@ -90,6 +90,8 @@
 		loadPreferences();
 
 		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.JS_PREFWEBX_FILES_HELPID);
+		this.applyDialogFont(composite);
+		
 		return composite;
 	}
 
#P org.eclipse.wst.validation.ui
#P org.eclipse.wst.wsdl.ui
Index: src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/wsdl/plugins/org.eclipse.wst.wsdl.ui/src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLPreferencePage.java,v
retrieving revision 1.3
diff -u -r1.3 WSDLPreferencePage.java
--- src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLPreferencePage.java	17 Apr 2006 20:46:39 -0000	1.3
+++ src-asd-wsdl11/org/eclipse/wst/wsdl/ui/internal/WSDLPreferencePage.java	1 May 2006 19:07:22 -0000
@@ -84,7 +84,9 @@
        SoapPortOptionsPage.java
     */
 //    HttpPortOptionsPage.java    StringFieldEditor location = new StringFieldEditor("Defualt Location:", "Default Location:", editorGroup1); // Externalize
-//    addField(location);    
+//    addField(location); 
+	
+	this.applyDialogFont(parent);
     
   }
 }
\ No newline at end of file
Index: src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java,v
retrieving revision 1.9
diff -u -r1.9 ServerRuntimePreferencePage.java
--- src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java	10 Nov 2005 17:12:25 -0000	1.9
+++ src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java	1 May 2006 19:07:24 -0000
@@ -88,6 +88,8 @@
 
 	  initializeValues();
 	  startListening();
+	  applyDialogFont(page);
+	  
 	  return page;
 	}

#P org.eclipse.wst.sse.ui
Index: src-tasktags/org/eclipse/wst/sse/ui/internal/preferences/ui/TaskTagPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/sse/plugins/org.eclipse.wst.sse.ui/src-tasktags/org/eclipse/wst/sse/ui/internal/preferences/ui/TaskTagPreferencePage.java,v
retrieving revision 1.2
diff -u -r1.2 TaskTagPreferencePage.java
--- src-tasktags/org/eclipse/wst/sse/ui/internal/preferences/ui/TaskTagPreferencePage.java	7 Jun 2005 22:10:40 -0000	1.2
+++ src-tasktags/org/eclipse/wst/sse/ui/internal/preferences/ui/TaskTagPreferencePage.java	1 May 2006 19:07:27 -0000
@@ -171,6 +171,8 @@
 		}
 
 		SSEUIPlugin.getDefault().getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.PREFWEBX_TASKTAGS_HELPID);
+		this.applyDialogFont(composite);
+		
 		return composite;
 	}
 
Index: src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractPreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/sse/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractPreferencePage.java,v
retrieving revision 1.1
diff -u -r1.1 AbstractPreferencePage.java
--- src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractPreferencePage.java	13 Apr 2005 22:43:41 -0000	1.1
+++ src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractPreferencePage.java	1 May 2006 19:07:27 -0000
@@ -243,6 +243,10 @@
 
 	protected void setSize(Composite composite) {
 		if (composite != null) {
+			// Note: The font set here in anticipation that the class inheriting
+			//       this base class may add widgets to the dialog.   setSize
+			//       is assumed to be called just before we go live.
+			this.applyDialogFont(composite);
 			Point minSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
 			composite.setSize(minSize);
 			// set scrollbar composite's min size so page is expandable but
Index: src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/sse/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java,v
retrieving revision 1.4
diff -u -r1.4 EmptyFilePreferencePage.java
--- src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java	10 Oct 2005 22:22:58 -0000	1.4
+++ src/org/eclipse/wst/sse/ui/internal/preferences/ui/EmptyFilePreferencePage.java	1 May 2006 19:07:27 -0000
@@ -57,6 +57,8 @@
 		text.setText(description);
 
 		setSize(composite);
+		applyDialogFont(composite);
+		
 		return composite;
 	}
 
Index: src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractColorPage.java
===================================================================
RCS file: /cvsroot/webtools/wst/components/sse/plugins/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractColorPage.java,v
retrieving revision 1.2
diff -u -r1.2 AbstractColorPage.java
--- src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractColorPage.java	6 May 2005 14:40:32 -0000	1.2
+++ src/org/eclipse/wst/sse/ui/internal/preferences/ui/AbstractColorPage.java	1 May 2006 19:07:27 -0000
@@ -74,7 +74,9 @@
 
 		GridData gd = (GridData) descLabel.getLayoutData();
 		gd.widthHint = (coloringComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT)).x;
+		this.applyDialogFont(pageComponent);	
 		setSize(pageComponent);
+
 		return pageComponent;
 	}