You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ju...@apache.org on 2010/06/21 15:20:42 UTC
svn commit: r956574 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
test/java/org/apache/pdfbox/pdmodel/common/
test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java
Author: jukka
Date: Mon Jun 21 13:20:42 2010
New Revision: 956574
URL: http://svn.apache.org/viewvc?rev=956574&view=rev
Log:
PDFBOX-639: PDNameTreeNode: Limits are only set when setting Names
Patch by Johannes Koch
Added:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java (with props)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java?rev=956574&r1=956573&r2=956574&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java Mon Jun 21 13:20:42 2010
@@ -115,6 +115,15 @@ public class PDNameTreeNode implements C
*/
public void setKids( List kids )
{
+ if (kids != null && kids.size() > 0)
+ {
+ PDNameTreeNode firstKid = (PDNameTreeNode) kids.get(0);
+ PDNameTreeNode lastKid = (PDNameTreeNode) kids.get(kids.size() - 1);
+ String lowerLimit = firstKid.getLowerLimit();
+ this.setLowerLimit(lowerLimit);
+ String upperLimit = lastKid.getUpperLimit();
+ this.setUpperLimit(upperLimit);
+ }
node.setItem( "Kids", COSArrayList.converterToCOSArray( kids ) );
}
Added: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java?rev=956574&view=auto
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java (added)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java Mon Jun 21 13:20:42 2010
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pdfbox.pdmodel.common;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.apache.pdfbox.cos.COSInteger;
+import org.apache.pdfbox.cos.COSObject;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+/**
+ * A test case for PDNameTreeNode.
+ *
+ * @author Koch
+ */
+public class TestPDNameTreeNode extends TestCase
+{
+
+ private PDNameTreeNode node1;
+ private PDNameTreeNode node2;
+ private PDNameTreeNode node4;
+ private PDNameTreeNode node5;
+ private PDNameTreeNode node24;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ this.node5 = new PDNameTreeNode(COSObject.class);
+ SortedMap<String, COSObject> names = new TreeMap<String, COSObject>();
+ COSInteger i = COSInteger.get(89);
+ names.put("Actinium", new COSObject(i));
+ names.put("Aluminum", new COSObject(COSInteger.get(13)));
+ names.put("Americium", new COSObject(COSInteger.get(95)));
+ names.put("Antimony", new COSObject(COSInteger.get(51)));
+ names.put("Argon", new COSObject(COSInteger.get(18)));
+ names.put("Arsenic", new COSObject(COSInteger.get(33)));
+ names.put("Astatine", new COSObject(COSInteger.get(85)));
+ this.node5.setNames(names);
+
+ this.node24 = new PDNameTreeNode(COSObject.class);
+ names = new TreeMap<String, COSObject>();
+ names.put("Xenon", new COSObject(COSInteger.get(54)));
+ names.put("Ytterbium", new COSObject(COSInteger.get(70)));
+ names.put("Yttrium", new COSObject(COSInteger.get(39)));
+ names.put("Zinc", new COSObject(COSInteger.get(30)));
+ names.put("Zirconium", new COSObject(COSInteger.get(40)));
+ this.node24.setNames(names);
+
+ this.node2 = new PDNameTreeNode(COSObject.class);
+ List<PDNameTreeNode> kids = this.node2.getKids();
+ if (kids == null)
+ {
+ kids = new COSArrayList();
+ }
+ kids.add(this.node5);
+ this.node2.setKids(kids);
+
+ this.node4 = new PDNameTreeNode(COSObject.class);
+ kids = this.node4.getKids();
+ if (kids == null)
+ {
+ kids = new COSArrayList();
+ }
+ kids.add(this.node24);
+ this.node4.setKids(kids);
+
+ this.node1 = new PDNameTreeNode(COSObject.class);
+ kids = this.node1.getKids();
+ if (kids == null)
+ {
+ kids = new COSArrayList();
+ }
+ kids.add(this.node2);
+ kids.add(this.node4);
+ this.node1.setKids(kids);
+ }
+
+
+ public void testUpperLimit() throws IOException
+ {
+ Assert.assertEquals("Astatine", this.node5.getUpperLimit());
+ Assert.assertEquals("Astatine", this.node2.getUpperLimit());
+
+ Assert.assertEquals("Zirconium", this.node24.getUpperLimit());
+ Assert.assertEquals("Zirconium", this.node4.getUpperLimit());
+
+ Assert.assertEquals("Zirconium", this.node1.getUpperLimit());
+ }
+
+ public void testLowerLimit() throws IOException
+ {
+ Assert.assertEquals("Actinium", this.node5.getLowerLimit());
+ Assert.assertEquals("Actinium", this.node2.getLowerLimit());
+
+ Assert.assertEquals("Xenon", this.node24.getLowerLimit());
+ Assert.assertEquals("Xenon", this.node4.getLowerLimit());
+
+ Assert.assertEquals("Actinium", this.node1.getLowerLimit());
+ }
+
+}
Propchange: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/common/TestPDNameTreeNode.java
------------------------------------------------------------------------------
svn:eol-style = native