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 6B12310792 for ; Sat, 30 Nov 2013 16:52:29 +0000 (UTC) Received: (qmail 20585 invoked by uid 500); 30 Nov 2013 16:52:29 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 20556 invoked by uid 500); 30 Nov 2013 16:52:28 -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 20542 invoked by uid 99); 30 Nov 2013 16:52:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Nov 2013 16:52:27 +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; Sat, 30 Nov 2013 16:52:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B56B92388999; Sat, 30 Nov 2013 16:52:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1546750 - /pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java Date: Sat, 30 Nov 2013 16:52:04 -0000 To: commits@pdfbox.apache.org From: gbailleul@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131130165204.B56B92388999@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gbailleul Date: Sat Nov 30 16:52:04 2013 New Revision: 1546750 URL: http://svn.apache.org/r1546750 Log: PDFBOX-1642: NPE on Closed Choice * manage closed and open Choice Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java Modified: pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java?rev=1546750&r1=1546749&r2=1546750&view=diff ============================================================================== --- pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java (original) +++ pdfbox/trunk/xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java Sat Nov 30 16:52:04 2013 @@ -50,6 +50,10 @@ import org.w3c.dom.NamedNodeMap; public final class PdfaExtensionHelper { + public static final String CLOSED_CHOICE = "closed Choice of "; + + public static final String OPEN_CHOICE = "open Choice of "; + private PdfaExtensionHelper() { } @@ -240,8 +244,10 @@ public final class PdfaExtensionHelper return TypeMapping.createPropertyType(Types.LangAlt, Cardinality.Simple); } // else all other cases - if ("closed Choice of Text".equals(valueType)) { - valueType = "Text"; + if (valueType.startsWith(CLOSED_CHOICE)) { + valueType = valueType.substring(CLOSED_CHOICE.length()); + } else if (valueType.startsWith(OPEN_CHOICE)) { + valueType = valueType.substring(OPEN_CHOICE.length()); } int pos = valueType.indexOf(' '); Cardinality card = Cardinality.Simple;