aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/graph/font
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes/jogamp/graph/font')
-rw-r--r--src/jogl/classes/jogamp/graph/font/JavaFontLoader.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java14
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastFontConstructor.java4
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java8
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java6
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/OTFont.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/BaseTable.java13
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CffTable.java14
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CharstringType2.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat1.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat2.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat0.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat2.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat4.java4
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat6.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormatUnknown.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapIndexEntry.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat1.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat2.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/CvtTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/DirectoryEntry.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/DsigTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/FpgmTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspRange.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfCompositeDescript.java7
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfDescript.java6
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfSimpleDescript.java8
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfTable.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GposTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/GsubTable.java4
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/HdmxTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/HeadTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/HheaTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/HmtxTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat0.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat2.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernTable.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/LigatureSubstFormat1.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/LocaTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/LtshTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/MaxpTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameRecord.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameTable.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/Os2Table.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/Panose.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/PcltTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/PostTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/PrepTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/SignatureBlock.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat1.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat2.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/TableDirectory.java1
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/VdmxTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/VheaTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/ot/table/VmtxTable.java3
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/tt/engine/Parser.java1
60 files changed, 203 insertions, 0 deletions
diff --git a/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java b/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java
index 5978e937d..e3df0af1d 100644
--- a/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java
+++ b/src/jogl/classes/jogamp/graph/font/JavaFontLoader.java
@@ -66,6 +66,7 @@ public class JavaFontLoader implements FontSet {
private JavaFontLoader() {
final String javaHome = AccessController.doPrivileged(new PrivilegedAction<String>() {
+ @Override
public String run() {
return System.getProperty("java.home");
}
@@ -81,10 +82,12 @@ public class JavaFontLoader implements FontSet {
return 0 != ( bits & bit ) ;
}
+ @Override
public Font getDefault() throws IOException {
return get(FAMILY_REGULAR, 0) ; // Sans Serif Regular
}
+ @Override
public Font get(int family, int style) throws IOException {
Font font = (Font)fontMap.get( ( family << 8 ) | style );
if (font != null) {
diff --git a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
index 254583739..9096f7d16 100644
--- a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
+++ b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
@@ -71,10 +71,12 @@ public class UbuntuFontLoader implements FontSet {
return 0 != ( bits & bit ) ;
}
+ @Override
public Font getDefault() throws IOException {
return get(FAMILY_REGULAR, 0) ; // Sans Serif Regular
}
+ @Override
public Font get(int family, int style) throws IOException {
Font font = (Font)fontMap.get( ( family << 8 ) | style );
if (font != null) {
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
index ba6c72650..67ae6c387 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
@@ -148,25 +148,31 @@ class TypecastFont implements FontInt {
char2Glyph = new IntObjectHashMap(cmapentries + cmapentries/4);
}
+ @Override
public StringBuilder getName(StringBuilder sb, int nameIndex) {
return font.getName(nameIndex, sb);
}
+ @Override
public String getName(int nameIndex) {
return getName(null, nameIndex).toString();
}
+ @Override
public StringBuilder getAllNames(StringBuilder sb, String separator) {
return font.getAllNames(sb, separator);
}
+ @Override
public StringBuilder getFullFamilyName(StringBuilder sb) {
sb = getName(sb, Font.NAME_FAMILY).append("-");
getName(sb, Font.NAME_SUBFAMILY);
return sb;
}
+ @Override
public float getAdvanceWidth(int i, float pixelSize) {
return font.getHmtxTable().getAdvanceWidth(i) * metrics.getScale(pixelSize);
}
+ @Override
public Metrics getMetrics() {
if (metrics == null) {
metrics = new TypecastHMetrics(this);
@@ -174,6 +180,7 @@ class TypecastFont implements FontInt {
return metrics;
}
+ @Override
public Glyph getGlyph(char symbol) {
TypecastGlyph result = (TypecastGlyph) char2Glyph.get(symbol);
if (null == result) {
@@ -219,11 +226,13 @@ class TypecastFont implements FontInt {
return result;
}
+ @Override
public ArrayList<OutlineShape> getOutlineShapes(CharSequence string, float pixelSize, Factory<? extends Vertex> vertexFactory) {
AffineTransform transform = new AffineTransform(vertexFactory);
return TypecastRenderer.getOutlineShapes(this, string, pixelSize, transform, vertexFactory);
}
+ @Override
public float getStringWidth(CharSequence string, float pixelSize) {
float width = 0;
final int len = string.length();
@@ -241,6 +250,7 @@ class TypecastFont implements FontInt {
return (int)(width + 0.5f);
}
+ @Override
public float getStringHeight(CharSequence string, float pixelSize) {
int height = 0;
@@ -257,6 +267,7 @@ class TypecastFont implements FontInt {
return height;
}
+ @Override
public AABBox getStringBounds(CharSequence string, float pixelSize) {
if (string == null) {
return new AABBox();
@@ -287,14 +298,17 @@ class TypecastFont implements FontInt {
return new AABBox(0, 0, 0, totalWidth, totalHeight,0);
}
+ @Override
final public int getNumGlyphs() {
return font.getNumGlyphs();
}
+ @Override
public boolean isPrintableChar( char c ) {
return FontFactory.isPrintableChar(c);
}
+ @Override
public String toString() {
return getFullFamilyName(null).toString();
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFontConstructor.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFontConstructor.java
index 77b5a9aa9..d7db981b0 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFontConstructor.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFontConstructor.java
@@ -43,8 +43,10 @@ import com.jogamp.graph.font.Font;
public class TypecastFontConstructor implements FontConstructor {
+ @Override
public Font create(final File ffile) throws IOException {
Object o = AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ @Override
public Object run() {
OTFontCollection fontset;
try {
@@ -64,8 +66,10 @@ public class TypecastFontConstructor implements FontConstructor {
throw new InternalError("Unexpected Object: "+o);
}
+ @Override
public Font create(final URLConnection fconn) throws IOException {
return AccessController.doPrivileged(new PrivilegedAction<Font>() {
+ @Override
public Font run() {
File tf = null;
int len=0;
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
index 476b3fd4e..574aeb86d 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
@@ -79,6 +79,7 @@ public class TypecastGlyph implements FontInt.GlyphInt {
return fo.floatValue();
}
+ @Override
public String toString()
{
return "\nAdvance:"+
@@ -122,6 +123,7 @@ public class TypecastGlyph implements FontInt.GlyphInt {
return this.advance.get(size, useFrationalMetrics);
}
+ @Override
public String toString()
{
return "\nMetrics:"+
@@ -173,10 +175,12 @@ public class TypecastGlyph implements FontInt.GlyphInt {
this.metrics.reset();
}
+ @Override
public Font getFont() {
return this.font;
}
+ @Override
public char getSymbol() {
return this.symbol;
}
@@ -201,6 +205,7 @@ public class TypecastGlyph implements FontInt.GlyphInt {
return this.metrics.getScale(pixelSize);
}
+ @Override
public AABBox getBBox(float pixelSize) {
final float size = getScale(pixelSize);
AABBox newBox = getBBox().clone();
@@ -212,14 +217,17 @@ public class TypecastGlyph implements FontInt.GlyphInt {
this.metrics.addAdvance(advance, size);
}
+ @Override
public float getAdvance(float pixelSize, boolean useFrationalMetrics) {
return this.metrics.getAdvance(pixelSize, useFrationalMetrics);
}
+ @Override
public Path2D getPath() {
return this.path;
}
+ @Override
public Path2D getPath(float pixelSize) {
final float size = getScale(pixelSize);
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java
index a6ce58ae2..ecc41e438 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java
@@ -61,21 +61,27 @@ class TypecastHMetrics implements Metrics {
bbox = new AABBox(lowx, lowy, 0, highx, highy, 0); // invert
}
+ @Override
public final float getAscent(float pixelSize) {
return getScale(pixelSize) * -hheaTable.getAscender(); // invert
}
+ @Override
public final float getDescent(float pixelSize) {
return getScale(pixelSize) * -hheaTable.getDescender(); // invert
}
+ @Override
public final float getLineGap(float pixelSize) {
return getScale(pixelSize) * -hheaTable.getLineGap(); // invert
}
+ @Override
public final float getMaxExtend(float pixelSize) {
return getScale(pixelSize) * hheaTable.getXMaxExtent();
}
+ @Override
public final float getScale(float pixelSize) {
return pixelSize * unitsPerEM_Inv;
}
+ @Override
public final AABBox getBBox(float pixelSize) {
AABBox res = new AABBox(bbox.getLow(), bbox.getHigh());
res.scale(getScale(pixelSize));
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFont.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFont.java
index 8fc4be92d..7c3b32e2c 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFont.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/OTFont.java
@@ -283,6 +283,7 @@ public class OTFont {
_glyf = (GlyfTable) getTable(Table.glyf);
}
+ @Override
public String toString() {
if (_tableDirectory != null) {
return _tableDirectory.toString();
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/BaseTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/BaseTable.java
index b6626a9cc..60975dd52 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/BaseTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/BaseTable.java
@@ -47,10 +47,12 @@ public class BaseTable implements Table {
_coordinate = di.readShort();
}
+ @Override
public int getBaseCoordFormat() {
return 1;
}
+ @Override
public short getCoordinate() {
return _coordinate;
}
@@ -69,10 +71,12 @@ public class BaseTable implements Table {
_baseCoordPoint = di.readUnsignedShort();
}
+ @Override
public int getBaseCoordFormat() {
return 2;
}
+ @Override
public short getCoordinate() {
return _coordinate;
}
@@ -89,10 +93,12 @@ public class BaseTable implements Table {
_deviceTableOffset = di.readUnsignedShort();
}
+ @Override
public int getBaseCoordFormat() {
return 2;
}
+ @Override
public short getCoordinate() {
return _coordinate;
}
@@ -211,6 +217,7 @@ public class BaseTable implements Table {
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder()
.append("\nBaseScript BaseScriptT").append(Integer.toHexString(_thisOffset))
@@ -273,6 +280,7 @@ public class BaseTable implements Table {
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder()
.append("\nBaseScriptList BaseScriptListT").append(Integer.toHexString(_thisOffset))
@@ -305,6 +313,7 @@ public class BaseTable implements Table {
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder()
.append("\nBaseTagList BaseTagListT").append(Integer.toHexString(_thisOffset))
@@ -338,6 +347,7 @@ public class BaseTable implements Table {
}
}
+ @Override
public String toString() {
return new StringBuilder()
.append("\nAxis AxisT").append(Integer.toHexString(_thisOffset))
@@ -403,10 +413,12 @@ public class BaseTable implements Table {
return String.valueOf(c);
}
+ @Override
public int getType() {
return BASE;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder()
.append("; 'BASE' Table - Baseline\n;-------------------------------------\n\n")
@@ -429,6 +441,7 @@ public class BaseTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CffTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CffTable.java
index 62486fb7f..a36a49923 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CffTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CffTable.java
@@ -164,6 +164,7 @@ public class CffTable implements Table {
return "";
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
Enumeration<Integer> keys = _entries.keys();
@@ -220,6 +221,7 @@ public class CffTable implements Table {
return _data;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("DICT\n");
@@ -254,6 +256,7 @@ public class CffTable implements Table {
return new Dict(getData(), offset, len);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < getCount(); ++i) {
@@ -287,6 +290,7 @@ public class CffTable implements Table {
return name;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < getCount(); ++i) {
@@ -321,6 +325,7 @@ public class CffTable implements Table {
}
}
+ @Override
public String toString() {
int nonStandardBase = CffStandardStrings.standardStrings.length;
StringBuilder sb = new StringBuilder();
@@ -388,10 +393,12 @@ public class CffTable implements Table {
}
}
+ @Override
public int getFormat() {
return 0;
}
+ @Override
public int getSID(int gid) {
if (gid == 0) {
return 0;
@@ -413,10 +420,12 @@ public class CffTable implements Table {
}
}
+ @Override
public int getFormat() {
return 1;
}
+ @Override
public int getSID(int gid) {
if (gid == 0) {
return 0;
@@ -448,10 +457,12 @@ public class CffTable implements Table {
}
}
+ @Override
public int getFormat() {
return 2;
}
+ @Override
public int getSID(int gid) {
if (gid == 0) {
return 0;
@@ -586,10 +597,12 @@ public class CffTable implements Table {
return _charstringsArray[fontIndex].length;
}
+ @Override
public int getType() {
return CFF;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'CFF' Table - Compact Font Format\n---------------------------------\n");
@@ -614,6 +627,7 @@ public class CffTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CharstringType2.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CharstringType2.java
index 93ff60988..7a7b51890 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CharstringType2.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CharstringType2.java
@@ -133,10 +133,12 @@ public class CharstringType2 extends Charstring {
_globalSubrIndex = globalSubrIndex;
}
+ @Override
public int getIndex() {
return _index;
}
+ @Override
public String getName() {
return _name;
}
@@ -223,6 +225,7 @@ public class CharstringType2 extends Charstring {
return _ip < _offset + _length;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
resetIP();
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat1.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat1.java
index 1079aeed4..94910e4f6 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat1.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat1.java
@@ -32,6 +32,7 @@ public class ClassDefFormat1 extends ClassDef {
}
}
+ @Override
public int getFormat() {
return 1;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat2.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat2.java
index 59bc7b329..9906ecfb1 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat2.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/ClassDefFormat2.java
@@ -30,6 +30,7 @@ public class ClassDefFormat2 extends ClassDef {
}
}
+ @Override
public int getFormat() {
return 2;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat.java
index 62ce5ae4c..f7054852a 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat.java
@@ -122,6 +122,7 @@ public abstract class CmapFormat {
public abstract int mapCharCode(int charCode);
+ @Override
public String toString() {
return new StringBuilder()
.append("format: ")
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat0.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat0.java
index 2093158bd..dd1ede232 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat0.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat0.java
@@ -71,10 +71,12 @@ public class CmapFormat0 extends CmapFormat {
}
}
+ @Override
public int getRangeCount() {
return 1;
}
+ @Override
public Range getRange(int index) throws ArrayIndexOutOfBoundsException {
if (index != 0) {
throw new ArrayIndexOutOfBoundsException();
@@ -82,6 +84,7 @@ public class CmapFormat0 extends CmapFormat {
return new Range(0, 255);
}
+ @Override
public int mapCharCode(int charCode) {
if (0 <= charCode && charCode < 256) {
return _glyphIdArray[charCode];
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat2.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat2.java
index 222c93852..d071e9421 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat2.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat2.java
@@ -118,10 +118,12 @@ public class CmapFormat2 extends CmapFormat {
}
}
+ @Override
public int getRangeCount() {
return _subHeaders.length;
}
+ @Override
public Range getRange(int index) throws ArrayIndexOutOfBoundsException {
if (index < 0 || index >= _subHeaders.length) {
throw new ArrayIndexOutOfBoundsException();
@@ -144,6 +146,7 @@ public class CmapFormat2 extends CmapFormat {
_subHeaders[index]._entryCount - 1));
}
+ @Override
public int mapCharCode(int charCode) {
// Get the appropriate subheader
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat4.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat4.java
index ef65867af..2ae23d031 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat4.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat4.java
@@ -110,10 +110,12 @@ public class CmapFormat4 extends CmapFormat {
// }
}
+ @Override
public int getRangeCount() {
return _segCount;
}
+ @Override
public Range getRange(int index) throws ArrayIndexOutOfBoundsException {
if (index < 0 || index >= _segCount) {
throw new ArrayIndexOutOfBoundsException();
@@ -121,6 +123,7 @@ public class CmapFormat4 extends CmapFormat {
return new Range(_startCode[index], _endCode[index]);
}
+ @Override
public int mapCharCode(int charCode) {
try {
for (int i = 0; i < _segCount; i++) {
@@ -142,6 +145,7 @@ public class CmapFormat4 extends CmapFormat {
return 0;
}
+ @Override
public String toString() {
return new StringBuilder()
.append(super.toString())
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat6.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat6.java
index a22e33244..2a33d8d40 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat6.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormat6.java
@@ -73,14 +73,17 @@ public class CmapFormat6 extends CmapFormat {
//di.skipBytes(_length - 4);
}
+ @Override
public int getRangeCount() {
return 0;
}
+ @Override
public Range getRange(int index) throws ArrayIndexOutOfBoundsException {
throw new ArrayIndexOutOfBoundsException();
}
+ @Override
public int mapCharCode(int charCode) {
return 0;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormatUnknown.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormatUnknown.java
index 3544b6f62..392683bcd 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormatUnknown.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapFormatUnknown.java
@@ -40,14 +40,17 @@ public class CmapFormatUnknown extends CmapFormat {
di.skipBytes(_length - 4);
}
+ @Override
public int getRangeCount() {
return 0;
}
+ @Override
public Range getRange(int index) throws ArrayIndexOutOfBoundsException {
throw new ArrayIndexOutOfBoundsException();
}
+ @Override
public int mapCharCode(int charCode) {
return 0;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapIndexEntry.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapIndexEntry.java
index 47f6c470d..4833318d5 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapIndexEntry.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapIndexEntry.java
@@ -90,6 +90,7 @@ public class CmapIndexEntry implements Comparable {
_format = format;
}
+ @Override
public String toString() {
return new StringBuilder()
.append("platform id: ")
@@ -104,6 +105,7 @@ public class CmapIndexEntry implements Comparable {
.append(_offset).toString();
}
+ @Override
public int compareTo(java.lang.Object obj) {
CmapIndexEntry entry = (CmapIndexEntry) obj;
if (getOffset() < entry.getOffset()) {
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapTable.java
index 016efa093..2cdddb3ef 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CmapTable.java
@@ -130,10 +130,12 @@ public class CmapTable implements Table {
return null;
}
+ @Override
public int getType() {
return cmap;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder().append("cmap\n");
@@ -155,6 +157,7 @@ public class CmapTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat1.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat1.java
index 712da54df..715bf11ec 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat1.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat1.java
@@ -72,10 +72,12 @@ public class CoverageFormat1 extends Coverage {
}
}
+ @Override
public int getFormat() {
return 1;
}
+ @Override
public int findGlyph(int glyphId) {
for (int i = 0; i < _glyphCount; i++) {
if (_glyphIds[i] == glyphId) {
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat2.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat2.java
index 7196ed595..bd2a28f79 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat2.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CoverageFormat2.java
@@ -72,10 +72,12 @@ public class CoverageFormat2 extends Coverage {
}
}
+ @Override
public int getFormat() {
return 2;
}
+ @Override
public int findGlyph(int glyphId) {
for (int i = 0; i < _rangeCount; i++) {
int n = _rangeRecords[i].getCoverageIndex(glyphId);
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CvtTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CvtTable.java
index 867ef1823..9e1c47de9 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CvtTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/CvtTable.java
@@ -29,6 +29,7 @@ public class CvtTable implements Table {
}
}
+ @Override
public int getType() {
return cvt;
}
@@ -37,6 +38,7 @@ public class CvtTable implements Table {
return values;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'cvt ' Table - Control Value Table\n----------------------------------\n");
@@ -54,6 +56,7 @@ public class CvtTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DirectoryEntry.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DirectoryEntry.java
index 7abcec0ce..e34fa32e8 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DirectoryEntry.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DirectoryEntry.java
@@ -71,6 +71,7 @@ public class DirectoryEntry implements Cloneable {
_length = di.readInt();
}
+ @Override
public Object clone() {
try {
return super.clone();
@@ -104,6 +105,7 @@ public class DirectoryEntry implements Cloneable {
.toString();
}
+ @Override
public String toString() {
return new StringBuilder()
.append("'").append(getTagAsString())
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DsigTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DsigTable.java
index f25c595d0..2b85f52d8 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DsigTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/DsigTable.java
@@ -45,6 +45,7 @@ public class DsigTable implements Table {
* Get the table type, as a table directory value.
* @return The table type
*/
+ @Override
public int getType() {
return DSIG;
}
@@ -55,10 +56,12 @@ public class DsigTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder().append("DSIG\n");
for (int i = 0; i < numSigs; i++) {
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/FpgmTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/FpgmTable.java
index b662265d9..467a4f360 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/FpgmTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/FpgmTable.java
@@ -26,10 +26,12 @@ public class FpgmTable extends Program implements Table {
readInstructions(di, de.getLength());
}
+ @Override
public int getType() {
return fpgm;
}
+ @Override
public String toString() {
return Disassembler.disassemble(getInstructions(), 0);
}
@@ -40,6 +42,7 @@ public class FpgmTable extends Program implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspRange.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspRange.java
index cf4afa88e..cc87b19a4 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspRange.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspRange.java
@@ -30,6 +30,7 @@ public class GaspRange {
rangeGaspBehavior = di.readUnsignedShort();
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(" rangeMaxPPEM: ").append(rangeMaxPPEM)
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspTable.java
index 45498eda1..8f91e6d00 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GaspTable.java
@@ -34,10 +34,12 @@ public class GaspTable implements Table {
}
}
+ @Override
public int getType() {
return gasp;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'gasp' Table - Grid-fitting And Scan-conversion Procedure\n---------------------------------------------------------");
@@ -56,6 +58,7 @@ public class GaspTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfCompositeDescript.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfCompositeDescript.java
index 50f62ed62..50e0fa339 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfCompositeDescript.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfCompositeDescript.java
@@ -99,6 +99,7 @@ public class GlyfCompositeDescript extends GlyfDescript {
}
}
+ @Override
public int getEndPtOfContours(int i) {
GlyfCompositeComp c = getCompositeCompEndPt(i);
if (c != null) {
@@ -108,6 +109,7 @@ public class GlyfCompositeDescript extends GlyfDescript {
return 0;
}
+ @Override
public byte getFlags(int i) {
GlyfCompositeComp c = getCompositeComp(i);
if (c != null) {
@@ -117,6 +119,7 @@ public class GlyfCompositeDescript extends GlyfDescript {
return 0;
}
+ @Override
public short getXCoordinate(int i) {
GlyfCompositeComp c = getCompositeComp(i);
if (c != null) {
@@ -131,6 +134,7 @@ public class GlyfCompositeDescript extends GlyfDescript {
return 0;
}
+ @Override
public short getYCoordinate(int i) {
GlyfCompositeComp c = getCompositeComp(i);
if (c != null) {
@@ -145,10 +149,12 @@ public class GlyfCompositeDescript extends GlyfDescript {
return 0;
}
+ @Override
public boolean isComposite() {
return true;
}
+ @Override
public int getPointCount() {
GlyfCompositeComp c = _components.get(_components.size()-1);
GlyphDescription gd = _parentTable.getDescription(c.getGlyphIndex());
@@ -159,6 +165,7 @@ public class GlyfCompositeDescript extends GlyfDescript {
}
}
+ @Override
public int getContourCount() {
GlyfCompositeComp c = _components.get(_components.size()-1);
return c.getFirstContour() + _parentTable.getDescription(c.getGlyphIndex()).getContourCount();
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 a7e2e7b69..6b06eb3de 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
@@ -92,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 new StringBuilder()
.append(" numberOfContours: ").append(_numberOfContours)
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfSimpleDescript.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfSimpleDescript.java
index f67162cff..c06ceaa13 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfSimpleDescript.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfSimpleDescript.java
@@ -92,30 +92,37 @@ public class GlyfSimpleDescript extends GlyfDescript {
readCoords(_count, di);
}
+ @Override
public int getEndPtOfContours(int i) {
return _endPtsOfContours[i];
}
+ @Override
public byte getFlags(int i) {
return _flags[i];
}
+ @Override
public short getXCoordinate(int i) {
return _xCoordinates[i];
}
+ @Override
public short getYCoordinate(int i) {
return _yCoordinates[i];
}
+ @Override
public boolean isComposite() {
return false;
}
+ @Override
public int getPointCount() {
return _count;
}
+ @Override
public int getContourCount() {
return getNumberOfContours();
}
@@ -185,6 +192,7 @@ public class GlyfSimpleDescript extends GlyfDescript {
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(super.toString());
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfTable.java
index 34a8218d9..4b196c9e2 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GlyfTable.java
@@ -116,6 +116,7 @@ public class GlyfTable implements Table {
}
}
+ @Override
public int getType() {
return glyf;
}
@@ -126,6 +127,7 @@ public class GlyfTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GposTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GposTable.java
index 9a367412d..30ecdd051 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GposTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GposTable.java
@@ -45,10 +45,12 @@ public class GposTable implements Table {
/** Get the table type, as a table directory value.
* @return The table type
*/
+ @Override
public int getType() {
return GPOS;
}
+ @Override
public String toString() {
return "GPOS";
}
@@ -59,6 +61,7 @@ public class GposTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GsubTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GsubTable.java
index 0351c903d..c23d420a8 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GsubTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/GsubTable.java
@@ -99,6 +99,7 @@ public class GsubTable implements Table, LookupSubtableFactory {
* 5 - Context - Replace one or more glyphs in context
* 6 - Chaining - Context Replace one or more glyphs in chained context
*/
+ @Override
public LookupSubtable read(
int type,
DataInputStream dis,
@@ -130,6 +131,7 @@ public class GsubTable implements Table, LookupSubtableFactory {
/** Get the table type, as a table directory value.
* @return The table type
*/
+ @Override
public int getType() {
return GSUB;
}
@@ -146,6 +148,7 @@ public class GsubTable implements Table, LookupSubtableFactory {
return _lookupList;
}
+ @Override
public String toString() {
return "GSUB";
}
@@ -174,6 +177,7 @@ public class GsubTable implements Table, LookupSubtableFactory {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HdmxTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HdmxTable.java
index 42f9bf0d0..64f5e6415 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HdmxTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HdmxTable.java
@@ -93,10 +93,12 @@ public class HdmxTable implements Table {
return _records[i];
}
+ @Override
public int getType() {
return hdmx;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'hdmx' Table - Horizontal Device Metrics\n----------------------------------------\n");
@@ -124,6 +126,7 @@ public class HdmxTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HeadTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HeadTable.java
index cf7c58449..47e60f900 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HeadTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HeadTable.java
@@ -142,6 +142,7 @@ public class HeadTable implements Table {
return _modified;
}
+ @Override
public int getType() {
return head;
}
@@ -170,6 +171,7 @@ public class HeadTable implements Table {
return _yMin;
}
+ @Override
public String toString() {
return new StringBuilder()
.append("'head' Table - Font Header\n--------------------------")
@@ -199,6 +201,7 @@ public class HeadTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HheaTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HheaTable.java
index 0278929f1..242c9b139 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HheaTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HheaTable.java
@@ -92,6 +92,7 @@ public class HheaTable implements Table {
return numberOfHMetrics;
}
+ @Override
public int getType() {
return hhea;
}
@@ -100,6 +101,7 @@ public class HheaTable implements Table {
return xMaxExtent;
}
+ @Override
public String toString() {
return new StringBuilder()
.append("'hhea' Table - Horizontal Header\n--------------------------------")
@@ -129,6 +131,7 @@ public class HheaTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HmtxTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HmtxTable.java
index dacd9e265..122a0a826 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HmtxTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/HmtxTable.java
@@ -106,10 +106,12 @@ public class HmtxTable implements Table {
}
}
+ @Override
public int getType() {
return hmtx;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'hmtx' Table - Horizontal Metrics\n---------------------------------\n");
@@ -135,6 +137,7 @@ public class HmtxTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat0.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat0.java
index 89e6f9f11..1e7ff8c2d 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat0.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat0.java
@@ -36,10 +36,12 @@ public class KernSubtableFormat0 extends KernSubtable {
}
}
+ @Override
public int getKerningPairCount() {
return nPairs;
}
+ @Override
public KerningPair getKerningPair(int i) {
return kerningPairs[i];
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat2.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat2.java
index 6f5e1f5e8..9c7fc81f9 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat2.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernSubtableFormat2.java
@@ -31,10 +31,12 @@ public class KernSubtableFormat2 extends KernSubtable {
array = di.readUnsignedShort();
}
+ @Override
public int getKerningPairCount() {
return 0;
}
+ @Override
public KerningPair getKerningPair(int i) {
return null;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernTable.java
index 1d526865a..006a86895 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/KernTable.java
@@ -45,6 +45,7 @@ public class KernTable implements Table {
/** Get the table type, as a table directory value.
* @return The table type
*/
+ @Override
public int getType() {
return kern;
}
@@ -55,6 +56,7 @@ public class KernTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LigatureSubstFormat1.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LigatureSubstFormat1.java
index cad5e106a..1979ea586 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LigatureSubstFormat1.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LigatureSubstFormat1.java
@@ -89,6 +89,7 @@ public class LigatureSubstFormat1 extends LigatureSubst {
return 1;
}
+ @Override
public String getTypeAsString() {
return "LigatureSubstFormat1";
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LocaTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LocaTable.java
index ce0862eea..2c7079fec 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LocaTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LocaTable.java
@@ -49,10 +49,12 @@ public class LocaTable implements Table {
return _offsets[i] * _factor;
}
+ @Override
public int getType() {
return loca;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'loca' Table - Index To Location Table\n--------------------------------------\n")
@@ -71,6 +73,7 @@ public class LocaTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LtshTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LtshTable.java
index 9b0c8e6b4..47874cc56 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LtshTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/LtshTable.java
@@ -38,10 +38,12 @@ public class LtshTable implements Table {
* Get the table type, as a table directory value.
* @return The table type
*/
+ @Override
public int getType() {
return LTSH;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'LTSH' Table - Linear Threshold Table\n-------------------------------------")
@@ -61,6 +63,7 @@ public class LtshTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/MaxpTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/MaxpTable.java
index 5ab6b51ca..abb6047fc 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/MaxpTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/MaxpTable.java
@@ -121,10 +121,12 @@ public class MaxpTable implements Table {
return numGlyphs;
}
+ @Override
public int getType() {
return maxp;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'maxp' Table - Maximum Profile\n------------------------------")
@@ -156,6 +158,7 @@ public class MaxpTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameRecord.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameRecord.java
index 9f9822986..a1787e3e7 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameRecord.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameRecord.java
@@ -130,6 +130,7 @@ public class NameRecord {
_record = sb.toString();
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameTable.java
index 5b7a17d3b..ad8198b7f 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/NameTable.java
@@ -130,6 +130,7 @@ public class NameTable implements Table {
return sb;
}
+ @Override
public int getType() {
return name;
}
@@ -140,6 +141,7 @@ public class NameTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Os2Table.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Os2Table.java
index 9dfbceb99..5340b297c 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Os2Table.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Os2Table.java
@@ -293,10 +293,12 @@ public class Os2Table implements Table {
return _usMaxContext;
}
+ @Override
public int getType() {
return OS_2;
}
+ @Override
public String toString() {
return new StringBuilder()
.append("'OS/2' Table - OS/2 and Windows Metrics\n---------------------------------------")
@@ -351,6 +353,7 @@ public class Os2Table implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Panose.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Panose.java
index 1f6c5a1dd..771318108 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Panose.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/Panose.java
@@ -79,6 +79,7 @@ public class Panose {
return bXHeight;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(String.valueOf(bFamilyType)).append(" ")
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PcltTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PcltTable.java
index 6ed9b2b9c..a1f603d8f 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PcltTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PcltTable.java
@@ -65,10 +65,12 @@ public class PcltTable implements Table {
* Get the table type, as a table directory value.
* @return The table type
*/
+ @Override
public int getType() {
return PCLT;
}
+ @Override
public String toString() {
return new StringBuilder()
.append("'PCLT' Table - Printer Command Language Table\n---------------------------------------------")
@@ -98,6 +100,7 @@ public class PcltTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PostTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PostTable.java
index 46f1ac088..188b441ac 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PostTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PostTable.java
@@ -370,10 +370,12 @@ public class PostTable implements Table {
/** Get the table type, as a table directory value.
* @return The table type
*/
+ @Override
public int getType() {
return post;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'post' Table - PostScript Metrics\n---------------------------------\n")
@@ -416,6 +418,7 @@ public class PostTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PrepTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PrepTable.java
index 2046d7fe4..4c64673b7 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PrepTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/PrepTable.java
@@ -26,10 +26,12 @@ public class PrepTable extends Program implements Table {
readInstructions(di, de.getLength());
}
+ @Override
public int getType() {
return prep;
}
+ @Override
public String toString() {
return Disassembler.disassemble(getInstructions(), 0);
}
@@ -40,6 +42,7 @@ public class PrepTable extends Program implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SignatureBlock.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SignatureBlock.java
index 15f0cd04f..31a2d17c9 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SignatureBlock.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SignatureBlock.java
@@ -32,6 +32,7 @@ public class SignatureBlock {
di.readFully(signature);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < signatureLen; i += 16) {
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat1.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat1.java
index a8df78504..e97e62a58 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat1.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat1.java
@@ -73,10 +73,12 @@ public class SingleSubstFormat1 extends SingleSubst {
_coverage = Coverage.read(dis);
}
+ @Override
public int getFormat() {
return 1;
}
+ @Override
public int substitute(int glyphId) {
int i = _coverage.findGlyph(glyphId);
if (i > -1) {
@@ -85,6 +87,7 @@ public class SingleSubstFormat1 extends SingleSubst {
return glyphId;
}
+ @Override
public String getTypeAsString() {
return "SingleSubstFormat1";
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat2.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat2.java
index 2e47b2924..4d46b07b4 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat2.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/SingleSubstFormat2.java
@@ -78,10 +78,12 @@ public class SingleSubstFormat2 extends SingleSubst {
_coverage = Coverage.read(dis);
}
+ @Override
public int getFormat() {
return 2;
}
+ @Override
public int substitute(int glyphId) {
int i = _coverage.findGlyph(glyphId);
if (i > -1) {
@@ -90,6 +92,7 @@ public class SingleSubstFormat2 extends SingleSubst {
return glyphId;
}
+ @Override
public String getTypeAsString() {
return "SingleSubstFormat2";
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/TableDirectory.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/TableDirectory.java
index 8c5678088..23ecba804 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/TableDirectory.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/TableDirectory.java
@@ -113,6 +113,7 @@ public class TableDirectory {
return _version;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder()
.append("Offset Table\n------ -----")
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VdmxTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VdmxTable.java
index 28f9aa6e3..bebd7f946 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VdmxTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VdmxTable.java
@@ -148,10 +148,12 @@ public class VdmxTable implements Table {
}
}
+ @Override
public int getType() {
return VDMX;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'VDMX' Table - Precomputed Vertical Device Metrics\n")
@@ -191,6 +193,7 @@ public class VdmxTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VheaTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VheaTable.java
index f42da119b..521b87cc8 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VheaTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VheaTable.java
@@ -105,6 +105,7 @@ public class VheaTable implements Table {
return _numberOfLongVerMetrics;
}
+ @Override
public int getType() {
return vhea;
}
@@ -113,6 +114,7 @@ public class VheaTable implements Table {
return _yMaxExtent;
}
+ @Override
public String toString() {
return new StringBuilder()
.append("'vhea' Table - Vertical Header\n------------------------------")
@@ -142,6 +144,7 @@ public class VheaTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VmtxTable.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VmtxTable.java
index 348405380..1b77a6fdc 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VmtxTable.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/table/VmtxTable.java
@@ -77,10 +77,12 @@ public class VmtxTable implements Table {
}
}
+ @Override
public int getType() {
return vmtx;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("'vmtx' Table - Vertical Metrics\n-------------------------------\n");
@@ -106,6 +108,7 @@ public class VmtxTable implements Table {
* particular table.
* @return A directory entry
*/
+ @Override
public DirectoryEntry getDirectoryEntry() {
return _de;
}
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/tt/engine/Parser.java b/src/jogl/classes/jogamp/graph/font/typecast/tt/engine/Parser.java
index c5a2b6e87..1159b2c17 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/tt/engine/Parser.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/tt/engine/Parser.java
@@ -148,6 +148,7 @@ public class Parser {
instructions[2] = program;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
int ip = 0;