picrate 0.2.0-java → 0.3.0-java

data/src/main/java/processing/core/PFont.java

@@ -151,11 +151,7 @@ public class PFont implements PConstants {
    * bug that they can't be bothered to fix.
    */
   static protected Font[] fonts;
-
-    /**
-     *
-     */
-    static protected HashMap<String,Font> fontDifferent;
+  static protected HashMap<String,Font> fontDifferent;
 
 //  /**
 //   * If not null, this font is set to load dynamically. This is the default
@@ -163,26 +159,10 @@ public class PFont implements PConstants {
 //   * versions of characters are only created when prompted by an index() call.
 //   */
 //  protected Font lazyFont;
-
-    /**
-     *
-     */
   protected BufferedImage lazyImage;
-
-    /**
-     *
-     */
-    protected Graphics2D lazyGraphics;
-
-    /**
-     *
-     */
-    protected FontMetrics lazyMetrics;
-
-    /**
-     *
-     */
-    protected int[] lazySamples;
+  protected Graphics2D lazyGraphics;
+  protected FontMetrics lazyMetrics;
+  protected int[] lazySamples;
 
 
   /** for subclasses that need to store metadata about the font */
@@ -224,8 +204,6 @@ public class PFont implements PConstants {
    * Create a new image-based font on the fly. If charset is set to null,
    * the characters will only be created as bitmaps when they're drawn.
    *
-     * @param font
-     * @param smooth
    * @nowebref
    * @param charset array of all unicode chars that should be included
    */
@@ -352,11 +330,6 @@ public class PFont implements PConstants {
    * Adds an additional parameter that indicates the font came from a file,
    * not a built-in OS font.
    *
-     * @param font
-     * @param smooth
-     * @param charset
-     * @param stream
-     * @param density
    * @nowebref
    */
   public PFont(Font font, boolean smooth, char charset[],
@@ -367,7 +340,6 @@ public class PFont implements PConstants {
   }
 
   /**
-     * @throws java.io.IOException
    * @nowebref
    * @param input InputStream
    */
@@ -442,8 +414,6 @@ public class PFont implements PConstants {
    * <p>
    * It is assumed that the calling class will handle closing
    * the stream when finished.
-     * @param output
-     * @throws java.io.IOException
    */
   public void save(OutputStream output) throws IOException {
     DataOutputStream os = new DataOutputStream(output);
@@ -521,19 +491,13 @@ public class PFont implements PConstants {
     glyphCount++;
   }
 
-    /**
-     *
-     * @return
-     */
-    public String getName() {
+
+  public String getName() {
     return name;
   }
 
-    /**
-     *
-     * @return
-     */
-    public String getPostScriptName() {
+
+  public String getPostScriptName() {
     return psname;
   }
 
@@ -542,7 +506,6 @@ public class PFont implements PConstants {
    * Set the native complement of this font. Might be set internally via the
    * findFont() function, or externally by a deriveFont() call if the font
    * is resized by PGraphicsJava2D.
-     * @param font
    */
   public void setNative(Object font) {
     this.font = (Font) font;
@@ -552,7 +515,6 @@ public class PFont implements PConstants {
   /**
    * Use the getNative() method instead, which allows library interfaces to be
    * written in a cross-platform fashion for desktop, Android, and others.
-     * @return 
    */
   @Deprecated
   public Font getFont() {
@@ -562,7 +524,6 @@ public class PFont implements PConstants {
 
   /**
    * Return the native java.awt.Font associated with this PFont (if any).
-     * @return 
    */
   public Object getNative() {
     if (subsetting) {
@@ -574,7 +535,6 @@ public class PFont implements PConstants {
 
   /**
    * Return size of this font.
-     * @return 
    */
   public int getSize() {
     return size;
@@ -592,33 +552,24 @@ public class PFont implements PConstants {
    * created (behind the scenes) at double the requested size. This ensures
    * that they're shown at half on displays (so folks don't have to change
    * their sketch code).
-     * @return 
    */
   public int getDefaultSize() {
     //return defaultSize;
     return size / density;
   }
 
-    /**
-     *
-     * @return
-     */
-    public boolean isSmooth() {
+
+  public boolean isSmooth() {
     return smooth;
   }
 
-    /**
-     *
-     * @return
-     */
-    public boolean isStream() {
+
+  public boolean isStream() {
     return stream;
   }
 
-    /**
-     *
-     */
-    public void setSubsetting() {
+
+  public void setSubsetting() {
     subsetting = true;
   }
 
@@ -626,7 +577,6 @@ public class PFont implements PConstants {
   /**
    * Attempt to find the native version of this font.
    * (Public so that it can be used by OpenGL or other renderers.)
-     * @return 
    */
   public Object findNative() {
     if (font == null) {
@@ -651,12 +601,8 @@ public class PFont implements PConstants {
     return font;
   }
 
-    /**
-     *
-     * @param c
-     * @return
-     */
-    public Glyph getGlyph(char c) {
+
+  public Glyph getGlyph(char c) {
     int index = index(c);
     return (index == -1) ? null : glyphs[index];
   }
@@ -664,7 +610,6 @@ public class PFont implements PConstants {
 
   /**
    * Get index for the character.
-     * @param c
    * @return index into arrays or -1 if not found
    */
   protected int index(char c) {
@@ -688,12 +633,8 @@ public class PFont implements PConstants {
     }
   }
 
-    /**
-     *
-     * @param c
-     * @return
-     */
-    protected int indexActual(char c) {
+
+  protected int indexActual(char c) {
     // degenerate case, but the find function will have trouble
     // if there are somehow zero chars in the lookup
     //if (value.length == 0) return -1;
@@ -707,14 +648,8 @@ public class PFont implements PConstants {
     return indexHunt(c, 0, glyphCount-1);
   }
 
-    /**
-     *
-     * @param c
-     * @param start
-     * @param stop
-     * @return
-     */
-    protected int indexHunt(int c, int start, int stop) {
+
+  protected int indexHunt(int c, int start, int stop) {
     int pivot = (start + stop) / 2;
 
     // if this is the char, then return it
@@ -735,9 +670,6 @@ public class PFont implements PConstants {
   /**
    * Currently un-implemented for .vlw fonts,
    * but honored for layout in case subclasses use it.
-     * @param a
-     * @param b
-     * @return 
    */
   public float kern(char a, char b) {
     return 0;
@@ -747,7 +679,6 @@ public class PFont implements PConstants {
   /**
    * Returns the ascent of this font from the baseline.
    * The value is based on a font of size 1.
-     * @return 
    */
   public float ascent() {
     return ((float) ascent / (float) size);
@@ -757,7 +688,6 @@ public class PFont implements PConstants {
   /**
    * Returns how far this font descends from the baseline.
    * The value is based on a font size of 1.
-     * @return 
    */
   public float descent() {
     return ((float) descent / (float) size);
@@ -766,8 +696,6 @@ public class PFont implements PConstants {
 
   /**
    * Width of this character for a font of size 1.
-     * @param c
-     * @return 
    */
   public float width(char c) {
     if (c == 32) return width('i');
@@ -781,41 +709,23 @@ public class PFont implements PConstants {
 
   //////////////////////////////////////////////////////////////
 
-    /**
-     *
-     * @return
-     */
-
 
   public int getGlyphCount()  {
     return glyphCount;
   }
 
-    /**
-     *
-     * @param i
-     * @return
-     */
-    public Glyph getGlyph(int i)  {
+
+  public Glyph getGlyph(int i)  {
     return glyphs[i];
   }
 
-    /**
-     *
-     * @param ch
-     * @return
-     */
-    public PShape getShape(char ch) {
+
+  public PShape getShape(char ch) {
     return getShape(ch, 0);
   }
 
-    /**
-     *
-     * @param ch
-     * @param detail
-     * @return
-     */
-    public PShape getShape(char ch, float detail) {
+
+  public PShape getShape(char ch, float detail) {
     Font font = (Font) getNative();
     if (font == null) {
       throw new IllegalArgumentException("getShape() only works on fonts loaded with createFont()");
@@ -972,7 +882,6 @@ public class PFont implements PConstants {
    *
    * ( end auto-generated )
    *
-     * @return 
    * @webref pfont
    * @usage application
    * @brief     Gets a list of the fonts installed on the system
@@ -986,10 +895,8 @@ public class PFont implements PConstants {
     return list;
   }
 
-    /**
-     *
-     */
-    static public void loadFonts() {
+
+  static public void loadFonts() {
     if (fonts == null) {
       GraphicsEnvironment ge =
         GraphicsEnvironment.getLocalGraphicsEnvironment();
@@ -1010,8 +917,6 @@ public class PFont implements PConstants {
    * Starting with Java 1.5, Apple broke the ability to specify most fonts.
    * This bug was filed years ago as #4769141 at bugreporter.apple.com. More:
    * <a href="http://dev.processing.org/bugs/show_bug.cgi?id=407">Bug 407</a>.
-     * @param name
-     * @return 
    */
   static public Font findFont(String name) {
     loadFonts();
@@ -1037,71 +942,29 @@ public class PFont implements PConstants {
    * A single character, and its visage.
    */
   public class Glyph {
+    public PImage image;
+    public int value;
+    public int height;
+    public int width;
+    public int index;
+    public int setWidth;
+    public int topExtent;
+    public int leftExtent;
+
 
-      /**
-       *
-       */
-      public PImage image;
-
-      /**
-       *
-       */
-      public int value;
-
-      /**
-       *
-       */
-      public int height;
-
-      /**
-       *
-       */
-      public int width;
-
-      /**
-       *
-       */
-      public int index;
-
-      /**
-       *
-       */
-      public int setWidth;
-
-      /**
-       *
-       */
-      public int topExtent;
-
-      /**
-       *
-       */
-      public int leftExtent;
-
-      /**
-       *
-       */
-      public Glyph() {
+    public Glyph() {
       index = -1;
       // used when reading from a stream or for subclasses
     }
 
-      /**
-       *
-       * @param is
-       * @throws IOException
-       */
-      public Glyph(DataInputStream is) throws IOException {
+
+    public Glyph(DataInputStream is) throws IOException {
       index = -1;
       readHeader(is);
     }
 
-      /**
-       *
-       * @param is
-       * @throws IOException
-       */
-      protected void readHeader(DataInputStream is) throws IOException {
+
+    protected void readHeader(DataInputStream is) throws IOException {
       value = is.readInt();
       height = is.readInt();
       width = is.readInt();
@@ -1123,12 +986,8 @@ public class PFont implements PConstants {
       }
     }
 
-      /**
-       *
-       * @param os
-       * @throws IOException
-       */
-      protected void writeHeader(DataOutputStream os) throws IOException {
+
+    protected void writeHeader(DataOutputStream os) throws IOException {
       os.writeInt(value);
       os.writeInt(height);
       os.writeInt(width);
@@ -1138,12 +997,8 @@ public class PFont implements PConstants {
       os.writeInt(0); // padding
     }
 
-      /**
-       *
-       * @param is
-       * @throws IOException
-       */
-      protected void readBitmap(DataInputStream is) throws IOException {
+
+    protected void readBitmap(DataInputStream is) throws IOException {
       image = new PImage(width, height, ALPHA);
       int bitmapSize = width * height;
 
@@ -1164,12 +1019,8 @@ public class PFont implements PConstants {
 //      System.out.println();
     }
 
-      /**
-       *
-       * @param os
-       * @throws IOException
-       */
-      protected void writeBitmap(DataOutputStream os) throws IOException {
+
+    protected void writeBitmap(DataOutputStream os) throws IOException {
       int[] pixels  = image.pixels;
       for (int y = 0; y < height; y++) {
         for (int x = 0; x < width; x++) {
@@ -1178,11 +1029,8 @@ public class PFont implements PConstants {
       }
     }
 
-      /**
-       *
-       * @param c
-       */
-      protected Glyph(char c) {
+
+    protected Glyph(char c) {
       int mbox3 = size * 3;
       lazyGraphics.setColor(Color.white);
       lazyGraphics.fillRect(0, 0, mbox3, mbox3);