Changeset 777

Timestamp:

01/29/14 10:29:04 (10 years ago)

Author:

jts21

Message:

Only try to init fonts after they've been extracted so they can actually be loaded

Location:

trunk/src/org/expeditee

Files:

• gui/Browser.java (modified) (2 diffs)
• items/Text.java (modified) (4 diffs)
• settings/UserSettings.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/Browser.java

@@ -42 +42 @@
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
+import org.expeditee.items.Text;
 import org.expeditee.items.widgets.WidgetCacheManager;
 import org.expeditee.network.FrameShare;
@@ -282 +283 @@
                         
                         Settings.Init();
+                        
+                        Text.InitFonts();
 
                         DisplayIO.Init(this);

trunk/src/org/expeditee/items/Text.java

@@ -7 +7 @@
 import java.awt.GradientPaint;
 import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
 import java.awt.Point;
 import java.awt.Polygon;
@@ -22 +23 @@
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
+import java.io.File;
 import java.text.AttributedString;
 import java.util.Collection;
@@ -39 +41 @@
 import org.expeditee.gui.FreeItems;
 import org.expeditee.math.ExpediteeJEP;
-import org.expeditee.settings.UserSettings;
 import org.expeditee.settings.experimental.ExperimentalFeatures;
 import org.nfunk.jep.Node;
@@ -142 +143 @@
         // The font to display this text in
         private Font _font;
+        
+        public static void InitFonts() {
+                try {
+                        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+
+                        if (ge != null) {
+                                
+                            File fontDirectory = new File(FrameIO.FONT_PATH);
+                            if (fontDirectory != null) {
+                                File[] fontFiles = fontDirectory.listFiles();
+                                if (fontFiles != null) {
+    
+                                    if (fontFiles.length>0) {
+                                        System.out.println("Loading custom fonts:");
+                                    }
+    
+                                    boolean first_item = true;                              
+                                    for (File fontFile : fontFiles) {
+                                        String ext = "";
+                                        String fileName = fontFile.getName().toLowerCase();
+                                
+                                        int i = fileName.lastIndexOf('.');
+                                int p = Math.max(fileName.lastIndexOf('/'), fileName.lastIndexOf('\\'));
+                                
+                                if (i > p) {
+                                    ext = fileName.substring(i+1);
+                                }
+        
+                                                if (ext.equals("ttf")) {
+                                                    if (first_item) {
+                                                        System.out.print("  " + fontFile.getName());
+                                                    }
+                                                    else {
+                                                        System.out.print(", " + fontFile.getName());
+                                                    }
+                                                    System.out.flush();
+        
+                                                    Font font = Font.createFont(Font.TRUETYPE_FONT, fontFile);
+                                                    
+                                                    ge.registerFont(font);
+                                                    first_item = false;
+                                                }
+                                    }
+                                    System.out.println();
+    
+                                }
+                            }
+                        }
+                        else {
+                                System.err.println("No graphics environment detected.  Skipping the loading of the custom fonts");
+                        }
+                }
+                catch (Exception e) {
+                        System.err.println("Failed to load custom fonts");
+                        e.printStackTrace();
+                }
+        }
 
         /**

trunk/src/org/expeditee/settings/UserSettings.java

@@ -392 +392 @@
                 }
         };
-        
-        
-    protected static final String filenameExtension(String fileName) {
-        // Code excerpt from:
-        //   http://stackoverflow.com/questions/3571223/how-do-i-get-the-file-extension-of-a-file-in-java
-        // packed up here as a method
-
-        String extension = "";
-        
-        int i = fileName.lastIndexOf('.');
-        int p = Math.max(fileName.lastIndexOf('/'), fileName.lastIndexOf('\\'));
-        
-        if (i > p) {
-            extension = fileName.substring(i+1);
-        }
-
-        return extension;
-    }
 
         // add default values
@@ -428 +410 @@
                 UserSettings.ImageDirs.get().add(FrameIO.IMAGES_PATH);
                 UserSettings.ImageDirs.setDefault(UserSettings.ImageDirs.get());
-                
-                
-                
-                try {
-                        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-
-                        if (ge != null) {
-
-
-                            File fontDirectory = new File(FrameIO.FONT_PATH);
-                            if (fontDirectory != null) {
-                                File[] fontFiles = fontDirectory.listFiles();
-                                if (fontFiles != null) {
-
-                                    if (fontFiles.length>0) {
-                                        System.out.println("Loading custom fonts:");
-                                    }
-
-                                    boolean first_item = true;                              
-                                    for (File fontFile : fontFiles) {
-
-                                        String ext = filenameExtension(fontFile.getName().toLowerCase());
-
-                                        if (ext.equals("ttf")) {
-                                            if (first_item) {
-                                                System.out.print("  " + fontFile.getName());
-                                            }
-                                            else {
-                                                System.out.print(", " + fontFile.getName());
-                                            }
-                                            System.out.flush();
-
-                                            Font font = Font.createFont(Font.TRUETYPE_FONT, fontFile);
-                                            
-                                            ge.registerFont(font);
-                                            first_item = false;
-                                        }
-                                    }
-                                    System.out.println();
-
-                                }
-                            }
-                        }
-                        else {
-                                System.err.println("No graphics environment detected.  Skipping the loading of the custom font Metamorphous");
-                        }
-                }
-                catch (Exception e) {
-                        System.err.println("Failed to load custom font Metamorphous");
-                        e.printStackTrace();
-                }
-
-                
-                
         }