svn commit: r926516 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: cos/COSName.java pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java pdmodel/documentinterchange/logicalstructure/PDObjectReference.java

[koch]

Author: koch
Date: Tue Mar 23 10:14:17 2010
New Revision: 926516

URL: http://svn.apache.org/viewvc?rev=926516&view=rev
Log:
Added some new COSNames for logical structure

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java?rev=926516&r1=926515&r2=926516&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java Tue 
Mar 23 10:14:17 2010
@@ -456,6 +456,10 @@ public final class COSName extends COSBa
     */
     public static final COSName MATRIX = new COSName( "Matrix" );
     /**
+     * "MCID"
+     */
+    public static final COSName MCID = new COSName("MCID");
+    /**
      * A common COSName value.
      */
     public static final COSName MEDIA_BOX = new COSName(  "MediaBox" );
@@ -482,6 +486,11 @@ public final class COSName extends COSBa
     /** "Numbs" */
     public static final COSName NUMS = new COSName( "Nums" );
 
+    /**
+     * "Obj"
+     */
+    public static final COSName OBJ = new COSName("Obj");
+
     /** "Outlines" */
     public static final COSName OUTLINES = new COSName("Outlines");
 

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java?rev=926516&r1=926515&r2=926516&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java
 Tue Mar 23 10:14:17 2010
@@ -25,7 +25,7 @@ import org.apache.pdfbox.pdmodel.common.
 /**
  * A marked-content reference.
  * 
- * @author Koch
+ * @author <a href="mailto:johannes%20koch%20%3ck...@apache.org%3e";>Johannes 
Koch</a>
  * @version $Revision: $
  */
 public class PDMarkedContentReference implements COSObjectable
@@ -75,7 +75,8 @@ public class PDMarkedContentReference im
      */
     public PDPage getPage()
     {
-        COSDictionary pg = (COSDictionary) 
this.getCOSDictionary().getDictionaryObject("Pg");
+        COSDictionary pg = (COSDictionary) this.getCOSDictionary()
+            .getDictionaryObject(COSName.PG);
         if (pg != null)
         {
             return new PDPage(pg);
@@ -90,7 +91,7 @@ public class PDMarkedContentReference im
      */
     public void setPage(PDPage page)
     {
-        this.getCOSDictionary().setItem("Pg", page);
+        this.getCOSDictionary().setItem(COSName.PG, page);
     }
 
     /**
@@ -100,7 +101,7 @@ public class PDMarkedContentReference im
      */
     public int getMCID()
     {
-        return this.getCOSDictionary().getInt("MCID");
+        return this.getCOSDictionary().getInt(COSName.MCID);
     }
 
     /**
@@ -110,7 +111,7 @@ public class PDMarkedContentReference im
      */
     public void setMCID(int mcid)
     {
-        this.getCOSDictionary().setInt("MCID", mcid);
+        this.getCOSDictionary().setInt(COSName.MCID, mcid);
     }
 
 

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java?rev=926516&r1=926515&r2=926516&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java
 Tue Mar 23 10:14:17 2010
@@ -28,7 +28,7 @@ import org.apache.pdfbox.pdmodel.interac
 /**
  * An object reference.
  * 
- * @author Koch
+ * @author <a href="mailto:johannes%20koch%20%3ck...@apache.org%3e";>Johannes 
Koch</a>
  * @version $Revision: $
  */
 public class PDObjectReference implements COSObjectable
@@ -80,7 +80,7 @@ public class PDObjectReference implement
      */
     public COSObjectable getReferencedObject()
     {
-        COSBase obj = this.getCOSDictionary().getDictionaryObject("Obj");
+        COSBase obj = this.getCOSDictionary().getDictionaryObject(COSName.OBJ);
         try
         {
             return PDAnnotation.createAnnotation(obj);
@@ -108,7 +108,7 @@ public class PDObjectReference implement
      */
     public void setReferencedObject(PDAnnotation annotation)
     {
-        this.getCOSDictionary().setItem("Obj", annotation);
+        this.getCOSDictionary().setItem(COSName.OBJ, annotation);
     }
 
     /**
@@ -118,7 +118,7 @@ public class PDObjectReference implement
      */
     public void setReferencedObject(PDXObject xobject)
     {
-        this.getCOSDictionary().setItem("Obj", xobject);
+        this.getCOSDictionary().setItem(COSName.OBJ, xobject);
     }
 
 }