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 A38D5111C8 for ; Sat, 30 Aug 2014 16:04:06 +0000 (UTC) Received: (qmail 58231 invoked by uid 500); 30 Aug 2014 16:04:06 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 58205 invoked by uid 500); 30 Aug 2014 16:04:06 -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 58196 invoked by uid 99); 30 Aug 2014 16:04:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2014 16:04:06 +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 Aug 2014 16:03:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E7ED9238897A; Sat, 30 Aug 2014 16:03:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1621477 - in /pdfbox/branches/1.8: examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java Date: Sat, 30 Aug 2014 16:03:41 -0000 To: commits@pdfbox.apache.org From: lehmi@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140830160341.E7ED9238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lehmi Date: Sat Aug 30 16:03:41 2014 New Revision: 1621477 URL: http://svn.apache.org/r1621477 Log: PDFBOX-2270: optimized handling of null values Modified: pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java Modified: pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java?rev=1621477&r1=1621476&r2=1621477&view=diff ============================================================================== --- pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java (original) +++ pdfbox/branches/1.8/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java Sat Aug 30 16:03:41 2014 @@ -63,15 +63,18 @@ public class PrintFields private void processField(PDField field, String sLevel, String sParent) throws IOException { List kids = field.getKids(); + String partialName = field.getPartialName(); if (kids != null) { Iterator kidsIter = kids.iterator(); - if (!sParent.equals(field.getPartialName())) + if (!sParent.equals(partialName)) { - sParent = sParent + "." + field.getPartialName(); + if (partialName != null) + { + sParent = sParent + "." + partialName; + } } System.out.println(sLevel + sParent); - // System.out.println(sParent + " is of type " + field.getClass().getName()); while (kidsIter.hasNext()) { Object pdfObj = kidsIter.next(); @@ -92,10 +95,22 @@ public class PrintFields } else { - fieldValue = field.getValue(); + if (field.getValue() != null) + { + fieldValue = field.getValue(); + } + else + { + fieldValue = "no value available"; + } + } + StringBuilder outputString = new StringBuilder(sLevel + sParent); + if (partialName != null) + { + outputString.append( "." + partialName); } - String outputString = sLevel + sParent + "." + field.getPartialName() + " = " + fieldValue + ", type=" - + field.getClass().getName(); + outputString.append(" = " + fieldValue); + outputString.append(", type=" + field.getClass().getName()); System.out.println(outputString); } } Modified: pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java URL: http://svn.apache.org/viewvc/pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java?rev=1621477&r1=1621476&r2=1621477&view=diff ============================================================================== --- pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java (original) +++ pdfbox/branches/1.8/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java Sat Aug 30 16:03:41 2014 @@ -120,7 +120,14 @@ public abstract class PDField implements String finalName = getPartialName(); if (parentName != null) { - finalName = parentName + "." + finalName; + if (finalName != null) + { + finalName = parentName + "." + finalName; + } + else + { + finalName = parentName; + } } return finalName; }