geomerative 1.1.0-java → 2.0.0-java

data/src/org/apache/batik/svggen/font/Point.java

@@ -23,16 +23,16 @@ package org.apache.batik.svggen.font;
  */
 public class Point {
 
-    public int x = 0;
-    public int y = 0;
-    public boolean onCurve = true;
-    public boolean endOfContour = false;
-    public boolean touched = false;
-
-    public Point(int x, int y, boolean onCurve, boolean endOfContour) {
-        this.x = x;
-        this.y = y;
-        this.onCurve = onCurve;
-        this.endOfContour = endOfContour;
-    }
+  public int x = 0;
+  public int y = 0;
+  public boolean onCurve = true;
+  public boolean endOfContour = false;
+  public boolean touched = false;
+
+  public Point(int x, int y, boolean onCurve, boolean endOfContour) {
+    this.x = x;
+    this.y = y;
+    this.onCurve = onCurve;
+    this.endOfContour = endOfContour;
+  }
 }

data/src/org/apache/batik/svggen/font/RandomAccessFileEmulator.java

@@ -1,15 +1,17 @@
 package org.apache.batik.svggen.font;
 
-import java.io.*;
-
-public class RandomAccessFileEmulator extends DataInputStream{
-	
-	public RandomAccessFileEmulator(byte[] byteArray, String accesMode){
-		super(new ByteArrayInputStream(byteArray));
-	}
-
-	public void seek(long n) throws IOException{
-		reset();
-		skip(n);
-	}
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
+
+public class RandomAccessFileEmulator extends DataInputStream {
+
+  public RandomAccessFileEmulator(byte[] byteArray, String accesMode) {
+    super(new ByteArrayInputStream(byteArray));
+  }
+
+  public void seek(long n) throws IOException {
+    reset();
+    skip(n);
+  }
 }

data/src/org/apache/batik/svggen/font/table/ClassDef.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,16 +27,16 @@ import org.apache.batik.svggen.font.*;
  */
 public abstract class ClassDef {
 
-    public abstract int getFormat();
-
-    protected static ClassDef read(RandomAccessFileEmulator raf) throws IOException {
-        ClassDef c = null;
-        int format = raf.readUnsignedShort();
-        if (format == 1) {
-            c = new ClassDefFormat1(raf);
-        } else if (format == 2) {
-            c = new ClassDefFormat2(raf);
-        }
-        return c;
+  public abstract int getFormat();
+
+  protected static ClassDef read(RandomAccessFileEmulator raf) throws IOException {
+    ClassDef c = null;
+    int format = raf.readUnsignedShort();
+    if (format == 1) {
+      c = new ClassDefFormat1(raf);
+    } else if (format == 2) {
+      c = new ClassDefFormat2(raf);
     }
+    return c;
+  }
 }

data/src/org/apache/batik/svggen/font/table/ClassDefFormat1.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,29 +27,32 @@ import org.apache.batik.svggen.font.*;
  */
 public class ClassDefFormat1 extends ClassDef {
 
-    private final int startGlyph;
-    private final int glyphCount;
-    private final int[] classValues;
-
-    /** Creates new ClassDefFormat1
-     * @param raf
-     * @throws java.io.IOException */
-    public ClassDefFormat1(RandomAccessFileEmulator raf) throws IOException {
-        startGlyph = raf.readUnsignedShort();
-        glyphCount = raf.readUnsignedShort();
-        classValues = new int[glyphCount];
-        for (int i = 0; i < glyphCount; i++) {
-            classValues[i] = raf.readUnsignedShort();
-        }
-    }
-
-    /**
-     *
-     * @return
-     */
-    @Override
-    public int getFormat() {
-        return 1;
+  private final int startGlyph;
+  private final int glyphCount;
+  private final int[] classValues;
+
+  /**
+   * Creates new ClassDefFormat1
+   *
+   * @param raf
+   * @throws java.io.IOException
+   */
+  public ClassDefFormat1(RandomAccessFileEmulator raf) throws IOException {
+    startGlyph = raf.readUnsignedShort();
+    glyphCount = raf.readUnsignedShort();
+    classValues = new int[glyphCount];
+    for (int i = 0; i < glyphCount; i++) {
+      classValues[i] = raf.readUnsignedShort();
     }
+  }
+
+  /**
+   *
+   * @return
+   */
+  @Override
+  public int getFormat() {
+    return 1;
+  }
 
 }

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;
+  }
 }