svn commit: r1655432 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: cos/COSName.java pdmodel/interactive/annotation/PDAnnotationWidget.java pdmodel/interactive/annotation/PDAppearanceCharacteristicsDictionary.java

[ti...@apache.org]

Author: tilman
Date: Wed Jan 28 18:58:16 2015
New Revision: 1655432

URL: http://svn.apache.org/r1655432
Log:
PDFBOX-2636: "BG" and "MK" as COSName

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSName.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceCharacteristicsDictionary.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=1655432&r1=1655431&r2=1655432&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 Wed Jan 28 18:58:16 2015
@@ -83,6 +83,7 @@ public final class COSName extends COSBa
     public static final COSName BBOX = new COSName("BBox");
     public static final COSName BC = new COSName("BC");
     public static final COSName BEFORE = new COSName("Before");
+    public static final COSName BG = new COSName("BG");
     public static final COSName BITS_PER_COMPONENT = new COSName("BitsPerComponent");
     public static final COSName BITS_PER_COORDINATE = new COSName("BitsPerCoordinate");
     public static final COSName BITS_PER_FLAG = new COSName("BitsPerFlag");
@@ -315,6 +316,7 @@ public final class COSName extends COSBa
     public static final COSName MEDIA_BOX = new COSName("MediaBox");
     public static final COSName METADATA = new COSName("Metadata");
     public static final COSName MISSING_WIDTH = new COSName("MissingWidth");
+    public static final COSName MK = new COSName("MK");
     public static final COSName ML = new COSName("ML");
     public static final COSName MM_TYPE1 = new COSName("MMType1");
     public static final COSName MOD_DATE = new COSName("ModDate");

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java?rev=1655432&r1=1655431&r2=1655432&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java Wed Jan 28 18:58:16 2015
@@ -127,7 +127,7 @@ public class PDAnnotationWidget extends
      */
     public PDAppearanceCharacteristicsDictionary getAppearanceCharacteristics()
     {
-        COSBase mk = this.getDictionary().getDictionaryObject(COSName.getPDFName("MK"));
+        COSBase mk = this.getDictionary().getDictionaryObject(COSName.MK);
         if (mk instanceof COSDictionary)
         {
             return new PDAppearanceCharacteristicsDictionary((COSDictionary) mk);
@@ -142,7 +142,7 @@ public class PDAnnotationWidget extends
      */
     public void setAppearanceCharacteristics(PDAppearanceCharacteristicsDictionary appearanceCharacteristics)
     {
-        this.getDictionary().setItem("MK", appearanceCharacteristics);
+        this.getDictionary().setItem(COSName.MK, appearanceCharacteristics);
     }
 
     /**

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceCharacteristicsDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceCharacteristicsDictionary.java?rev=1655432&r1=1655431&r2=1655432&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceCharacteristicsDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAppearanceCharacteristicsDictionary.java Wed Jan 28 18:58:16 2015
@@ -97,7 +97,7 @@ public class PDAppearanceCharacteristics
      */
     public PDColor getBorderColour()
     {
-        COSBase c = this.getDictionary().getItem(COSName.getPDFName("BC"));
+        COSBase c = this.getDictionary().getItem(COSName.BC);
         if (c instanceof COSArray)
         {
             PDColorSpace colorSpace = null;
@@ -119,7 +119,7 @@ public class PDAppearanceCharacteristics
      */
     public void setBorderColour(PDColor c)
     {
-        this.getDictionary().setItem("BC", c.toCOSArray());
+        this.getDictionary().setItem(COSName.BC, c.toCOSArray());
     }
 
     /**
@@ -129,7 +129,7 @@ public class PDAppearanceCharacteristics
      */
     public PDColor getBackground()
     {
-        COSBase c = this.getDictionary().getItem(COSName.getPDFName("BG"));
+        COSBase c = this.getDictionary().getItem(COSName.BG);
         if (c instanceof COSArray)
         {
             PDColorSpace colorSpace = null;
@@ -151,7 +151,7 @@ public class PDAppearanceCharacteristics
      */
     public void setBackground(PDColor c)
     {
-        this.getDictionary().setItem("BG", c.toCOSArray());
+        this.getDictionary().setItem(COSName.BG, c.toCOSArray());
     }
 
     /**