[FOray-commit] SF.net SVN: foray: [8330] trunk/foray

[<vic...@us...>]

Revision: 8330
          http://svn.sourceforge.net/foray/?rev=8330&view=rev
Author:   victormote
Date:     2006-10-07 10:04:14 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
Make all instance variables private and enforce the checkstyle rule to that effect.

Modified Paths:
--------------
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFStream.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java
    trunk/foray/scripts/checkstyle-suppressions.xml

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotList.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -36,7 +36,7 @@
 public class PDFAnnotList extends PDFObject {
 
     /** Collection of PDFAnnotation objects */
-    protected ArrayList annotations = new ArrayList();
+    private ArrayList annotations = new ArrayList();
 
     /**
      * Create a PDFAnnotList object.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -35,8 +35,7 @@
  */
 public abstract class PDFAnnotation extends PDFObject {
 
-    protected PDFPage page;
-    protected Rectangle2D.Float rectangle;
+    private Rectangle2D.Float rectangle;
 
     /**
      * create objects associated with a link annotation (GoToR)
@@ -44,11 +43,16 @@
      * @param doc {@inheritDoc}
      * @param r The rectangle which outlines the link.
      */
-    public PDFAnnotation(final PDFDocument doc, final PDFPage page,
-            final Rectangle2D.Float r) {
+    public PDFAnnotation(final PDFDocument doc, final Rectangle2D.Float r) {
         super(doc);
-        this.page = page;
         this.rectangle = r;
     }
 
+    /**
+     * @return Returns the rectangle.
+     */
+    public Rectangle2D.Float getRectangle() {
+        return this.rectangle;
+    }
+
 }

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFArray.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -35,7 +35,7 @@
  */
 public class PDFArray extends PDFObject {
 
-    Object arrayContents;
+    private Object arrayContents;
 
     /**
      * Create the array object.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFont.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -61,11 +61,11 @@
     };
 
 //    protected PDFWArray w;
-    protected int[] dw2;
-    protected PDFWArray w2;
-    protected PDFCIDSystemInfo systemInfo;
-    protected PDFCIDFontDescriptor descriptor;
-    protected FontUse fsFont;
+    private int[] dw2;
+    private PDFWArray w2;
+    private PDFCIDSystemInfo systemInfo;
+    private PDFCIDFontDescriptor descriptor;
+    private FontUse fsFont;
 
     /**
      * /CIDToGIDMap (only for CIDFontType2, see PDF Reference, Second Edition,
@@ -73,7 +73,7 @@
      * in CID Fonts".)
      * Can be either "Identity" (when null, the default) or a PDFStream.
      */
-    protected PDFStream cidMap;
+    private PDFStream cidMap;
 
     /**
      * Constructor.
@@ -256,4 +256,11 @@
         return returnValue;
     }
 
+    /**
+     * @return Returns the systemInfo.
+     */
+    public PDFCIDSystemInfo getSystemInfo() {
+        return this.systemInfo;
+    }
+
 }

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDFontDescriptor.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -38,8 +38,8 @@
  */
 public class PDFCIDFontDescriptor extends PDFFontDescriptor {
 
-    protected String lang;
-    protected PDFStream cidSet;
+    private String lang;
+    private PDFStream cidSet;
 
     /**
      * Create the /FontDescriptor object for a CID font.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCIDSystemInfo.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -37,9 +37,9 @@
  */
 public class PDFCIDSystemInfo extends PDFObject {
     private static final StringBuffer BUFFER = new StringBuffer();
-    protected String registry;
-    protected String ordering;
-    protected int supplement;
+    private String registry;
+    private String ordering;
+    private int supplement;
 
     public PDFCIDSystemInfo(final String registry, final String ordering,
             final int supplement) {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCMap.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -120,65 +120,18 @@
     /**
      * /CMapName attribute, one of the predefined constants
      */
-    protected String name;
+    private String name;
 
     /**
-     * /CIDSystemInfo attribute
-     */
-    protected PDFCIDSystemInfo sysInfo;
-
-    /**
-     * font's writing direction
-     */
-    protected byte wMode = WMODE_HORIZONTAL;
-
-    /**
-     * base CMap (String or PDFStream)
-     */
-    protected Object base;
-
-    /**
      * create the /CMap object
      *
      * @param name one the registered names (see Table 7.20 on p 215)
-     * @param sysInfo the attributes of the character collection of the CIDFont
      */
-    public PDFCMap(final PDFDocument doc, final String name,
-            final PDFCIDSystemInfo sysInfo) {
+    public PDFCMap(final PDFDocument doc, final String name) {
         super(doc);
         this.name = name;
-        this.sysInfo = sysInfo;
-        this.base = null;
     }
 
-    /**
-     * set the writing direction
-     *
-     * @param mode is either <code>WMODE_HORIZONTAL</code>
-     * or <code>WMODE_VERTICAL</code>
-     */
-    public void setWMode(final byte mode) {
-        this.wMode = mode;
-    }
-
-    /**
-     * set the base CMap
-     *
-     * @param base the name of the base CMap (see Table 7.20)
-     */
-    public void setUseCMap(final String base) {
-        this.base = base;
-    }
-
-    /**
-     * set the base CMap
-     *
-     * @param base the stream to be used as base CMap
-     */
-    public void setUseCMap(final PDFStream base) {
-        this.base = base;
-    }
-
     protected int output(final OutputStream stream) throws IOException {
         fillInPDF(new StringBuffer());
         return super.output(stream);

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFCharProcs.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -44,7 +44,7 @@
     /**
      * the (character name, drawing stream) pairs for a Type3 font
      */
-    protected HashMap keys;
+    private HashMap keys;
 
     public PDFCharProcs() {
         keys = new HashMap();

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFColor.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -38,7 +38,7 @@
  */
 public class PDFColor extends PDFPathPaint implements org.axsl.pdfW.PDFColor {
 
-    protected Color color;
+    private Color color;
 
     public PDFColor(final Color theColor) {
         this.color = theColor;

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFContentStream.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -64,9 +64,9 @@
         implements org.axsl.pdfW.PDFContentStream {
 
     /** The page this content stream is attached to. */
-    PDFPage page;
+    private PDFPage page;
 
-    boolean textObjectOpen = false;
+    private boolean textObjectOpen = false;
 
     /**
      * Create a PDFContentStream.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFDate.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -44,7 +44,7 @@
 public class PDFDate extends PDFObject {
 
     /** The encapsulated Date instance. */
-    Date date;
+    private Date date;
 
     /**
      * Create a PDFDate instance.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncoding.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -39,7 +39,7 @@
 public class PDFEncoding extends PDFObject {
 
     /** The actual Encoding instance for which this object is a wrapper. */
-    protected Encoding encoding;
+    private Encoding encoding;
 
     /**
      * Constructor. Creates the /Encoding object.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFEncryption.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -52,7 +52,7 @@
      * Private inner class for the encryption filter.
      */
     private class EncryptionFilter extends PSFilter {
-        PDFEncryption encryption;
+        private PDFEncryption encryption;
 
         /** The constructor for the internal PDFEncryption filter
          * @param encryption The encryption object to use
@@ -116,20 +116,20 @@
                                   /** Value of PRINT permission
                                    */
     // Encryption tools
-    MessageDigest digest = null;
-    Cipher cipher = null;
-    Random random = new Random();
+    private MessageDigest digest = null;
+    private Cipher cipher = null;
+    private Random random = new Random();
     // Control attributes
-    String userPassword = "";
-    String ownerPassword = "";
-    boolean allowPrint = true;
-    boolean allowCopyContent = true;
-    boolean allowEditContent = true;
-    boolean allowEditAnnotations = true;
+    private String userPassword = "";
+    private String ownerPassword = "";
+    private boolean allowPrint = true;
+    private boolean allowCopyContent = true;
+    private boolean allowEditContent = true;
+    private boolean allowEditAnnotations = true;
     // Output attributes
-    byte [] fileID = null;
-    byte [] encryptionKey = null;
-    String dictionary = null;
+    private byte [] fileID = null;
+    private byte [] encryptionKey = null;
+    private String dictionary = null;
 
     /**
      * Create a /Filter /Standard object.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFExplicitDestination.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -44,9 +44,9 @@
         implements org.axsl.pdfW.PDFExplicitDestination {
 
     /** The page to which this Destination goes. */
-    protected PDFPage page;
-    protected float leftPosition = 0;
-    protected float topPosition = 0;
+    private PDFPage page;
+    private float leftPosition = 0;
+    private float topPosition = 0;
 
     public PDFExplicitDestination(final PDFDocument doc, final PDFPage page,
             final float xPosition, final float yPosition) {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFileSpec.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -37,7 +37,7 @@
     /**
      * the filename
      */
-    protected String filename;
+    private String filename;
 
     /**
      * Create a /FileSpec object.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFont.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -65,7 +65,7 @@
         /* The order is important here. */
         new String[] {"Type0", "Type1", "MMType1", "Type3", "TrueType" };
 
-    protected FontUse fsFont;
+    private FontUse fsFont;
 
     private byte fontSubType = -1;
 
@@ -144,7 +144,7 @@
 
     public String getBaseFont() {
         if (fsFont.getFont().isSubsettable()) {
-            return document.getNextFontSubsetTag() + "+"
+            return getPDFDocument().getNextFontSubsetTag() + "+"
             + fsFont.getFont().getPostscriptName();
         }
         return fsFont.getFont().getPostscriptName();
@@ -219,7 +219,7 @@
         if (isStandardFont()) {
             return;
         }
-        final PDFArray widthArray = new PDFArray(this.document,
+        final PDFArray widthArray = new PDFArray(getPDFDocument(),
                 getFontOutput().getWidths());
         buffer.append("/Widths ");
         buffer.append(widthArray.pdfReference());
@@ -271,7 +271,7 @@
         }
         /* TODO: This is all bogus and is really just a placeholder for future
          * implementation. */
-        final PDFArray fontMatrix = new PDFArray(this.document, new int[0]);
+        final PDFArray fontMatrix = new PDFArray(getPDFDocument(), new int[0]);
         if (fontMatrix != null) {
             buffer.append("/FontMatrix ");
             buffer.append(fontMatrix.toPDF());

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontDescriptor.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -39,19 +39,19 @@
  */
 public class PDFFontDescriptor extends PDFObject {
 
-    protected PDFFont font;
+    private PDFFont font;
 
     // Optional fields
-    protected int stemH = 0;
-    protected int xHeight = 0;
-    protected int leading = 0;
-    protected int avgWidth = 0;
-    protected int maxWidth = 0;
-    protected int missingWidth = 0;
-    protected PDFStream fontfile;
+    private int stemH = 0;
+    private int xHeight = 0;
+    private int leading = 0;
+    private int avgWidth = 0;
+    private int maxWidth = 0;
+    private int missingWidth = 0;
+    private PDFStream fontfile;
     // protected String charSet = null;
 
-    protected byte subtype;
+    private byte subtype;
 
     /**
      * Constructor for the /FontDescriptor object.
@@ -114,8 +114,8 @@
      * @return the PDF
      */
     public String toPDF() {
-        final Font font = this.font.fsFont.getFont();
-        final FontPDF fontPDF = (FontPDF) this.font.fsFont.getFontOutput(
+        final Font font = this.font.getFontUse().getFont();
+        final FontPDF fontPDF = (FontPDF) this.font.getFontUse().getFontOutput(
                 "application/pdf");
         final StringBuffer p = new StringBuffer();
         p.append(this.pdfID() + EOL);
@@ -194,12 +194,12 @@
     protected void fillInPDF(final StringBuffer begin) { }
 
     protected void embedFont() {
-        if (! font.fsFont.getFont().isEmbeddable()) {
+        if (! font.getFontUse().getFont().isEmbeddable()) {
             return;
         }
         PDFFontFileStream stream = null;
         try {
-            stream = new PDFFontFileStream(document, font.fsFont);
+            stream = new PDFFontFileStream(getPDFDocument(), font.getFontUse());
         } catch (final PDFException e) {
             stream = null;
         }

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontFileStream.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -57,7 +57,7 @@
         try {
             setData(fontFileStream);
         } catch (final IOException ioe) {
-            document.getLogger().error("Failed to embed font "
+            getPDFDocument().getLogger().error("Failed to embed font "
                     + font.getFont().getPostscriptName() + ": "
                     + ioe.getMessage());
         }

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFontType0.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -41,7 +41,7 @@
      * The descendant fonts are actually an array of CIDFonts, but only the
      * first one is used.
      */
-    protected PDFCIDFont descendantFonts;
+    private PDFCIDFont descendantFonts;
 
     /**
      * Constructor.
@@ -57,8 +57,8 @@
     }
 
     protected PDFToUnicodeCMap getToUnicodeCMAP() {
-        return new PDFToUnicodeCMap(this.document, "Identity-H",
-                this.descendantFonts.systemInfo, fsFont);
+        return new PDFToUnicodeCMap(getPDFDocument(), "Identity-H",
+                this.descendantFonts.getSystemInfo(), getFontUse());
     }
 
     protected PDFCIDFont getDescendantFonts() {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFFunction.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -49,19 +49,19 @@
     /**
      * Required: The Type of function (0,2,3,4) default is 0.
      */
-    protected int functionType = 0;    // Default
+    private int functionType = 0;    // Default
 
     /**
      * Required: 2 * m Array of Double numbers which are possible inputs to the
      * function
      */
-    protected List domain = null;
+    private List domain = null;
 
     /**
      * Required: 2 * n Array of Double numbers which are possible outputs to
      * the function
      */
-    protected List range = null;
+    private List range = null;
 
     /* ********************TYPE 0***************************** */
     // FunctionType 0 specific function guts
@@ -73,19 +73,19 @@
      * sizeRange, but since they're expressed as an array in PDF, my
      * implementation reflects that.
      */
-    protected List size = null;
+    private List size = null;
 
     /**
      * Required for Type 0: Number of Bits used to represent each sample value.
      * Limited to 1,2,4,8,12,16,24, or 32.
      */
-    protected int bitsPerSample = 1;
+    private int bitsPerSample = 1;
 
     /**
      * Optional for Type 0: order of interpolation between samples. Limited to
      * linear (1) or cubic (3). Default is 1.
      */
-    protected int order = 1;
+    private int order = 1;
 
     /**
      * Optional for Type 0: A 2 * m array of Doubles which provides a linear
@@ -97,13 +97,13 @@
      * Should be two values per function, usually (0,1), as in [0 1 0 1] for 2
      * functions.
      */
-    protected List encode = null;
+    private List encode = null;
 
     /**
      * Optinoal for Type 0: A 2 * n array of Doubles which provides a linear
      * mapping of sample values to the range. Defaults to Range.
      */
-    protected List decode = null;
+    private List decode = null;
 
     /**
      * Optional For Type 0: A stream of sample values
@@ -113,34 +113,34 @@
      * Required For Type 4: Postscript Calculator function composed of
      * arithmetic, boolean, and stack operators + boolean constants.
      */
-    protected StringBuffer functionDataStream = null;
+    private StringBuffer functionDataStream = null;
 
     /**
      * Required (?) For Type 0: A List of Strings for the various filters to be
      * used to decode the stream.
      * These are how the string is compressed. Flate, LZW, etc.
      */
-    protected List filter = null;
+    private List filter = null;
     /* *************************TYPE 2************************** */
 
     /**
      * Required For Type 2: An Array of n Doubles defining the function result
      * when x=0. Default is [0].
      */
-    protected List cZero = null;
+    private List cZero = null;
 
     /**
      * Required For Type 2: An Array of n Doubles defining the function result
      * when x=1. Default is [1].
      */
-    protected List cOne = null;
+    private List cOne = null;
 
     /**
      * Required for Type 2: The interpolation exponent.
      * Each value x will return n results.
      * Must be greater than 0.
      */
-    protected double interpolationExponentN = 1;
+    private double interpolationExponentN = 1;
 
     /* *************************TYPE 3************************** */
 
@@ -148,7 +148,7 @@
      * Required for Type 3: A List of PDFFunctions which form an array of k
      * single input functions making up the stitching function.
      */
-    protected List functions = null;
+    private List functions = null;
 
     /**
      * Optional for Type 3: An array of (k-1) Doubles that, in combination with
@@ -161,7 +161,7 @@
      * stitching function.
      * It makes the gradient even.
      */
-    protected List bounds = null;
+    private List bounds = null;
     // See encode above, as it's also part of Type 3 Functions.
 
     /* *************************TYPE 4************************** */

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoTo.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -34,7 +34,7 @@
  */
 public class PDFGoTo extends PDFAction {
 
-    protected PDFDestination destination;
+    private PDFDestination destination;
 
     /**
      * Create a /GoTo object.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFGoToRemote.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -36,9 +36,9 @@
     /**
      * the file specification
      */
-    protected PDFFileSpec pdfFileSpec;
-    protected int pageReference = 0;
-    protected String destination = null;
+    private PDFFileSpec pdfFileSpec;
+    private int pageReference = 0;
+    private String destination = null;
 
     /**
      * create an GoToR object.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFLink.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -36,13 +36,13 @@
 public class PDFLink extends PDFAnnotation implements org.axsl.pdfW.PDFLink {
 
     /** Should be null if either destination or action is not. */
-    PDFTextString destinationName;
+    private PDFTextString destinationName;
 
     /** Should be null if either destinationName or action is not. */
-    PDFDestination destination;
+    private PDFDestination destination;
 
     /** Should be null if either destination or destinationName is not. */
-    PDFAction action;
+    private PDFAction action;
 
     private PDFColor color = null;
 
@@ -54,7 +54,7 @@
      */
     private PDFLink(final PDFDocument doc, final PDFPage page,
             final Rectangle2D.Float rect) {
-        super(doc, page, rect);
+        super(doc, rect);
     }
 
     public PDFLink(final PDFDocument doc, final PDFPage page,
@@ -99,9 +99,9 @@
         buffer.append("<< /Type /Annot" + EOL);
         buffer.append("/Subtype /Link" + EOL);
         buffer.append("/Rect ["
-                + rectangle.x + " " + rectangle.y + " "
-                + (rectangle.x + rectangle.width) + " "
-                + (rectangle.y - rectangle.height) + "]" + EOL);
+                + getRectangle().x + " " + getRectangle().y + " "
+                + (getRectangle().x + getRectangle().width) + " "
+                + (getRectangle().y - getRectangle().height) + "]" + EOL);
         buffer.append("/BS " + this.getPDFDocument().getDefaultBorderStyle()
                 .pdfReference() + EOL);
         if (this.color != null && ! this.color.isBlack()) {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFObject.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -70,7 +70,7 @@
     /**
      * The parent PDFDocument.
      */
-    protected PDFDocument document;
+    private PDFDocument document;
 
     /**
      * the object's number

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFStream.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFStream.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFStream.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -142,10 +142,10 @@
          * this.document can be null for temporary streams, and those should
          * not have any default filters applied anyway.
          */
-        if (document == null) {
+        if (getPDFDocument() == null) {
             return;
         }
-        final List filters = document.getDefaultFilters();
+        final List filters = getPDFDocument().getDefaultFilters();
         for (int i = 0; i < filters.size(); i++) {
             final String filterToAdd = (String) filters.get(i);
             addFilter(filterToAdd);

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFToUnicodeCMap.java	2006-10-07 17:04:14 UTC (rev 8330)
@@ -57,7 +57,7 @@
      */
     public PDFToUnicodeCMap(final PDFDocument doc, final String name,
             final PDFCIDSystemInfo sysInfo, final FontUse fsFont) {
-        super(doc, name, sysInfo);
+        super(doc, name);
         this.fsFont = fsFont;
     }
 

Modified: trunk/foray/scripts/checkstyle-suppressions.xml
===================================================================
--- trunk/foray/scripts/checkstyle-suppressions.xml	2006-10-07 16:43:15 UTC (rev 8329)
+++ trunk/foray/scripts/checkstyle-suppressions.xml	2006-10-07 17:04:14 UTC (rev 8330)
@@ -49,8 +49,6 @@
       files="org.foray.area.*"/>
   <suppress checks="VisibilityModifier"
       files="org.foray.fotree.*"/>
-  <suppress checks="VisibilityModifier"
-      files="org.foray.pdf.*"/>
 
   <!-- Semi-permanent exemptions. -->
   <suppress checks="MagicNumber"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.