foray-commit Mailing List for FOray

Revision: 10893
          http://foray.svn.sourceforge.net/foray/?rev=10893&view=rev
Author:   victormote
Date:     2009-10-11 18:18:24 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
Clean up some compiler warnings about dead code, bad javadoc. Fixed one bug in FOrayXDiff resulting from flagged dead code.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
    trunk/foray/foray-common/src/java/org/foray/common/Configuration.java
    trunk/foray/foray-hyphen/src/java/org/foray/hyphen/PatternGenerator.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java
    trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java
    trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TextArea.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -933,14 +933,6 @@
         }
 
         /**
-         * Indicates whether this character sequence has a discretionary hyphen.
-         * @return True iff this character sequence has a discretionary hyphen.
-         */
-        public boolean hasDiscretionaryHyphen() {
-            return this.hasDiscretionaryHyphen;
-        }
-
-        /**
          * Indicates whether this character sequence has faux small caps.
          * @return True iff this character sequence has faux small caps.
          */

Modified: trunk/foray/foray-common/src/java/org/foray/common/Configuration.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/Configuration.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-common/src/java/org/foray/common/Configuration.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -167,7 +167,7 @@
      */
     protected List<?> getListValue(final String key) {
         final Object obj = getValue(key);
-        if (obj instanceof List) {
+        if (obj instanceof List<?>) {
             return (List<?>) obj;
         }
         return null;
@@ -356,7 +356,7 @@
             final Object value = this.options.get(key);
             if (value instanceof String) {
                 this.logger.info("   value: " + value);
-            } else if (value instanceof List) {
+            } else if (value instanceof List<?>) {
                 final StringBuilder valueString = new StringBuilder();
                 final List<?> list = (List<?>) value;
                 valueString.append("   value: ");

Modified: trunk/foray/foray-hyphen/src/java/org/foray/hyphen/PatternGenerator.java
===================================================================
--- trunk/foray/foray-hyphen/src/java/org/foray/hyphen/PatternGenerator.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-hyphen/src/java/org/foray/hyphen/PatternGenerator.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -125,7 +125,7 @@
      * variables private. */
 
     /** Maximum number of levels + 1. Also used to denote bad patterns. */
-    private static final byte MAX_VAL = 10;
+    private static final byte DEFAULT_MAX_VAL = 10;
 
     /** Ordinal number of the smallest element of text_char. */
     private static final byte FIRST_TEXT_CHAR = 0;
@@ -196,10 +196,10 @@
     /** Space for pattern count trie, must be less than {@link #TRIE_SIZE} and
      * greater than the number of occurrences of any pattern in the
      * dictionary. */
-    private static final int TRIEC_SIZE = 26000;
+    private static final int DEFAULT_TRIEC_SIZE = 26000;
 
     /** Size of output hash table, should be a multiple of 510. */
-    private static final short MAX_OPS = 4080;
+    private static final short DEFAULT_MAX_OPS = 4080;
 
     /** Maximum pattern length. Also maximum length of external representation
      * of a "letter". */
@@ -209,10 +209,19 @@
     private static final byte MAX_LEN = 50;
 
     /** Maximum length of input lines, must be at least {@link #MAX_LEN}. */
-    private static final short MAX_BUF_LEN = 3000;
+    private static final short DEFAULT_MAX_BUF_LEN = 3000;
 
     /* End of Constants from TeX code. */
 
+    /* Start of constant-like variables. (These were constants in the original code, but can now be expanded if wished,
+     * as we are free of some limitations that existed when this code was first written. */
+    private int triecSize = DEFAULT_TRIEC_SIZE;
+    private short maxOps = DEFAULT_MAX_OPS;
+    private byte maxVal = DEFAULT_MAX_VAL;
+    private short maxBufLen = DEFAULT_MAX_BUF_LEN;
+
+    /* End of constant-like variables. */
+
     /* Start of struct definitions from TeX code. */
     private final class Opword {
         private int dot;
@@ -247,12 +256,12 @@
     private int[] triel = new int[PatternGenerator.TRIE_SIZE + 1];
     private int[] trier = new int[PatternGenerator.TRIE_SIZE + 1];
     private boolean[] trietaken = new boolean[PatternGenerator.TRIE_SIZE + 1];
-    private char[] triecc = new char[PatternGenerator.TRIEC_SIZE + 1];
-    private int[] triecl = new int[PatternGenerator.TRIEC_SIZE + 1];
-    private int[] triecr = new int[PatternGenerator.TRIEC_SIZE + 1];
-    private boolean[] triectaken = new boolean[PatternGenerator.TRIEC_SIZE + 1];
+    private char[] triecc = new char[this.triecSize + 1];
+    private int[] triecl = new int[this.triecSize + 1];
+    private int[] triecr = new int[this.triecSize + 1];
+    private boolean[] triectaken = new boolean[this.triecSize + 1];
     private PatternGenerator.Opword[] ops =
-            new PatternGenerator.Opword[PatternGenerator.MAX_OPS + 1];
+            new PatternGenerator.Opword[this.maxOps + 1];
     {
         for (int i = 0; i < this.ops.length; i++) {
             this.ops[i] = new Opword();
@@ -284,7 +293,7 @@
 //    private float badfrac;
 //    private float denom;
 //    private float eff;
-    private char[] buf = new char[PatternGenerator.MAX_BUF_LEN + 1];
+    private char[] buf = new char[this.maxBufLen + 1];
     private int bufptr;
     private char imax;
     private int lefthyphenmin;
@@ -374,24 +383,24 @@
          * prevent range check and array bound violations. */
 
         int bad = 0;
-        if (PatternGenerator.LAST_ASCII_CODE < WKConstants.MAX_7_BIT_UNSIGNED_VALUES - 1) {
-            bad = 1;
-        }
+//        if (PatternGenerator.LAST_ASCII_CODE < WKConstants.MAX_7_BIT_UNSIGNED_VALUES - 1) {
+//            bad = 1;
+//        }
         if ((si((char) 0) != PatternGenerator.MIN_PACKED)
                 || (so((char) PatternGenerator.MIN_PACKED) != 0)) {
             bad = 2;
         }
-        if ((PatternGenerator.TRIEC_SIZE < 4096)
-                || (PatternGenerator.TRIE_SIZE < PatternGenerator.TRIEC_SIZE)) {
+        if ((this.triecSize < 4096)
+                || (PatternGenerator.TRIE_SIZE < this.triecSize)) {
             bad = 3;
         }
-        if (PatternGenerator.MAX_OPS > PatternGenerator.TRIE_SIZE) {
+        if (this.maxOps > PatternGenerator.TRIE_SIZE) {
             bad = 4;
         }
-        if (PatternGenerator.MAX_VAL > 10) {
+        if (this.maxVal > 10) {
             bad = 5;
         }
-        if (PatternGenerator.MAX_BUF_LEN < PatternGenerator.MAX_LEN) {
+        if (this.maxBufLen < PatternGenerator.MAX_LEN) {
             bad = 6;
         }
         if (bad > 0) {
@@ -600,7 +609,7 @@
         this.trier[this.triemax + 1] = 0;
         int forEnd2;
         h = 1;
-        forEnd2 = PatternGenerator.MAX_OPS;
+        forEnd2 = this.maxOps;
         if (h <= forEnd2) {
             do {
                 this.ops[h].val = 0;
@@ -720,13 +729,13 @@
     }
 
     private int znewtrieop(final int v, final int d, final int n) throws HyphenationException {
-        int h = ((n + 313 * d + 361 * v) % PatternGenerator.MAX_OPS) + 1;
+        int h = ((n + 313 * d + 361 * v) % this.maxOps) + 1;
         while (true) {
             if (this.ops[h].val == 0) {
                 this.opcount = this.opcount + 1;
-                if (this.opcount == PatternGenerator.MAX_OPS) {
+                if (this.opcount == this.maxOps) {
                     throw new HyphenationException("PATGEN capacity exceeded, sorry ["
-                            + PatternGenerator.MAX_OPS + " outputs].");
+                            + this.maxOps + " outputs].");
                 }
                 this.ops[h].val = v;
                 this.ops[h].dot = d;
@@ -741,7 +750,7 @@
             if (h > 1) {
                 h--;
             } else {
-                h = PatternGenerator.MAX_OPS;
+                h = this.maxOps;
             }
         }
     }
@@ -830,13 +839,13 @@
             a = this.triecl[a];
             b = a - this.trieqc[1];
             if (b > this.trieckmax - 256) {
-                if (this.trieckmax == PatternGenerator.TRIEC_SIZE) {
+                if (this.trieckmax == this.triecSize) {
                     throw new HyphenationException("PATGEN capacity exceeded, sorry ["
-                            + PatternGenerator.TRIEC_SIZE + " count trie nodes].");
+                            + this.triecSize + " count trie nodes].");
                 }
                 getLogger().info(this.trieckmax / 1024 + "K ");
-                if (this.trieckmax > PatternGenerator.TRIEC_SIZE - 4096) {
-                    this.trieckmax = PatternGenerator.TRIEC_SIZE;
+                if (this.trieckmax > this.triecSize - 4096) {
+                    this.trieckmax = this.triecSize;
                 } else {
                     this.trieckmax = this.trieckmax + 4096;
                 }
@@ -1052,12 +1061,12 @@
         } else {
             this.bufptr = 0;
             while (! eoln(this.translate)) {
-                if (this.bufptr >= PatternGenerator.MAX_BUF_LEN) {
+                if (this.bufptr >= this.maxBufLen) {
                     this.bufptr = 0;
                     do {
                         this.bufptr = this.bufptr + 1;
                         this.output.print(this.buf[this.bufptr]);
-                    } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                    } while (! (this.bufptr == this.maxBufLen));
                     this.output.printf("%c\n",  ' ');
                     throw new HyphenationException("Line too long");
                 }
@@ -1065,7 +1074,7 @@
                 this.buf[this.bufptr] = (char) this.translate.read();
             }
             readln(this.translate);
-            while (this.bufptr < PatternGenerator.MAX_BUF_LEN) {
+            while (this.bufptr < this.maxBufLen) {
                 this.bufptr = this.bufptr + 1;
                 this.buf[this.bufptr] = ' ';
             }
@@ -1146,7 +1155,7 @@
                 do {
                     this.bufptr = this.bufptr + 1;
                     this.output.print(this.buf[this.bufptr]);
-                } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                } while (! (this.bufptr == this.maxBufLen));
                 this.output.printf("%c\n",  ' ');
                 throw new HyphenationException("Bad hyphenation data");
             }
@@ -1154,12 +1163,12 @@
             while (! eof(this.translate)) {
                 this.bufptr = 0;
                 while (! eoln(this.translate)) {
-                    if (this.bufptr >= PatternGenerator.MAX_BUF_LEN) {
+                    if (this.bufptr >= this.maxBufLen) {
                         this.bufptr = 0;
                         do {
                             this.bufptr = this.bufptr + 1;
                             this.output.print(this.buf[this.bufptr]);
-                        } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                        } while (! (this.bufptr == this.maxBufLen));
                         this.output.printf("%c\n", ' ');
                         throw new HyphenationException("Line too long");
                     }
@@ -1167,7 +1176,7 @@
                     this.buf[this.bufptr] = (char) this.translate.read();
                 }
                 readln(this.translate);
-                while (this.bufptr < PatternGenerator.MAX_BUF_LEN) {
+                while (this.bufptr < this.maxBufLen) {
                     this.bufptr = this.bufptr + 1;
                     this.buf[this.bufptr] = ' ';
                 }
@@ -1176,7 +1185,7 @@
                 lab30: while (! bad) {
                     this.patlen = 0;
                     do {
-                        if (this.bufptr < PatternGenerator.MAX_BUF_LEN) {
+                        if (this.bufptr < this.maxBufLen) {
                             this.bufptr = this.bufptr + 1;
                         } else {
                             bad = true;
@@ -1191,7 +1200,7 @@
                                         do {
                                             this.bufptr = this.bufptr + 1;
                                             this.output.print(this.buf[this.bufptr]);
-                                        } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                                        } while (! (this.bufptr == this.maxBufLen));
                                         this.output.printf("%c\n",  ' ');
                                         throw new HyphenationException(
                                                 "PATGEN capacity exceeded, sorry [" + 256
@@ -1281,7 +1290,7 @@
                     do {
                         this.bufptr = this.bufptr + 1;
                         this.output.print(this.buf[this.bufptr]);
-                    } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                    } while (! (this.bufptr == this.maxBufLen));
                     this.output.printf("%c\n",  ' ');
                     throw new HyphenationException("Bad representation");
                 }
@@ -1320,10 +1329,10 @@
                         forEnd2 = i - 1;
                         if (j <= forEnd2) {
                             do {
-                                if (this.triecmax == PatternGenerator.TRIEC_SIZE) {
+                                if (this.triecmax == this.triecSize) {
                                     throw new HyphenationException(
                                             "PATGEN capacity exceeded, sorry ["
-                                            + PatternGenerator.TRIEC_SIZE + " count trie nodes].");
+                                            + this.triecSize + " count trie nodes].");
                                 }
                                 this.triecmax = this.triecmax + 1;
                                 this.triecl[l] = this.triecmax;
@@ -1352,7 +1361,7 @@
                     if (i < this.patlen) {
                         traversecounttrie(this.triecl[a], i + 1);
                     } else if (this.goodwt * this.triecl[a] < this.thresh) {
-                        insertpattern(PatternGenerator.MAX_VAL, this.patdot);
+                        insertpattern(this.maxVal, this.patdot);
                         this.badpatcount = this.badpatcount + 1;
                     } else if (this.goodwt * this.triecl[a] - this.badwt * this.triecr[a]
                             >= this.thresh) {
@@ -1414,7 +1423,7 @@
                     this.ops[0].op = this.trier[t];
                     n = this.ops[0].op;
                     while (n > 0) {
-                        if (this.ops[n].val == PatternGenerator.MAX_VAL) {
+                        if (this.ops[n].val == this.maxVal) {
                             this.ops[h].op = this.ops[n].op;
                         } else {
                             h = n;
@@ -1456,10 +1465,10 @@
         deletepatterns(1);
         int forEnd;
         h = 1;
-        forEnd = PatternGenerator.MAX_OPS;
+        forEnd = this.maxOps;
         if (h <= forEnd) {
             do {
-                if (this.ops[h].val == PatternGenerator.MAX_VAL) {
+                if (this.ops[h].val == this.maxVal) {
                     this.ops[h].val = 0;
                     this.opcount = this.opcount - 1;
                 }
@@ -1538,12 +1547,12 @@
         {
             this.bufptr = 0;
             while (! eoln(this.dictionary)) {
-                if (this.bufptr >= PatternGenerator.MAX_BUF_LEN) {
+                if (this.bufptr >= this.maxBufLen) {
                     this.bufptr = 0;
                     do {
                         this.bufptr = this.bufptr + 1;
                         this.output.print(this.buf[this.bufptr]);
-                    } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                    } while (! (this.bufptr == this.maxBufLen));
                     this.output.printf("%c\n", ' ');
                     throw new HyphenationException("Line too long");
                 }
@@ -1552,7 +1561,7 @@
                 this.buf[this.bufptr] = (char) byteRead;
             }
             readln(this.dictionary);
-            while (this.bufptr < PatternGenerator.MAX_BUF_LEN) {
+            while (this.bufptr < this.maxBufLen) {
                 this.bufptr = this.bufptr + 1;
                 this.buf[this.bufptr] = ' ';
             }
@@ -1586,7 +1595,7 @@
                     do {
                         this.bufptr = this.bufptr + 1;
                         this.output.print(this.buf[this.bufptr]);
-                    } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                    } while (! (this.bufptr == this.maxBufLen));
                     this.output.printf("%c\n", ' ');
                     throw new HyphenationException("PATGEN capacity exceeded, sorry ["
                             + "word length=" + PatternGenerator.MAX_LEN + "].");
@@ -1603,7 +1612,7 @@
                     do {
                         this.bufptr = this.bufptr + 1;
                         this.output.print(this.buf[this.bufptr]);
-                    } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                    } while (! (this.bufptr == this.maxBufLen));
                     this.output.printf("%c\n", ' ');
                     throw new HyphenationException("PATGEN capacity exceeded, sorry ["
                             + "word length=" + PatternGenerator.MAX_LEN + "].");
@@ -1616,7 +1625,7 @@
                         do {
                             this.bufptr = this.bufptr + 1;
                             this.output.print(this.buf[this.bufptr]);
-                        } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                        } while (! (this.bufptr == this.maxBufLen));
                         this.output.printf("%c\n", ' ');
                         throw new HyphenationException("Bad representation");
                     }
@@ -1624,7 +1633,7 @@
                         this.word[this.wlen] = (char) this.trier[t];
                         break lab30;
                     }
-                    if (this.bufptr == PatternGenerator.MAX_BUF_LEN) {
+                    if (this.bufptr == this.maxBufLen) {
                         c = ' ';
                     } else {
                         this.bufptr = this.bufptr + 1;
@@ -1640,12 +1649,12 @@
                 do {
                     this.bufptr = this.bufptr + 1;
                     this.output.print(this.buf[this.bufptr]);
-                } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                } while (! (this.bufptr == this.maxBufLen));
                 this.output.printf("%c\n", ' ');
                 throw new HyphenationException("Bad character");
             }
             }
-        } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+        } while (! (this.bufptr == this.maxBufLen));
         this.wlen = this.wlen + 1;
         this.word[this.wlen] = 1;
     }
@@ -1671,7 +1680,7 @@
                     while (h > 0) {
                         dpos = spos + this.ops[h].dot;
                         v = this.ops[h].val;
-                        if ((v < PatternGenerator.MAX_VAL)
+                        if ((v < this.maxVal)
                                 && (this.hval[dpos] < v)) {
                             this.hval[dpos] = v;
                         }
@@ -1894,12 +1903,12 @@
             while (! eof(this.patterns)) {
                 this.bufptr = 0;
                 while (! eoln(this.patterns)) {
-                    if (this.bufptr >= PatternGenerator.MAX_BUF_LEN) {
+                    if (this.bufptr >= this.maxBufLen) {
                         this.bufptr = 0;
                         do {
                             this.bufptr = this.bufptr + 1;
                             this.output.print(this.buf[this.bufptr]);
-                        } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                        } while (! (this.bufptr == this.maxBufLen));
                         this.output.printf("%c\n", ' ');
                         throw new HyphenationException("Line too long");
                     }
@@ -1908,7 +1917,7 @@
                     this.buf[this.bufptr] = (char) readChar;
                 }
                 readln(this.patterns);
-                while (this.bufptr < PatternGenerator.MAX_BUF_LEN) {
+                while (this.bufptr < this.maxBufLen) {
                     this.bufptr = this.bufptr + 1;
                     this.buf[this.bufptr] = ' ';
                 }
@@ -1924,12 +1933,12 @@
                         break lab40;
                     case 1: {
                         d = this.xint[c];
-                        if (d >= PatternGenerator.MAX_VAL) {
+                        if (d >= this.maxVal) {
                             this.bufptr = 0;
                             do {
                                 this.bufptr = this.bufptr + 1;
                                 this.output.print(this.buf[this.bufptr]);
-                            } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                            } while (! (this.bufptr == this.maxBufLen));
                             this.output.printf("%c\n", ' ');
                             throw new HyphenationException("Bad hyphenation value");
                         }
@@ -1956,7 +1965,7 @@
                                 do {
                                     this.bufptr = this.bufptr + 1;
                                     this.output.print(this.buf[this.bufptr]);
-                                } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                                } while (! (this.bufptr == this.maxBufLen));
                                 this.output.printf("%c\n", ' ');
                                 throw new HyphenationException("Bad representation");
                             }
@@ -1964,7 +1973,7 @@
                                 this.pat[this.patlen] = (char) this.trier[t];
                                 break lab30;
                             }
-                            if (this.bufptr == PatternGenerator.MAX_BUF_LEN) {
+                            if (this.bufptr == this.maxBufLen) {
                                 c = ' ';
                             } else {
                                 this.bufptr = this.bufptr + 1;
@@ -1979,12 +1988,12 @@
                         do {
                             this.bufptr = this.bufptr + 1;
                             this.output.print(this.buf[this.bufptr]);
-                        } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                        } while (! (this.bufptr == this.maxBufLen));
                         this.output.printf("%c\n", ' ');
                         throw new HyphenationException("Bad character");
                     }
                     }
-                } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                } while (! (this.bufptr == this.maxBufLen));
                 if (this.patlen > 0) {
                     int forEnd;
                     i = 0;
@@ -2001,7 +2010,7 @@
                                         do {
                                             this.bufptr = this.bufptr + 1;
                                             this.output.print(this.buf[this.bufptr]);
-                                        } while (! (this.bufptr == PatternGenerator.MAX_BUF_LEN));
+                                        } while (! (this.bufptr == this.maxBufLen));
                                         this.output.printf("%c\n", ' ');
                                         throw new HyphenationException("Bad edge_of_word");
                                     }
@@ -2037,15 +2046,15 @@
             this.output.print("hyph_start, hyph_finish: ");
             input2ints();
             if ((this.n1 >= 1)
-                    && (this.n1 < PatternGenerator.MAX_VAL)
+                    && (this.n1 < this.maxVal)
                     && (this.n2 >= 1)
-                    && (this.n2 < PatternGenerator.MAX_VAL)) {
+                    && (this.n2 < this.maxVal)) {
                 this.hyphstart = this.n1;
                 this.hyphfinish = this.n2;
             } else {
                 this.n1 = 0;
                 this.output.printf("%s%ld%s\n", "Specify 1<=hyph_start,hyph_finish<=",
-                        (long) PatternGenerator.MAX_VAL - 1, " !");
+                        (long) this.maxVal - 1, " !");
             }
         } while (! (this.n1 > 0));
         this.hyphlevel = this.maxpat;

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	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFAnnotation.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -41,7 +41,7 @@
     /**
      * Create objects associated with a link annotation (GoToR).
      *
-     * @param doc {@inheritDoc}
+     * @param doc The PDF document being built.
      * @param r The rectangle which outlines the link.
      */
     public PDFAnnotation(final PDFDocument doc, final Rectangle2D r) {

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFBorderStyle.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -85,7 +85,7 @@
 
     /**
      * Create a PDFBorderStyle object.
-     * @param doc {@inheritDoc}
+     * @param doc The PDF document being built.
      * @param width The width, in points, of the border to be drawn. A width
      * of 0 disables border drawing.
      * @param style The border style to be applied.

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPage.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -72,7 +72,7 @@
 
     /**
      * Create a /Page object.
-     * @param doc {@inheritDoc}
+     * @param doc The PDF document being built.
      * @param resources the /Resources object
      * @param pagewidth the page's width in points
      * @param pageheight the page's height in points

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPages.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -56,7 +56,7 @@
      * can refer to the parent) so that the XRef table needs to
      * be updated before this object is written.
      *
-     * @param doc {@inheritDoc}
+     * @param doc The PDF document being built.
      */
     public PDFPages(final PDFDocument doc) {
         super(doc);

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFPattern.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -93,7 +93,7 @@
     /**
      * Create a tiling pattern (type 1).
      *
-     * @param doc {@inheritDoc}
+     * @param doc The PDF document being built.
      * @param theResources the resources associated with this pattern
      * @param thePatternType the type of pattern, which is 1 for tiling.
      * @param thePaintType 1 or 2, colored or uncolored.
@@ -133,7 +133,7 @@
 
     /**
      * Create a type 2 pattern (smooth shading).
-     * @param doc {@inheritDoc}
+     * @param doc The PDF document being built.
      * @param thePatternType the type of the pattern, which is 2, smooth shading
      * @param theShading the PDF Shading object that comprises this pattern
      * @param theXUID optional:the extended unique Identifier if used.

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayPretty.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -864,14 +864,6 @@
         }
 
         /**
-         * Returns the number of items in the queue.
-         * @return The number of items in the queue.
-         */
-        protected int size() {
-            return this.toWriteQueue.size();
-        }
-
-        /**
          * Adds an item to the queue.
          * @param itemToAdd The item to be added to the queue.
          */

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2009-08-27 19:53:43 UTC (rev 10892)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2009-10-11 18:18:24 UTC (rev 10893)
@@ -506,12 +506,11 @@
             compareString = XMLUtil.normalizeWhitespace(compareString);
             final int differIndex = StringUtil.firstDifferent(baseString,
                     compareString);
-            if (differIndex < 0) {
-                return true;
+            if (differIndex >= 0) {
+                message("Document " + (i + 1) + " differs at character "
+                        + (differIndex + 1));
+                return false;
             }
-            message("Document " + (i + 1) + " differs at character "
-                    + (differIndex + 1));
-            return false;
         }
         return true;
     }


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