diff -r ec92ab677a54 javafx-font/src/com/sun/t2k/MacFontFinder.java
--- a/javafx-font/src/com/sun/t2k/MacFontFinder.java	Mon May 07 14:46:26 2012 -0700
+++ b/javafx-font/src/com/sun/t2k/MacFontFinder.java	Tue May 08 11:38:05 2012 -0700
@@ -200,16 +200,16 @@
     private static boolean isValidFontFamily( String familyName ) {
 
         String[] searchStringArray = null;
-        if (allAvailableFontFamilies != null) {
+        if ( allAvailableFontFamilies != null) {
             searchStringArray = allAvailableFontFamilies;
-        } else if (allNativeFamilyFonts != null) {
+        } else if ( allNativeFamilyFonts != null ) {
             searchStringArray = allNativeFamilyFonts;
         } else {
             allNativeFamilyFonts = availableFontFamilies();
             Arrays.sort(allNativeFamilyFonts);
             searchStringArray = allNativeFamilyFonts;
         }
-        if (familyName == null) {
+        if ( familyName == null ) {
             return false;
         }
 
@@ -243,13 +243,13 @@
             return null;
         }
 
-        if (psNameToPathMap == null) {
+        if ( psNameToPathMap == null ) {
             initPSFontNameToPathMap();
         }
 
         String psFontName = getPSNameOfFont(fontFullName, fontSize);
 
-        if (psFontName == null || psFontName.equals("")) {
+        if ( psFontName == null || psFontName.equals("")) {
             return null;
         } else {
             return psNameToPathMap.get(psFontName);
@@ -264,7 +264,7 @@
      */
     private void initPSFontNameToPathMap() {
 
-        if (psNameToPathMap == null) {
+        if ( psNameToPathMap == null ) {
             psNameToPathMap = new HashMap<String,String>();
         } else {
             return;// Should only be intialized once
diff -r ec92ab677a54 javafx-font/src/com/sun/t2k/T2KFontFactory.java
--- a/javafx-font/src/com/sun/t2k/T2KFontFactory.java	Mon May 07 14:46:26 2012 -0700
+++ b/javafx-font/src/com/sun/t2k/T2KFontFactory.java	Tue May 08 11:38:05 2012 -0700
@@ -130,7 +130,7 @@
                                               boolean italic,
                                               boolean wantComp) {
         
-        if (familyName == null || familyName.isEmpty()) {
+        if ( familyName == null || familyName.isEmpty() ) {
             return null;
         }
 
@@ -205,7 +205,7 @@
             // font full names available on the system up front, since on Mac
             // font full name lookup is slow
 
-            if (familyToFontListMap != null) {
+            if ( familyToFontListMap != null ) {
                 family = familyToFontListMap.get(lcFamilyName);
             } else {
                 familyToFontListMap = new HashMap<String,ArrayList<String>>(10);
@@ -315,7 +315,7 @@
     public synchronized PGFont createFont(String familyName, boolean bold,
                                           boolean italic, float size) {
         FontResource fr = null;
-        if (familyName != null && !familyName.isEmpty()) {
+        if ( familyName != null && !familyName.isEmpty() ) {
             PGFont logFont =
                 LogicalFont.getLogicalFont(familyName, bold, italic, size);
             if (logFont != null) {
@@ -334,7 +334,7 @@
     public synchronized PGFont createFont(String name, float size) {
 
         FontResource fr = null;
-        if (name != null && !name.isEmpty()) {
+        if ( name != null && !name.isEmpty() ) {
             PGFont logFont =
                 LogicalFont.getLogicalFont(name, size);
             if (logFont != null) {
@@ -617,7 +617,7 @@
         } else if (isMacOSX) {
             // Looking up all fonts via getFullNameToFileMap(); is not desirable
             // on the mac if it can be avoided
-            if (fontToFileMap != null) {
+            if ( fontToFileMap != null ) {
                 filename = fontToFileMap.get(name);
             }