svn commit: r1871628 - in /pdfbox/branches/2.0: examples/src/main/java/org/apache/pdfbox/examples/util/AddWatermarkText.java pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java

[tilman]

Author: tilman
Date: Mon Dec 16 06:21:53 2019
New Revision: 1871628

URL: http://svn.apache.org/viewvc?rev=1871628&view=rev
Log:
PDFBOX-4710: replace deprecated calls

Modified:
    
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/util/AddWatermarkText.java
    
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java

Modified: 
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/util/AddWatermarkText.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/util/AddWatermarkText.java?rev=1871628&r1=1871627&r2=1871628&view=diff
==============================================================================
--- 
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/util/AddWatermarkText.java
 (original)
+++ 
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/util/AddWatermarkText.java
 Mon Dec 16 06:21:53 2019
@@ -16,6 +16,7 @@
  */
 package org.apache.pdfbox.examples.util;
 
+import java.awt.Color;
 import java.io.File;
 import java.io.IOException;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -86,10 +87,8 @@ public class AddWatermarkText
         gs.setLineWidth(3f);
         cs.setGraphicsStateParameters(gs);
 
-        // some API weirdness here. When int, range is 0..255.
-        // when float, this would be 0..1f
-        cs.setNonStrokingColor(255, 0, 0);
-        cs.setStrokingColor(255, 0, 0);
+        cs.setNonStrokingColor(Color.red);
+        cs.setStrokingColor(Color.red);
 
         cs.beginText();
         cs.newLineAtOffset(x, y);

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
URL: 
http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java?rev=1871628&r1=1871627&r2=1871628&view=diff
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
 (original)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
 Mon Dec 16 06:21:53 2019
@@ -69,7 +69,7 @@ class AppearanceGeneratorHelper
      *
      * Regardless of other settings in an existing appearance stream Adobe 
will always use this value.
      */
-    private static final int[] HIGHLIGHT_COLOR = {153,193,215};
+    private static final float[] HIGHLIGHT_COLOR = {153/255f, 193/255f, 
215/255f};
  
     /**
      * The scaling factor for font units to PDF units
@@ -700,14 +700,14 @@ class AppearanceGeneratorHelper
                     highlightBoxHeight);
             contents.fill();
         }
-        contents.setNonStrokingColor(0);
+        contents.setNonStrokingColor(0f);
     }
     
     
     private void insertGeneratedListboxAppearance(PDPageContentStream 
contents, PDAppearanceStream appearanceStream,
             PDRectangle contentRect, PDFont font, float fontSize) throws 
IOException
     {
-        contents.setNonStrokingColor(0);
+        contents.setNonStrokingColor(0f);
         
         int q = field.getQ();