geomerative 0.4.3-java → 2.1.0-java

data/src/org/apache/batik/svggen/font/table/ClassDefFormat2.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  *
@@ -27,23 +27,26 @@ import org.apache.batik.svggen.font.*;
  */
 public class ClassDefFormat2 extends ClassDef {
 
-    private final int classRangeCount;
-    private final RangeRecord[] classRangeRecords;
-
-    /** Creates new ClassDefFormat2
-     * @param raf
-     * @throws java.io.IOException */
-    public ClassDefFormat2(RandomAccessFileEmulator raf) throws IOException {
-        classRangeCount = raf.readUnsignedShort();
-        classRangeRecords = new RangeRecord[classRangeCount];
-        for (int i = 0; i < classRangeCount; i++) {
-            classRangeRecords[i] = new RangeRecord(raf);
-        }
+  private final int classRangeCount;
+  private final RangeRecord[] classRangeRecords;
+
+  /**
+   * Creates new ClassDefFormat2
+   *
+   * @param raf
+   * @throws java.io.IOException
+   */
+  public ClassDefFormat2(RandomAccessFileEmulator raf) throws IOException {
+    classRangeCount = raf.readUnsignedShort();
+    classRangeRecords = new RangeRecord[classRangeCount];
+    for (int i = 0; i < classRangeCount; i++) {
+      classRangeRecords[i] = new RangeRecord(raf);
     }
+  }
 
-    @Override
-    public int getFormat() {
-        return 2;
-    }
+  @Override
+  public int getFormat() {
+    return 2;
+  }
 
 }

data/src/org/apache/batik/svggen/font/table/CmapFormat.java

@@ -18,8 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
-
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapFormat.java,v 1.4 2004/09/01 09:35:23 deweese Exp $
@@ -27,55 +26,56 @@ import org.apache.batik.svggen.font.*;
  */
 public abstract class CmapFormat {
 
-    protected int format;
-    protected int length;
-    protected int version;
+  protected int format;
+  protected int length;
+  protected int version;
 
-    protected CmapFormat(RandomAccessFileEmulator raf) throws IOException {
-        length = raf.readUnsignedShort();
-        version = raf.readUnsignedShort();
-    }
+  protected CmapFormat(RandomAccessFileEmulator raf) throws IOException {
+    length = raf.readUnsignedShort();
+    version = raf.readUnsignedShort();
+  }
 
-    protected static CmapFormat create(int format, RandomAccessFileEmulator raf)
+  protected static CmapFormat create(int format, RandomAccessFileEmulator raf)
     throws IOException {
-        switch(format) {
-            case 0:
-            return new CmapFormat0(raf);
-            case 2:
-            return new CmapFormat2(raf);
-            case 4:
-            return new CmapFormat4(raf);
-            case 6:
-            return new CmapFormat6(raf);
-        }
-        return null;
+    switch (format) {
+      case 0:
+        return new CmapFormat0(raf);
+      case 2:
+        return new CmapFormat2(raf);
+      case 4:
+        return new CmapFormat4(raf);
+      case 6:
+        return new CmapFormat6(raf);
     }
+    return null;
+  }
 
-    public int getFormat() {
-        return format;
-    }
+  public int getFormat() {
+    return format;
+  }
 
-    public int getLength() {
-        return length;
-    }
+  public int getLength() {
+    return length;
+  }
 
-    public int getVersion() {
-        return version;
-    }
+  public int getVersion() {
+    return version;
+  }
 
-    public abstract int mapCharCode(int charCode);
+  public abstract int mapCharCode(int charCode);
 
-    public abstract int getFirst();
-    public abstract int getLast();
+  public abstract int getFirst();
 
-    @Override
-    public String toString() {
-        return new StringBuilder()
-        .append("format: ")
-        .append(format)
-        .append(", length: ")
-        .append(length)
-        .append(", version: ")
-        .append(version).toString();
-    }
+  public abstract int getLast();
+
+  @Override
+  public String toString() {
+    return new StringBuilder()
+      .append("format: ")
+      .append(format)
+      .append(", length: ")
+      .append(length)
+      .append(", version: ")
+      .append(version).toString();
+  }
 }

data/src/org/apache/batik/svggen/font/table/CmapFormat0.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * Simple Macintosh cmap table, mapping only the ASCII character set to glyphs.
@@ -28,33 +28,40 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapFormat0 extends CmapFormat {
 
-    private final int[] glyphIdArray = new int[256];
-    private int first, last;
-
-    protected CmapFormat0(RandomAccessFileEmulator raf) throws IOException {
-        super(raf);
-        format = 0;
-        first = -1;
-        for (int i = 0; i < 256; i++) {
-            glyphIdArray[i] = raf.readUnsignedByte();
-            if (glyphIdArray[i] > 0) {
-                if (first == -1) first = i;
-                last = i;
-            }
+  private final int[] glyphIdArray = new int[256];
+  private int first, last;
+
+  protected CmapFormat0(RandomAccessFileEmulator raf) throws IOException {
+    super(raf);
+    format = 0;
+    first = -1;
+    for (int i = 0; i < 256; i++) {
+      glyphIdArray[i] = raf.readUnsignedByte();
+      if (glyphIdArray[i] > 0) {
+        if (first == -1) {
+          first = i;
         }
+        last = i;
+      }
     }
+  }
 
-    @Override
-    public int getFirst() { return first; }
-    @Override
-    public int getLast()  { return last; }
-
-    @Override
-    public int mapCharCode(int charCode) {
-        if (0 <= charCode && charCode < 256) {
-            return glyphIdArray[charCode];
-        } else {
-            return 0;
-        }
+  @Override
+  public int getFirst() {
+    return first;
+  }
+
+  @Override
+  public int getLast() {
+    return last;
+  }
+
+  @Override
+  public int mapCharCode(int charCode) {
+    if (0 <= charCode && charCode < 256) {
+      return glyphIdArray[charCode];
+    } else {
+      return 0;
     }
+  }
 }

data/src/org/apache/batik/svggen/font/table/CmapFormat2.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapFormat2.java,v 1.4 2004/09/01 09:35:23 deweese Exp $
@@ -26,23 +26,28 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapFormat2 extends CmapFormat {
 
-    private final short[] subHeaderKeys = new short[256];
-    private int[] subHeaders1;
-    private int[] subHeaders2;
-    private short[] glyphIndexArray;
-
-    protected CmapFormat2(RandomAccessFileEmulator raf) throws IOException {
-        super(raf);
-        format = 2;
-    }
-
-    @Override
-    public int getFirst() { return 0; }
-    @Override
-    public int getLast()  { return 0; }
-    
-    @Override
-    public int mapCharCode(int charCode) {
-        return 0;
-    }
+  private final short[] subHeaderKeys = new short[256];
+  private int[] subHeaders1;
+  private int[] subHeaders2;
+  private short[] glyphIndexArray;
+
+  protected CmapFormat2(RandomAccessFileEmulator raf) throws IOException {
+    super(raf);
+    format = 2;
+  }
+
+  @Override
+  public int getFirst() {
+    return 0;
+  }
+
+  @Override
+  public int getLast() {
+    return 0;
+  }
+
+  @Override
+  public int mapCharCode(int charCode) {
+    return 0;
+  }
 }

data/src/org/apache/batik/svggen/font/table/CmapFormat4.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapFormat4.java,v 1.6 2004/09/01 09:35:23 deweese Exp $
@@ -26,65 +26,74 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapFormat4 extends CmapFormat {
 
-    public  int language;
-    private final int segCountX2;
-    private final int searchRange;
-    private final int entrySelector;
-    private final int rangeShift;
-    private final int[] endCode;
-    private final int[] startCode;
-    private final int[] idDelta;
-    private final int[] idRangeOffset;
-    private final int[] glyphIdArray;
-    private final int segCount;
-    private int first, last;
+  public int language;
+  private final int segCountX2;
+  private final int searchRange;
+  private final int entrySelector;
+  private final int rangeShift;
+  private final int[] endCode;
+  private final int[] startCode;
+  private final int[] idDelta;
+  private final int[] idRangeOffset;
+  private final int[] glyphIdArray;
+  private final int segCount;
+  private int first, last;
 
-    protected CmapFormat4(RandomAccessFileEmulator raf) throws IOException {
-        super(raf);
-        format = 4;
-        segCountX2 = raf.readUnsignedShort();
-        segCount = segCountX2 / 2;
-        endCode = new int[segCount];
-        startCode = new int[segCount];
-        idDelta = new int[segCount];
-        idRangeOffset = new int[segCount];
-        searchRange = raf.readUnsignedShort();
-        entrySelector = raf.readUnsignedShort();
-        rangeShift = raf.readUnsignedShort();
-        last = -1;
-        for (int i = 0; i < segCount; i++) {
-            endCode[i] = raf.readUnsignedShort();
-            if (endCode[i] > last) last = endCode[i];
-        }
-        raf.readUnsignedShort(); // reservePad
-        for (int i = 0; i < segCount; i++) {
-            startCode[i] = raf.readUnsignedShort();
-            if ((i==0 ) || (startCode[i] < first)) first = startCode[i];
-        }
-        for (int i = 0; i < segCount; i++) {
-            idDelta[i] = raf.readUnsignedShort();
-        }
-        for (int i = 0; i < segCount; i++) {
-            idRangeOffset[i] = raf.readUnsignedShort();
-        }
+  protected CmapFormat4(RandomAccessFileEmulator raf) throws IOException {
+    super(raf);
+    format = 4;
+    segCountX2 = raf.readUnsignedShort();
+    segCount = segCountX2 / 2;
+    endCode = new int[segCount];
+    startCode = new int[segCount];
+    idDelta = new int[segCount];
+    idRangeOffset = new int[segCount];
+    searchRange = raf.readUnsignedShort();
+    entrySelector = raf.readUnsignedShort();
+    rangeShift = raf.readUnsignedShort();
+    last = -1;
+    for (int i = 0; i < segCount; i++) {
+      endCode[i] = raf.readUnsignedShort();
+      if (endCode[i] > last) {
+        last = endCode[i];
+      }
+    }
+    raf.readUnsignedShort(); // reservePad
+    for (int i = 0; i < segCount; i++) {
+      startCode[i] = raf.readUnsignedShort();
+      if ((i == 0) || (startCode[i] < first)) {
+        first = startCode[i];
+      }
+    }
+    for (int i = 0; i < segCount; i++) {
+      idDelta[i] = raf.readUnsignedShort();
+    }
+    for (int i = 0; i < segCount; i++) {
+      idRangeOffset[i] = raf.readUnsignedShort();
+    }
 
-        // Whatever remains of this header belongs in glyphIdArray
-        int count = (length - 16 - (segCount*8)) / 2;
-        glyphIdArray = new int[count];
-        for (int i = 0; i < count; i++) {
-            glyphIdArray[i] = raf.readUnsignedShort();
-        }
+    // Whatever remains of this header belongs in glyphIdArray
+    int count = (length - 16 - (segCount * 8)) / 2;
+    glyphIdArray = new int[count];
+    for (int i = 0; i < count; i++) {
+      glyphIdArray[i] = raf.readUnsignedShort();
     }
+  }
+
+  @Override
+  public int getFirst() {
+    return first;
+  }
 
-    @Override
-    public int getFirst() { return first; }
-    @Override
-    public int getLast()  { return last; }
+  @Override
+  public int getLast() {
+    return last;
+  }
 
-    @Override
-    public int mapCharCode(int charCode) {
-        try {
-            /*
+  @Override
+  public int mapCharCode(int charCode) {
+    try {
+      /*
               Quoting :
               http://developer.apple.com/fonts/TTRefMan/RM06/Chap6cmap.html#Surrogates
                
@@ -98,50 +107,51 @@ public class CmapFormat4 extends CmapFormat {
                
               My comment : Isn't there a typo here ? Shouldn't we
               rather read 65,534 ?
-              */
-            if ((charCode < 0) || (charCode >= 0xFFFE))
-                return 0;
+       */
+      if ((charCode < 0) || (charCode >= 0xFFFE)) {
+        return 0;
+      }
 
-            for (int i = 0; i < segCount; i++) {
-                if (endCode[i] >= charCode) {
-                    if (startCode[i] <= charCode) {
-                        if (idRangeOffset[i] > 0) {
-                            return glyphIdArray[idRangeOffset[i]/2 + 
-                                                (charCode - startCode[i]) -
-                                                (segCount - i)];
-                        } else {
-                            return (idDelta[i] + charCode) % 65536;
-                        }
-                    } else {
-                        break;
-                    }
-                }
+      for (int i = 0; i < segCount; i++) {
+        if (endCode[i] >= charCode) {
+          if (startCode[i] <= charCode) {
+            if (idRangeOffset[i] > 0) {
+              return glyphIdArray[idRangeOffset[i] / 2
+                + (charCode - startCode[i])
+                - (segCount - i)];
+            } else {
+              return (idDelta[i] + charCode) % 65536;
             }
-        } catch (ArrayIndexOutOfBoundsException e) {
-            System.err.println("error: Array out of bounds - " + e.getMessage());
+          } else {
+            break;
+          }
         }
-        return 0;
+      }
+    } catch (ArrayIndexOutOfBoundsException e) {
+      System.err.println("error: Array out of bounds - " + e.getMessage());
     }
+    return 0;
+  }
 
-    @Override
-    public String toString() {
-        return new StringBuilder()
-        .append(super.toString())
-        .append(", segCountX2: ")
-        .append(segCountX2)
-        .append(", searchRange: ")
-        .append(searchRange)
-        .append(", entrySelector: ")
-        .append(entrySelector)
-        .append(", rangeShift: ")
-        .append(rangeShift)
-        .append(", endCode: ")
-        .append(endCode)
-        .append(", startCode: ")
-        .append(endCode)
-        .append(", idDelta: ")
-        .append(idDelta)
-        .append(", idRangeOffset: ")
-        .append(idRangeOffset).toString();
-    }
+  @Override
+  public String toString() {
+    return new StringBuilder()
+      .append(super.toString())
+      .append(", segCountX2: ")
+      .append(segCountX2)
+      .append(", searchRange: ")
+      .append(searchRange)
+      .append(", entrySelector: ")
+      .append(entrySelector)
+      .append(", rangeShift: ")
+      .append(rangeShift)
+      .append(", endCode: ")
+      .append(endCode)
+      .append(", startCode: ")
+      .append(endCode)
+      .append(", idDelta: ")
+      .append(idDelta)
+      .append(", idRangeOffset: ")
+      .append(idRangeOffset).toString();
+  }
 }

data/src/org/apache/batik/svggen/font/table/CmapFormat6.java

@@ -18,7 +18,7 @@
 package org.apache.batik.svggen.font.table;
 
 import java.io.IOException;
-import org.apache.batik.svggen.font.*;
+import org.apache.batik.svggen.font.RandomAccessFileEmulator;
 
 /**
  * @version $Id: CmapFormat6.java,v 1.4 2004/09/01 09:35:23 deweese Exp $
@@ -26,35 +26,39 @@ import org.apache.batik.svggen.font.*;
  */
 public class CmapFormat6 extends CmapFormat {
 
-    private final short cformat;
-    private short clength;
-    private short cversion;
-    private short firstCode;
-    private short entryCount;
-    private short[] glyphIdArray;
-
-    protected CmapFormat6(RandomAccessFileEmulator raf) throws IOException {
-        super(raf);
-        cformat = 6;
-    }
-
-    @Override
-    public int getFirst() { return 0; }
-
-    /**
-     *
-     * @return
-     */
-    @Override
-    public int getLast()  { return 0; }
-    
-    /**
-     *
-     * @param charCode
-     * @return
-     */
-    @Override
-    public int mapCharCode(int charCode) {
-        return 0;
-    }
+  private final short cformat;
+  private short clength;
+  private short cversion;
+  private short firstCode;
+  private short entryCount;
+  private short[] glyphIdArray;
+
+  protected CmapFormat6(RandomAccessFileEmulator raf) throws IOException {
+    super(raf);
+    cformat = 6;
+  }
+
+  @Override
+  public int getFirst() {
+    return 0;
+  }
+
+  /**
+   *
+   * @return
+   */
+  @Override
+  public int getLast() {
+    return 0;
+  }
+
+  /**
+   *
+   * @param charCode
+   * @return
+   */
+  @Override
+  public int mapCharCode(int charCode) {
+    return 0;
+  }
 }