You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2003/03/27 11:42:38 UTC
cvs commit: xml-fop/src/java/org/apache/fop/pdf PDFOutline.java
jeremias 2003/03/27 02:42:38
Modified: src/java/org/apache/fop/pdf PDFOutline.java
Log:
The PDF object number doesn't get passed to the constructor anymore. Adjust for that.
Use the toPDFString() (returns String) method instead of toPDF() (returns byte[]) where appropriate. String to byte[] conversion is done in PDFObject in a well-defined location instead of scattered around the codebase.
Revision Changes Path
1.2 +46 -67 xml-fop/src/java/org/apache/fop/pdf/PDFOutline.java
Index: PDFOutline.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/pdf/PDFOutline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PDFOutline.java 11 Mar 2003 13:05:09 -0000 1.1
+++ PDFOutline.java 27 Mar 2003 10:42:38 -0000 1.2
@@ -50,6 +50,8 @@
*/
package org.apache.fop.pdf;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.util.List;
/**
@@ -90,12 +92,11 @@
/**
* Create a PDF outline with the title and action.
*
- * @param number the object id number
* @param title the title of the outline entry (can only be null for root Outlines obj)
* @param action the action for this outline
*/
- public PDFOutline(int number, String title, String action) {
- super(number);
+ public PDFOutline(String title, String action) {
+ super();
subentries = new java.util.ArrayList();
count = 0;
parent = null;
@@ -152,73 +153,51 @@
}
/**
- * represent the object in PDF
- *
- * @return the PDF for this outline
+ * @see org.apache.fop.pdf.PDFObject#toPDF()
*/
protected byte[] toPDF() {
- StringBuffer result = new StringBuffer(this.number + " "
- + this.generation
- + " obj\n<<\n");
- if (parent == null) {
- // root Outlines object
- if (first != null && last != null) {
- result.append(" /First " + first.referencePDF() + "\n");
- result.append(" /Last " + last.referencePDF() + "\n");
- // no count... we start with the outline completely closed for now
- }
- } else {
- // subentry Outline object
- result.append(" /Title (" + escapeString(title) + ")\n");
- result.append(" /Parent " + parent.referencePDF() + "\n");
- if (first != null && last != null) {
- result.append(" /First " + first.referencePDF() + "\n");
- result.append(" /Last " + last.referencePDF() + "\n");
- }
- if (prev != null) {
- result.append(" /Prev " + prev.referencePDF() + "\n");
- }
- if (next != null) {
- result.append(" /Next " + next.referencePDF() + "\n");
- }
- if (count > 0) {
- result.append(" /Count -" + count + "\n");
- }
-
- if (actionRef != null) {
- result.append(" /A " + actionRef + "\n");
- }
-
-
+ ByteArrayOutputStream bout = new ByteArrayOutputStream(128);
+ try {
+ bout.write(encode(getObjectID()));
+ bout.write(encode("<<"));
+ if (parent == null) {
+ // root Outlines object
+ if (first != null && last != null) {
+ bout.write(encode(" /First " + first.referencePDF() + "\n"));
+ bout.write(encode(" /Last " + last.referencePDF() + "\n"));
+ // no count... we start with the outline completely closed for now
+ }
+ } else {
+ // subentry Outline object
+ bout.write(encode(" /Title "));
+ bout.write(encodeText(this.title));
+ bout.write(encode("\n"));
+ bout.write(encode(" /Parent " + parent.referencePDF() + "\n"));
+ if (first != null && last != null) {
+ bout.write(encode(" /First " + first.referencePDF() + "\n"));
+ bout.write(encode(" /Last " + last.referencePDF() + "\n"));
+ }
+ if (prev != null) {
+ bout.write(encode(" /Prev " + prev.referencePDF() + "\n"));
+ }
+ if (next != null) {
+ bout.write(encode(" /Next " + next.referencePDF() + "\n"));
+ }
+ if (count > 0) {
+ bout.write(encode(" /Count -" + count + "\n"));
+ }
+
+ if (actionRef != null) {
+ bout.write(encode(" /A " + actionRef + "\n"));
+ }
+
+
+ }
+ bout.write(encode(">> endobj\n"));
+ } catch (IOException ioe) {
+ getDocumentSafely().getLogger().error("Ignored I/O exception", ioe);
}
- result.append(">> endobj\n");
- return result.toString().getBytes();
-
- }
-
- /**
- * escape string (see 3.8.1 in PDF reference 2nd edition)
- */
- private String escapeString(String s) {
- StringBuffer result = new StringBuffer();
- if (s != null) {
- int l = s.length();
-
- // byte order marker (0xfeff)
- result.append("\\376\\377");
-
- for (int i = 0; i < l; i++) {
- char ch = s.charAt(i);
- int high = (ch & 0xff00) >>> 8;
- int low = ch & 0xff;
- result.append("\\");
- result.append(Integer.toOctalString(high));
- result.append("\\");
- result.append(Integer.toOctalString(low));
- }
- }
-
- return result.toString();
+ return bout.toByteArray();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org