You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/08/02 16:57:25 UTC

svn commit: r1803867 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers: PDCircleAppearanceHandler.java PDLinkAppearanceHandler.java PDPolygonAppearanceHandler.java PDSquareAppearanceHandler.java

Author: tilman
Date: Wed Aug  2 16:57:24 2017
New Revision: 1803867

URL: http://svn.apache.org/viewvc?rev=1803867&view=rev
Log:
PDFBOX-2852: remove unneeded nullcheck

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java?rev=1803867&r1=1803866&r2=1803867&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java Wed Aug  2 16:57:24 2017
@@ -139,10 +139,11 @@ public class PDCircleAppearanceHandler e
         if (bs != null)
         {
             return bs.getWidth();
-        } else
+        }
+        else
         {
             COSArray borderCharacteristics = annotation.getBorder();
-            if (borderCharacteristics != null && borderCharacteristics.size() >= 3)
+            if (borderCharacteristics.size() >= 3)
             {
                 return borderCharacteristics.getInt(3);
             }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java?rev=1803867&r1=1803866&r2=1803867&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java Wed Aug  2 16:57:24 2017
@@ -116,10 +116,11 @@ public class PDLinkAppearanceHandler ext
         if (bs != null)
         {
             return bs.getWidth();
-        } else
+        }
+        else
         {
             COSArray borderCharacteristics = annotation.getBorder();
-            if (borderCharacteristics != null && borderCharacteristics.size() >= 3)
+            if (borderCharacteristics.size() >= 3)
             {
                 return borderCharacteristics.getInt(3);
             }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java?rev=1803867&r1=1803866&r2=1803867&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java Wed Aug  2 16:57:24 2017
@@ -180,10 +180,11 @@ public class PDPolygonAppearanceHandler
         if (bs != null)
         {
             return bs.getWidth();
-        } else
+        }
+        else
         {
             COSArray borderCharacteristics = annotation.getBorder();
-            if (borderCharacteristics != null && borderCharacteristics.size() >= 3)
+            if (borderCharacteristics.size() >= 3)
             {
                 return borderCharacteristics.getInt(3);
             }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java?rev=1803867&r1=1803866&r2=1803867&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java Wed Aug  2 16:57:24 2017
@@ -116,10 +116,11 @@ public class PDSquareAppearanceHandler e
         if (bs != null)
         {
             return bs.getWidth();
-        } else
+        }
+        else
         {
             COSArray borderCharacteristics = annotation.getBorder();
-            if (borderCharacteristics != null && borderCharacteristics.size() >= 3)
+            if (borderCharacteristics.size() >= 3)
             {
                 return borderCharacteristics.getInt(3);
             }