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 BCF34111CB for ; Sat, 30 Aug 2014 16:04:43 +0000 (UTC) Received: (qmail 60433 invoked by uid 500); 30 Aug 2014 16:04:43 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 60410 invoked by uid 500); 30 Aug 2014 16:04:43 -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 60401 invoked by uid 99); 30 Aug 2014 16:04:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2014 16:04:43 +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:04:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 709A323888E2; Sat, 30 Aug 2014 16:04:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1621478 - in /pdfbox/trunk: examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java Date: Sat, 30 Aug 2014 16:04:22 -0000 To: commits@pdfbox.apache.org From: lehmi@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140830160422.709A323888E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lehmi Date: Sat Aug 30 16:04:21 2014 New Revision: 1621478 URL: http://svn.apache.org/r1621478 Log: PDFBOX-2270: optimized handling of null values Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java?rev=1621478&r1=1621477&r2=1621478&view=diff ============================================================================== --- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java (original) +++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java Sat Aug 30 16:04:21 2014 @@ -71,7 +71,10 @@ public class PrintFields Iterator kidsIter = kids.iterator(); if (field != null && !sParent.equals(field.getPartialName())) { - sParent = sParent + "." + partialName; + if (partialName != null) + { + sParent = sParent + "." + partialName; + } } System.out.println(sLevel + sParent); while (kidsIter.hasNext()) @@ -105,11 +108,16 @@ public class PrintFields } else { - fieldValue = ""; + fieldValue = "no value available"; } } - String outputString = sLevel + sParent + "." + partialName + " = " + fieldValue + ", type=" - + field.getClass().getName(); + StringBuilder outputString = new StringBuilder(sLevel + sParent); + if (partialName != null) + { + outputString.append( "." + partialName); + } + outputString.append(" = " + fieldValue); + outputString.append(", type=" + field.getClass().getName()); System.out.println(outputString); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java?rev=1621478&r1=1621477&r2=1621478&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java Sat Aug 30 16:04:21 2014 @@ -566,11 +566,18 @@ public abstract class PDFieldTreeNode im */ public String getFullyQualifiedName() throws IOException { - String parentName = getParent() != null ? getParent().getFullyQualifiedName() : null; String finalName = getPartialName(); + String parentName = getParent() != null ? getParent().getFullyQualifiedName() : null; if (parentName != null) { - finalName = parentName + "." + finalName; + if (finalName != null) + { + finalName = parentName + "." + finalName; + } + else + { + finalName = parentName; + } } return finalName; }