svn commit: r1629968 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java

[ti...@apache.org]

Author: tilman
Date: Tue Oct  7 19:36:31 2014
New Revision: 1629968

URL: http://svn.apache.org/r1629968
Log:
PDFBOX-2406: fix typo; minor code cleanup

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java?rev=1629968&r1=1629967&r2=1629968&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java Tue Oct  7 19:36:31 2014
@@ -119,11 +119,11 @@ public class PDExternalGraphicsState imp
             }
             else if( key.equals( COSName.CA ) )
             {
-                gs.setAlphaConstants( getStrokingAlpaConstant() );
+                gs.setAlphaConstants( getStrokingAlphaConstant() );
             }
             else if( key.equals( COSName.CA_NS ) )
             {
-                gs.setNonStrokeAlphaConstants(getNonStrokingAlpaConstant() );
+                gs.setNonStrokeAlphaConstants(getNonStrokingAlphaConstant() );
             }
             else if( key.equals( COSName.AIS ) )
             {
@@ -159,6 +159,7 @@ public class PDExternalGraphicsState imp
      *
      * @return The cos object that matches this Java object.
      */
+    @Override
     public COSBase getCOSObject()
     {
         return dict;
@@ -286,7 +287,7 @@ public class PDExternalGraphicsState imp
         String ri = dict.getNameAsString( "RI" );
         if (ri != null)
         {
-            return RenderingIntent.valueOf(ri);
+            return RenderingIntent.fromString(ri);
         }
         else
         {
@@ -373,14 +374,11 @@ public class PDExternalGraphicsState imp
     public PDFontSetting getFontSetting()
     {
         PDFontSetting setting = null;
-        COSBase base = dict.getDictionaryObject( COSName.FONT );
+        COSBase base = dict.getDictionaryObject(COSName.FONT);
         if (base instanceof COSArray)
         {
-            COSArray font = (COSArray)base;
-            if( font != null )
-            {
-                setting = new PDFontSetting( font );
-            }
+            COSArray font = (COSArray) base;
+            setting = new PDFontSetting(font);
         }
         return setting;
     }
@@ -460,7 +458,7 @@ public class PDExternalGraphicsState imp
      *
      * @return The stroking alpha constant or null if one has not been set.
      */
-    public Float getStrokingAlpaConstant()
+    public Float getStrokingAlphaConstant()
     {
         return getFloatItem(COSName.CA);
     }
@@ -480,7 +478,7 @@ public class PDExternalGraphicsState imp
      *
      * @return The non stroking alpha constant or null if one has not been set.
      */
-    public Float getNonStrokingAlpaConstant()
+    public Float getNonStrokingAlphaConstant()
     {
         return getFloatItem( COSName.CA_NS );
     }
@@ -529,7 +527,8 @@ public class PDExternalGraphicsState imp
      *
      * @return the soft mask
      */
-    public PDSoftMask getSoftMask() {
+    public PDSoftMask getSoftMask()
+    {
         return PDSoftMask.create(dict.getDictionaryObject(COSName.SMASK));
     }