From commits-return-11997-archive-asf-public=cust-asf.ponee.io@pdfbox.apache.org Fri Feb 23 20:37:02 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5E270180652 for ; Fri, 23 Feb 2018 20:37:02 +0100 (CET) Received: (qmail 78181 invoked by uid 500); 23 Feb 2018 19:37:01 -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 78166 invoked by uid 99); 23 Feb 2018 19:37:01 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Feb 2018 19:37:01 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 726BD3A0115 for ; Fri, 23 Feb 2018 19:37:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1825163 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionEmbeddedGoTo.java Date: Fri, 23 Feb 2018 19:36:58 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180223193700.726BD3A0115@svn01-us-west.apache.org> Author: tilman Date: Fri Feb 23 19:36:58 2018 New Revision: 1825163 URL: http://svn.apache.org/viewvc?rev=1825163&view=rev Log: PDFBOX-4117: used (boxed) Boolean because missing parameter has a special meaning Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionEmbeddedGoTo.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionEmbeddedGoTo.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionEmbeddedGoTo.java?rev=1825163&r1=1825162&r2=1825163&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionEmbeddedGoTo.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionEmbeddedGoTo.java Fri Feb 23 19:36:58 2018 @@ -20,6 +20,7 @@ import java.io.IOException; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; +import org.apache.pdfbox.cos.COSBoolean; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.common.filespecification.PDFileSpecification; @@ -124,21 +125,36 @@ public class PDActionEmbeddedGoTo extend * entry is absent, the viewer application should behave in accordance with the current user * preference. * - * @return A flag specifying whether to open the destination document in a new window. + * @return A flag specifying whether to open the destination document in a new window, or null + * if the entry is absent. */ - public boolean shouldOpenInNewWindow() + public Boolean shouldOpenInNewWindow() { - return getCOSObject().getBoolean("NewWindow", true); + if (getCOSObject().getDictionaryObject(COSName.NEW_WINDOW) instanceof COSBoolean) + { + return getCOSObject().getBoolean(COSName.NEW_WINDOW, true); + } + return null; } /** - * This will specify the destination document to open in a new window. + * This will specify whether to open the destination document in a new window. If this flag is + * false, the destination document will replace the current document in the same window. If this + * entry is absent, the viewer application should behave in accordance with the current user + * preference. * - * @param value The flag value. + * @param value The flag value or null if the entry should be removed. */ - public void setOpenInNewWindow(boolean value) + public void setOpenInNewWindow(Boolean value) { - getCOSObject().setBoolean("NewWindow", value); + if (value == null) + { + getCOSObject().removeItem(COSName.NEW_WINDOW); + } + else + { + getCOSObject().setBoolean(COSName.NEW_WINDOW, value); + } } /**