Changeset 1571

Timestamp:

08/10/23 16:16:02 (9 months ago)

Author:

davidb

Message:

More nuanced check for loading in a True-type font

File:

• trunk/src/org/expeditee/gio/swing/SwingFontManager.java (modified) (3 diffs)

trunk/src/org/expeditee/gio/swing/SwingFontManager.java

@@ -20 +20 @@
         /** Singleton instance. */
         private static SwingFontManager _instance = null;
-        
+
+        private static HashMap<String,String> _font_name_lookup = null;
+    
+            
         /** Singleton instantiator. */
         public static SwingFontManager getInstance()
         {
                 if (_instance == null) _instance = new SwingFontManager();
+
+                if (_font_name_lookup == null) {
+                    _font_name_lookup = new HashMap<String,String>();
+                    
+                    java.awt.Font [] fonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts();
+                    
+                    for (int i=0; i<fonts.length; i++) {
+                        java.awt.Font font = fonts[i];
+                        String font_name = font.getFontName();
+                        String font_family = font.getFamily();
+
+                        // Instead of String->Integer hashmap, let's choose to store the
+                        // font family name, in case this is useful at a later point elsewhere
+                        _font_name_lookup.put(font_name,font_family); 
+                    }
+                }
                 
                 return _instance;
@@ -63 +82 @@
                         if (swingFont == null) registerOkay = false;
                 } catch (Exception e) {
+                        System.err.println("Warning: createFont() failed for:\n  " + fontFile.toString());
+                        e.printStackTrace();
                         registerOkay = false;
                 }
@@ -75 +96 @@
                         return register(swingFont).clone();
                 }
-                
-                // If we made it here the registration failed
+                else {
+                    // One reason for failing to register is that it already exists
+
+                    if (swingFont != null) {
+                        String font_name = swingFont.getFontName();
+                    
+                        Boolean font_already_registered = (_font_name_lookup.get(font_name) != null);
+
+                        // Loading font was OK after all, just that the JDK already has it
+                        if (font_already_registered) {
+                            return register(swingFont).clone();
+                        }
+                        else {
+                            System.err.println("Error: failed to register font '" + font_name + "'");
+                        }
+                    }
+                }
+                
+
                 return null;
         }