Graph Font: Fix API doc (parameter) ; GPUUISceneGLListener0A forward FontFactory.get(..) exception, we cannot recover in this demo

3 files changed, 14 insertions, 8 deletions

diff --git a/src/jogl/classes/jogamp/graph/font/FontConstructor.java b/src/jogl/classes/jogamp/graph/font/FontConstructor.java
index fa176ead9..2732d07cb 100644
--- a/src/jogl/classes/jogamp/graph/font/FontConstructor.java
+++ b/src/jogl/classes/jogamp/graph/font/FontConstructor.java
@@ -34,6 +34,14 @@ import java.io.InputStream;
 import com.jogamp.graph.font.Font;
 
 public interface FontConstructor {
-    Font create(final File file) throws IOException ;
-    Font create(final InputStream stream, int streamLen) throws IOException ;
+    /**
+     * @param file The font file
+     */
+    Font create(final File file) throws IOException;
+
+    /**
+     * @param istream The font input stream
+     * @param streamLen the length of the font segment in the stream
+     */
+    Font create(final InputStream stream, int streamLen) throws IOException;
 }
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFontCollection.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFontCollection.java
index be84a951c..ed07cb30a 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFontCollection.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFontCollection.java
@@ -67,7 +67,7 @@ public class OTFontCollection {
 
     /**
      * @param istream The OpenType font input stream
-     * @param streamLen TODO
+     * @param streamLen the length of the OpenType font segment in the stream
      */
     public static OTFontCollection create(final InputStream istream, final int streamLen) throws IOException {
         final OTFontCollection fc = new OTFontCollection();
@@ -141,7 +141,7 @@ public class OTFontCollection {
 
     /**
      * @param is The OpenType font stream
-     * @param streamLen the total length of the stream
+     * @param streamLen the length of the OpenType font segment in the stream
      */
     protected void read(final InputStream is, final int streamLen) throws IOException {
         _pathName = "";
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
index b10a89a8f..685e3bd86 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
@@ -157,8 +157,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         try {
             font = FontFactory.get(FontFactory.UBUNTU).getDefault();
         } catch (final IOException ioe) {
-            System.err.println("Caught: "+ioe.getMessage());
-            ioe.printStackTrace();
+            throw new RuntimeException(ioe);
         }
         sceneUIController = new SceneUIController(sceneDist, zNear, zFar);
         screenshot = new GLReadBufferUtil(false, false);
@@ -704,8 +703,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         try {
             font = FontFactory.get(fontSet).getDefault();
         } catch (final IOException ioe) {
-            System.err.println("Caught: "+ioe.getMessage());
-            ioe.printStackTrace();
+            throw new RuntimeException(ioe);
         }
 
         renderer = RegionRenderer.create(rs, RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable);