Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E89FF11BF9 for ; Wed, 18 Jun 2014 17:18:27 +0000 (UTC) Received: (qmail 50043 invoked by uid 500); 18 Jun 2014 17:18:26 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 49964 invoked by uid 500); 18 Jun 2014 17:18:26 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 49909 invoked by uid 99); 18 Jun 2014 17:18:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 17:18:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 17:18:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 979E923888D2; Wed, 18 Jun 2014 17:18:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603539 - in /pdfbox/trunk/pdfbox/src: main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/ main/java/org/apache/pdfbox/pdmodel/encryption/ main/java/org/apache/pdfbox/pdmodel/font/ main/java/org/apache/pdfbox/pdmodel/... Date: Wed, 18 Jun 2014 17:18:04 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140618171804.979E923888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tilman Date: Wed Jun 18 17:18:03 2014 New Revision: 1603539 URL: http://svn.apache.org/r1603539 Log: PDFBOX-2147: replace redundant if statements Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/AccessPermission.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontManager.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java?rev=1603539&r1=1603538&r2=1603539&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java Wed Jun 18 17:18:03 2014 @@ -178,11 +178,7 @@ public abstract class PDAttributeObject { if (oldValue == null) { - if (newValue == null) - { - return false; - } - return true; + return newValue != null; } return !oldValue.equals(newValue); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java?rev=1603539&r1=1603538&r2=1603539&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java Wed Jun 18 17:18:03 2014 @@ -179,11 +179,7 @@ public class PDUserProperty extends PDDi { if (oldEntry == null) { - if (newEntry == null) - { - return false; - } - return true; + return newEntry != null; } return !oldEntry.equals(newEntry); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/AccessPermission.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/AccessPermission.java?rev=1603539&r1=1603538&r2=1603539&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/AccessPermission.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/AccessPermission.java Wed Jun 18 17:18:03 2014 @@ -438,10 +438,6 @@ public class AccessPermission { return true; } - if (canPrintDegraded()) - { - return true; - } - return false; + return canPrintDegraded(); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontManager.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontManager.java?rev=1603539&r1=1603538&r2=1603539&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontManager.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontManager.java Wed Jun 18 17:18:03 2014 @@ -319,11 +319,7 @@ public class FontManager return true; } String psname = font.getPSName().toLowerCase(); - if (psname.indexOf("bold") > -1) - { - return true; - } - return false; + return psname.indexOf("bold") > -1; } /** @@ -342,10 +338,6 @@ public class FontManager return true; } String psname = font.getPSName().toLowerCase(); - if (psname.indexOf("italic") > -1 || psname.indexOf("oblique") > -1) - { - return true; - } - return false; + return psname.indexOf("italic") > -1 || psname.indexOf("oblique") > -1; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java?rev=1603539&r1=1603538&r2=1603539&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java Wed Jun 18 17:18:03 2014 @@ -104,12 +104,7 @@ class GouraudTriangle return false; } - if ((xCminusB * (p.getY() - pointB.getY()) - yCminusB * (p.getX() - pointB.getX()) > 0) != signAB) - { - return false; - } - - return true; + return (xCminusB * (p.getY() - pointB.getY()) - yCminusB * (p.getX() - pointB.getX()) > 0) == signAB; } // returns the area of a triangle Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java?rev=1603539&r1=1603538&r2=1603539&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNumberTreeNode.java Wed Jun 18 17:18:03 2014 @@ -76,9 +76,7 @@ public class TestPDNumberTreeNode extend if ( getClass() != obj.getClass()) return false; PDTest other = (PDTest) obj; - if ( value != other.value) - return false; - return true; + return value == other.value; } } Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java?rev=1603539&r1=1603538&r2=1603539&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java Wed Jun 18 17:18:03 2014 @@ -175,18 +175,8 @@ public class TestTextStripper extends Te } } } - else if( ( expected == null && actual != null && actual.trim().isEmpty( ) ) || - ( actual == null && expected != null && expected.trim().isEmpty( ) ) ) - { - //basically there are some cases where pdfbox will put an extra line - //at the end of the file, who cares, this is not enough to report - // a failure - equals = true; - } - else - { - equals = false; - } + else equals = ( expected == null && actual != null && actual.trim().isEmpty( ) ) || + ( actual == null && expected != null && expected.trim().isEmpty( ) ); return equals; }