Slick Forums

Index: src/org/newdawn/slick/font/HieroSettings.java
===================================================================
--- src/org/newdawn/slick/font/HieroSettings.java   (revision 1529)
+++ src/org/newdawn/slick/font/HieroSettings.java   (working copy)
@@ -5,6 +5,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.util.ArrayList;
@@ -61,8 +62,18 @@
    * @throws SlickException if the file could not be read.
    */
   public HieroSettings(String hieroFileRef) throws SlickException {
+      this(ResourceLoader.getResourceAsStream(hieroFileRef), hieroFileRef);
+   }
+
+   /**
+    * Create a new set of configuration from a file
+    * @param hieroFileInputStream The stream with the Hiero settings file.
+    * @param hieroFileRef The file system or classpath location of the Hiero settings file.
+    * @throws SlickException if the file could not be read.
+    */
+   public HieroSettings(InputStream hieroFileInputStream, String hieroFileRef) throws SlickException {
      try {
-         BufferedReader reader = new BufferedReader(new InputStreamReader(ResourceLoader.getResourceAsStream(hieroFileRef)));
+         BufferedReader reader = new BufferedReader(new InputStreamReader(hieroFileInputStream));
         while (true) {
            String line = reader.readLine();
            if (line == null) break;

Index: src/org/newdawn/slick/UnicodeFont.java
===================================================================
--- src/org/newdawn/slick/UnicodeFont.java   (revision 1529)
+++ src/org/newdawn/slick/UnicodeFont.java   (working copy)
@@ -1,4 +1,3 @@
-
package org.newdawn.slick;

import java.awt.Font;
@@ -8,6 +7,7 @@
import java.awt.font.GlyphVector;
import java.awt.font.TextAttribute;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
@@ -51,14 +51,15 @@
   /**
    * Utility to create a Java font for a TTF file reference
    *
+    * @param ttfInputStream The stream with the TrueTypeFont file.
    * @param ttfFileRef The file system or classpath location of the TrueTypeFont file.
    * @return The font created
    * @throws SlickException Indicates a failure to locate or load the font into Java's font
    * system.
    */
-   private static Font createFont (String ttfFileRef) throws SlickException {
+   private static Font createFont(InputStream ttfInputStream, String ttfFileRef) throws SlickException {
      try {
-         return Font.createFont(Font.TRUETYPE_FONT, ResourceLoader.getResourceAsStream(ttfFileRef));
+         return Font.createFont(Font.TRUETYPE_FONT, ttfInputStream);
      } catch (FontFormatException ex) {
         throw new SlickException("Invalid font: " + ttfFileRef, ex);
      } catch (IOException ex) {
@@ -144,7 +145,7 @@
   public UnicodeFont (String ttfFileRef, String hieroFileRef) throws SlickException {
      this(ttfFileRef, new HieroSettings(hieroFileRef));
   }
-
+   
   /**
    * Create a new unicode font based on a TTF file and a set of heiro configuration
    *
@@ -152,9 +153,20 @@
    * @param settings The settings configured via the Hiero tool
    * @throws SlickException if the UnicodeFont could not be initialized.
    */
-   public UnicodeFont (String ttfFileRef, HieroSettings settings) throws SlickException {
+   public UnicodeFont(String ttfFileRef, HieroSettings settings) throws SlickException {
+      this(ResourceLoader.getResourceAsStream(ttfFileRef), ttfFileRef, settings);
+   }
+   
+   /**
+    * Create a new unicode font based on a TTF file and a set of heiro configuration
+    * @param ttfInputStream The stream of the ttf file.
+    * @param ttfFileRef The file system or classpath location of the TrueTypeFont file.
+    * @param settings The settings configured via the Hiero tool
+    * @throws SlickException if the UnicodeFont could not be initialized.
+    */
+   public UnicodeFont(InputStream ttfInputStream, String ttfFileRef, HieroSettings settings) throws SlickException {
      this.ttfFileRef = ttfFileRef;
-      Font font = createFont(ttfFileRef);
+      Font font = createFont(ttfInputStream, ttfFileRef);
      initializeFont(font, settings.getFontSize(), settings.isBold(), settings.isItalic());
      loadSettings(settings);
   }
@@ -168,9 +180,9 @@
    * @param italic True if the font should be rendered in bold typeface
    * @throws SlickException if the UnicodeFont could not be initialized.
    */
-   public UnicodeFont (String ttfFileRef, int size, boolean bold, boolean italic) throws SlickException {
+   public UnicodeFont(String ttfFileRef, int size, boolean bold, boolean italic) throws SlickException {
      this.ttfFileRef = ttfFileRef;
-      initializeFont(createFont(ttfFileRef), size, bold, italic);
+      initializeFont(createFont(ResourceLoader.getResourceAsStream(ttfFileRef), ttfFileRef), size, bold, italic);
   }

   /**