Typecast: Assign _glyphIndex w/ ctor argument (+ code cleanup)

1 files changed, 17 insertions, 10 deletions

diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfDescript.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfDescript.java
index 2a8deaeeb..45d06e8cb 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfDescript.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfDescript.java
@@ -67,19 +67,20 @@ public abstract class GlyfDescript extends Program implements GlyphDescription {
     static final byte yDual = 0x20;
 
     final GlyfTable _parentTable;
-    private int _glyphIndex;
+    private final int _glyphIndex;
     private final int _numberOfContours;
-    private short _xMin;
-    private short _yMin;
-    private short _xMax;
-    private short _yMax;
+    private final short _xMin;
+    private final short _yMin;
+    private final short _xMax;
+    private final short _yMax;
 
     GlyfDescript(
-            GlyfTable parentTable,
-            int glyphIndex,
-            short numberOfContours,
-            DataInput di) throws IOException {
+            final GlyfTable parentTable,
+            final int glyphIndex,
+            final short numberOfContours,
+            final DataInput di) throws IOException {
         _parentTable = parentTable;
+        _glyphIndex = glyphIndex;
         _numberOfContours = numberOfContours;
         _xMin = di.readShort();
         _yMin = di.readShort();
@@ -91,26 +92,32 @@ public abstract class GlyfDescript extends Program implements GlyphDescription {
         return _numberOfContours;
     }
 
+    @Override
     public int getGlyphIndex() {
         return _glyphIndex;
     }
 
+    @Override
     public short getXMaximum() {
         return _xMax;
     }
 
+    @Override
     public short getXMinimum() {
         return _xMin;
     }
 
+    @Override
     public short getYMaximum() {
         return _yMax;
     }
 
+    @Override
     public short getYMinimum() {
         return _yMin;
     }
-    
+
+    @Override
     public String toString() {
         return "          numberOfContours: " + _numberOfContours +
                 "\n          xMin:             " + _xMin +