Cleanup createFont

gohai · gohai · commit 87b63415068d · 2016-08-28T20:56:35.000+02:00
diff --git a/app/src/processing/app/ui/Toolkit.java b/app/src/processing/app/ui/Toolkit.java
@@ -929,31 +929,23 @@ static public Font getSansFont(int size, int style) {
 
 
   /**
-   * Get a font from the JRE lib/fonts folder. Our default fonts are also
+   * Get a font from the lib/fonts folder. Our default fonts are also
    * installed there so that the monospace (and others) can be used by other
    * font listing calls (i.e. it appears in the list of monospace fonts in
    * the Preferences window, and can be used by HTMLEditorKit for WebFrame).
    */
   static private Font createFont(String filename, int size) throws IOException, FontFormatException {
     boolean registerFont = false;
 
-    // Can't use Base.getJavaHome(), because if we're not using our local JRE,
-    // we likely have bigger problems with how things are running.
+    // try the JRE font directory first
     File fontFile = new File(System.getProperty("java.home"), "lib/fonts/" + filename);
+
+    // else fall back to our own content dir
     if (!fontFile.exists()) {
-      // any of the fallbacks below is a custom location, so try to register the font as well
-      registerFont = true;
-      // if we're debugging from Eclipse, grab it from the work folder (user.dir is /app)
-      fontFile = new File(System.getProperty("user.dir"), "../build/shared/lib/fonts/" + filename);
-    }
-    if (!fontFile.exists()) {
-      // if we're debugging the new Java Mode from Eclipse, paths are different
-      fontFile = new File(System.getProperty("user.dir"), "../../shared/lib/fonts/" + filename);
-    }
-    if (!fontFile.exists()) {
-      // this if for Linux, where we're shipping a second copy of the fonts outside of java
       fontFile = Platform.getContentFile("lib/fonts/" + filename);
+      registerFont = true;
     }
+
     if (!fontFile.exists()) {
       String msg = "Could not find required fonts. ";
       // This gets the JAVA_HOME for the *local* copy of the JRE installed with
@@ -968,11 +960,11 @@ static private Font createFont(String filename, int size) throws IOException, Fo
       Messages.showError("Font Sadness", msg, null);
     }
 
+
     BufferedInputStream input = new BufferedInputStream(new FileInputStream(fontFile));
     Font font = Font.createFont(Font.TRUETYPE_FONT, input);
     input.close();
 
-    // this makes Font() work for font files in custom locations
     if (registerFont) {
       GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
       ge.registerFont(font);
