geomerative 1.1.0-java → 2.0.0-java

data/src/org/apache/batik/svggen/font/table/FeatureList.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,44 +27,46 @@ import org.apache.batik.svggen.font.*;
  */
 public class FeatureList {
 
-    private final int featureCount;
-    private final FeatureRecord[] featureRecords;
-    private final Feature[] features;
+  private final int featureCount;
+  private final FeatureRecord[] featureRecords;
+  private final Feature[] features;
 
-    /** Creates new FeatureList
-     * @param raf
-     * @param offset
-     * @throws java.io.IOException 
-     */
-    public FeatureList(RandomAccessFileEmulator raf, int offset) throws IOException {
-        raf.seek(offset);
-        featureCount = raf.readUnsignedShort();
-        featureRecords = new FeatureRecord[featureCount];
-        features = new Feature[featureCount];
-        for (int i = 0; i < featureCount; i++) {
-            featureRecords[i] = new FeatureRecord(raf);
-        }
-        for (int i = 0; i < featureCount; i++) {
-            features[i] = new Feature(raf, offset + featureRecords[i].getOffset());
-        }
+  /**
+   * Creates new FeatureList
+   *
+   * @param raf
+   * @param offset
+   * @throws java.io.IOException
+   */
+  public FeatureList(RandomAccessFileEmulator raf, int offset) throws IOException {
+    raf.seek(offset);
+    featureCount = raf.readUnsignedShort();
+    featureRecords = new FeatureRecord[featureCount];
+    features = new Feature[featureCount];
+    for (int i = 0; i < featureCount; i++) {
+      featureRecords[i] = new FeatureRecord(raf);
+    }
+    for (int i = 0; i < featureCount; i++) {
+      features[i] = new Feature(raf, offset + featureRecords[i].getOffset());
     }
+  }
 
-    public Feature findFeature(LangSys langSys, String tag) {
-        if (tag.length() != 4) {
-            return null;
-        }
-        int tagVal = ((tag.charAt(0)<<24)
-            | (tag.charAt(1)<<16)
-            | (tag.charAt(2)<<8)
-            | tag.charAt(3));
-        for (int i = 0; i < featureCount; i++) {
-            if (featureRecords[i].getTag() == tagVal) {
-                if (langSys.isFeatureIndexed(i)) {
-                    return features[i];
-                }
-            }
+  public Feature findFeature(LangSys langSys, String tag) {
+    if (tag.length() != 4) {
+      return null;
+    }
+    int tagVal = ((tag.charAt(0) << 24)
+      | (tag.charAt(1) << 16)
+      | (tag.charAt(2) << 8)
+      | tag.charAt(3));
+    for (int i = 0; i < featureCount; i++) {
+      if (featureRecords[i].getTag() == tagVal) {
+        if (langSys.isFeatureIndexed(i)) {
+          return features[i];
         }
-        return null;
+      }
     }
+    return null;
+  }
 
 }

data/src/org/apache/batik/svggen/font/table/FeatureRecord.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,26 +27,26 @@ import org.apache.batik.svggen.font.*;
  */
 public class FeatureRecord {
 
-    private final int tag;
-    private final int offset;
-
-    /**
-     * Creates new FeatureRecord
-     *
-     * @param raf
-     * @throws java.io.IOException
-     */
-    public FeatureRecord(RandomAccessFileEmulator raf) throws IOException {
-        tag = raf.readInt();
-        offset = raf.readUnsignedShort();
-    }
-
-    public int getTag() {
-        return tag;
-    }
-
-    public int getOffset() {
-        return offset;
-    }
+  private final int tag;
+  private final int offset;
+
+  /**
+   * Creates new FeatureRecord
+   *
+   * @param raf
+   * @throws java.io.IOException
+   */
+  public FeatureRecord(RandomAccessFileEmulator raf) throws IOException {
+    tag = raf.readInt();
+    offset = raf.readUnsignedShort();
+  }
+
+  public int getTag() {
+    return tag;
+  }
+
+  public int getOffset() {
+    return offset;
+  }
 
 }

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

@@ -24,7 +24,8 @@ package org.apache.batik.svggen.font.table;
  * @author <a href="mailto:vincent.hardy@eng.sun.com">Vincent Hardy</a>
  */
 public interface FeatureTags {
-    String FEATURE_TAG_INIT = "init";
-    String FEATURE_TAG_MEDI = "medi";
-    String FEATURE_TAG_FINA = "fina";
+
+  String FEATURE_TAG_INIT = "init";
+  String FEATURE_TAG_MEDI = "medi";
+  String FEATURE_TAG_FINA = "fina";
 }

data/src/org/apache/batik/svggen/font/table/FpgmTable.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: FpgmTable.java,v 1.3 2004/08/18 07:15:20 vhardy Exp $
@@ -26,13 +26,13 @@ import org.apache.batik.svggen.font.*;
  */
 public class FpgmTable extends Program implements Table {
 
-    protected FpgmTable(DirectoryEntry de,RandomAccessFileEmulator raf) throws IOException {
-        raf.seek(de.getOffset());
-        readInstructions(raf, de.getLength());
-    }
+  protected FpgmTable(DirectoryEntry de, RandomAccessFileEmulator raf) throws IOException {
+    raf.seek(de.getOffset());
+    readInstructions(raf, de.getLength());
+  }
 
-    @Override
-    public int getType() {
-        return fpgm;
-    }
+  @Override
+  public int getType() {
+    return FPGM;
+  }
 }

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

@@ -25,141 +25,143 @@ import java.io.ByteArrayInputStream;
  */
 public class GlyfCompositeComp {
 
-    public static final short ARG_1_AND_2_ARE_WORDS = 0x0001;
-    public static final short ARGS_ARE_XY_VALUES = 0x0002;
-    public static final short ROUND_XY_TO_GRID = 0x0004;
-    public static final short WE_HAVE_A_SCALE = 0x0008;
-    public static final short MORE_COMPONENTS = 0x0020;
-    public static final short WE_HAVE_AN_X_AND_Y_SCALE = 0x0040;
-    public static final short WE_HAVE_A_TWO_BY_TWO = 0x0080;
-    public static final short WE_HAVE_INSTRUCTIONS = 0x0100;
-    public static final short USE_MY_METRICS = 0x0200;
-
-    private final int firstIndex;
-    private final int firstContour;
-    private final short argument1;
-    private final short argument2;
-    private final short flags;
-    private final short glyphIndex;
-    private double xscale = 1.0;
-    private double yscale = 1.0;
-    private double scale01 = 0.0;
-    private double scale10 = 0.0;
-    private int xtranslate = 0;
-    private int ytranslate = 0;
-    private int point1 = 0;
-    private int point2 = 0;
-
-    protected GlyfCompositeComp(int firstIndex, int firstContour, ByteArrayInputStream bais) {
-        this.firstIndex = firstIndex;
-        this.firstContour = firstContour;
-        flags = (short)(bais.read()<<8 | bais.read());
-        glyphIndex = (short)(bais.read()<<8 | bais.read());
-
-        // Get the arguments as just their raw values
-        if ((flags & ARG_1_AND_2_ARE_WORDS) != 0) {
-            argument1 = (short)(bais.read()<<8 | bais.read());
-            argument2 = (short)(bais.read()<<8 | bais.read());
-        } else {
-            argument1 = (short) bais.read();
-            argument2 = (short) bais.read();
-        }
-
-        // Assign the arguments according to the flags
-        if ((flags & ARGS_ARE_XY_VALUES) != 0) {
-            xtranslate = argument1;
-            ytranslate = argument2;
-        } else {
-            point1 = argument1;
-            point2 = argument2;
-        }
-
-        // Get the scale values (if any)
-        if ((flags & WE_HAVE_A_SCALE) != 0) {
-            int i = (short)(bais.read()<<8 | bais.read());
-            xscale = yscale = (double) i / (double) 0x4000;
-        } else if ((flags & WE_HAVE_AN_X_AND_Y_SCALE) != 0) {
-            short i = (short)(bais.read()<<8 | bais.read());
-            xscale = (double) i / (double) 0x4000;
-            i = (short)(bais.read()<<8 | bais.read());
-            yscale = (double) i / (double) 0x4000;
-        } else if ((flags & WE_HAVE_A_TWO_BY_TWO) != 0) {
-            int i = (short)(bais.read()<<8 | bais.read());
-            xscale = (double) i / (double) 0x4000;
-            i = (short)(bais.read()<<8 | bais.read());
-            scale01 = (double) i / (double) 0x4000;
-            i = (short)(bais.read()<<8 | bais.read());
-            scale10 = (double) i / (double) 0x4000;
-            i = (short)(bais.read()<<8 | bais.read());
-            yscale = (double) i / (double) 0x4000;
-        }
+  public static final short ARG_1_AND_2_ARE_WORDS = 0x0001;
+  public static final short ARGS_ARE_XY_VALUES = 0x0002;
+  public static final short ROUND_XY_TO_GRID = 0x0004;
+  public static final short WE_HAVE_A_SCALE = 0x0008;
+  public static final short MORE_COMPONENTS = 0x0020;
+  public static final short WE_HAVE_AN_X_AND_Y_SCALE = 0x0040;
+  public static final short WE_HAVE_A_TWO_BY_TWO = 0x0080;
+  public static final short WE_HAVE_INSTRUCTIONS = 0x0100;
+  public static final short USE_MY_METRICS = 0x0200;
+
+  private final int firstIndex;
+  private final int firstContour;
+  private final short argument1;
+  private final short argument2;
+  private final short flags;
+  private final short glyphIndex;
+  private double xscale = 1.0;
+  private double yscale = 1.0;
+  private double scale01 = 0.0;
+  private double scale10 = 0.0;
+  private int xtranslate = 0;
+  private int ytranslate = 0;
+  private int point1 = 0;
+  private int point2 = 0;
+
+  protected GlyfCompositeComp(int firstIndex, int firstContour, ByteArrayInputStream bais) {
+    this.firstIndex = firstIndex;
+    this.firstContour = firstContour;
+    flags = (short) (bais.read() << 8 | bais.read());
+    glyphIndex = (short) (bais.read() << 8 | bais.read());
+
+    // Get the arguments as just their raw values
+    if ((flags & ARG_1_AND_2_ARE_WORDS) != 0) {
+      argument1 = (short) (bais.read() << 8 | bais.read());
+      argument2 = (short) (bais.read() << 8 | bais.read());
+    } else {
+      argument1 = (short) bais.read();
+      argument2 = (short) bais.read();
     }
 
-    public int getFirstIndex() {
-        return firstIndex;
+    // Assign the arguments according to the flags
+    if ((flags & ARGS_ARE_XY_VALUES) != 0) {
+      xtranslate = argument1;
+      ytranslate = argument2;
+    } else {
+      point1 = argument1;
+      point2 = argument2;
     }
 
-    public int getFirstContour() {
-        return firstContour;
-    }
-
-    public short getArgument1() {
-        return argument1;
-    }
-
-    public short getArgument2() {
-        return argument2;
-    }
-
-    public short getFlags() {
-        return flags;
-    }
-
-    public short getGlyphIndex() {
-        return glyphIndex;
-    }
-
-    public double getScale01() {
-        return scale01;
-    }
-
-    public double getScale10() {
-        return scale10;
-    }
-
-    public double getXScale() {
-        return xscale;
-    }
-
-    public double getYScale() {
-        return yscale;
-    }
-
-    public int getXTranslate() {
-        return xtranslate;
-    }
-
-    public int getYTranslate() {
-        return ytranslate;
-    }
-
-    /**
-     * Transforms an x-coordinate of a point for this component.
-     * @param x The x-coordinate of the point to transform
-     * @param y The y-coordinate of the point to transform
-     * @return The transformed x-coordinate
-     */
-    public int scaleX(int x, int y) {
-        return Math.round((float)(x * xscale + y * scale10));
-    }
-
-    /**
-     * Transforms a y-coordinate of a point for this component.
-     * @param x The x-coordinate of the point to transform
-     * @param y The y-coordinate of the point to transform
-     * @return The transformed y-coordinate
-     */
-    public int scaleY(int x, int y) {
-        return Math.round((float)(x * scale01 + y * yscale));
+    // Get the scale values (if any)
+    if ((flags & WE_HAVE_A_SCALE) != 0) {
+      int i = (short) (bais.read() << 8 | bais.read());
+      xscale = yscale = (double) i / (double) 0x4000;
+    } else if ((flags & WE_HAVE_AN_X_AND_Y_SCALE) != 0) {
+      short i = (short) (bais.read() << 8 | bais.read());
+      xscale = (double) i / (double) 0x4000;
+      i = (short) (bais.read() << 8 | bais.read());
+      yscale = (double) i / (double) 0x4000;
+    } else if ((flags & WE_HAVE_A_TWO_BY_TWO) != 0) {
+      int i = (short) (bais.read() << 8 | bais.read());
+      xscale = (double) i / (double) 0x4000;
+      i = (short) (bais.read() << 8 | bais.read());
+      scale01 = (double) i / (double) 0x4000;
+      i = (short) (bais.read() << 8 | bais.read());
+      scale10 = (double) i / (double) 0x4000;
+      i = (short) (bais.read() << 8 | bais.read());
+      yscale = (double) i / (double) 0x4000;
     }
+  }
+
+  public int getFirstIndex() {
+    return firstIndex;
+  }
+
+  public int getFirstContour() {
+    return firstContour;
+  }
+
+  public short getArgument1() {
+    return argument1;
+  }
+
+  public short getArgument2() {
+    return argument2;
+  }
+
+  public short getFlags() {
+    return flags;
+  }
+
+  public short getGlyphIndex() {
+    return glyphIndex;
+  }
+
+  public double getScale01() {
+    return scale01;
+  }
+
+  public double getScale10() {
+    return scale10;
+  }
+
+  public double getXScale() {
+    return xscale;
+  }
+
+  public double getYScale() {
+    return yscale;
+  }
+
+  public int getXTranslate() {
+    return xtranslate;
+  }
+
+  public int getYTranslate() {
+    return ytranslate;
+  }
+
+  /**
+   * Transforms an x-coordinate of a point for this component.
+   *
+   * @param x The x-coordinate of the point to transform
+   * @param y The y-coordinate of the point to transform
+   * @return The transformed x-coordinate
+   */
+  public int scaleX(int x, int y) {
+    return Math.round((float) (x * xscale + y * scale10));
+  }
+
+  /**
+   * Transforms a y-coordinate of a point for this component.
+   *
+   * @param x The x-coordinate of the point to transform
+   * @param y The y-coordinate of the point to transform
+   * @return The transformed y-coordinate
+   */
+  public int scaleY(int x, int y) {
+    return Math.round((float) (x * scale01 + y * yscale));
+  }
 }