You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2016/08/21 08:04:36 UTC
svn commit: r1757041 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel: ./ common/
documentinterchange/logicalstructure/
Author: tilman
Date: Sun Aug 21 08:04:35 2016
New Revision: 1757041
URL: http://svn.apache.org/viewvc?rev=1757041&view=rev
Log:
PDFBOX-2852: add generic type argument to uses of PDNameTreeNode, as suggested by Lorenz Pahl
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDestinationNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDJavascriptNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDestinationNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDestinationNameTreeNode.java?rev=1757041&r1=1757040&r2=1757041&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDestinationNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDestinationNameTreeNode.java Sun Aug 21 08:04:35 2016
@@ -64,7 +64,7 @@ public class PDDestinationNameTreeNode e
}
@Override
- protected PDNameTreeNode createChildNode( COSDictionary dic )
+ protected PDNameTreeNode<PDPageDestination> createChildNode( COSDictionary dic )
{
return new PDDestinationNameTreeNode(dic);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java?rev=1757041&r1=1757040&r2=1757041&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDEmbeddedFilesNameTreeNode.java Sun Aug 21 08:04:35 2016
@@ -54,7 +54,7 @@ public class PDEmbeddedFilesNameTreeNode
}
@Override
- protected PDNameTreeNode createChildNode( COSDictionary dic )
+ protected PDNameTreeNode<PDComplexFileSpecification> createChildNode( COSDictionary dic )
{
return new PDEmbeddedFilesNameTreeNode(dic);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDJavascriptNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDJavascriptNameTreeNode.java?rev=1757041&r1=1757040&r2=1757041&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDJavascriptNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDJavascriptNameTreeNode.java Sun Aug 21 08:04:35 2016
@@ -59,7 +59,7 @@ public class PDJavascriptNameTreeNode ex
}
@Override
- protected PDNameTreeNode createChildNode( COSDictionary dic )
+ protected PDNameTreeNode<PDActionJavaScript> createChildNode( COSDictionary dic )
{
return new PDJavascriptNameTreeNode(dic);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java?rev=1757041&r1=1757040&r2=1757041&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDStructureElementNameTreeNode.java Sun Aug 21 08:04:35 2016
@@ -55,7 +55,7 @@ public class PDStructureElementNameTreeN
}
@Override
- protected PDNameTreeNode createChildNode( COSDictionary dic )
+ protected PDNameTreeNode<PDStructureElement> createChildNode( COSDictionary dic )
{
return new PDStructureElementNameTreeNode(dic);
}
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=1757041&r1=1757040&r2=1757041&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 Sun Aug 21 08:04:35 2016
@@ -42,7 +42,7 @@ public abstract class PDNameTreeNode<T e
private static final Log LOG = LogFactory.getLog(PDNameTreeNode.class);
private final COSDictionary node;
- private PDNameTreeNode parent;
+ private PDNameTreeNode<T> parent;
/**
* Constructor.
@@ -78,7 +78,7 @@ public abstract class PDNameTreeNode<T e
*
* @return parent node
*/
- public PDNameTreeNode getParent()
+ public PDNameTreeNode<T> getParent()
{
return parent;
}
@@ -88,7 +88,7 @@ public abstract class PDNameTreeNode<T e
*
* @param parentNode the node to be set as parent
*/
- public void setParent(PDNameTreeNode parentNode)
+ public void setParent(PDNameTreeNode<T> parentNode)
{
parent = parentNode;
calculateLimits();
@@ -135,7 +135,7 @@ public abstract class PDNameTreeNode<T e
{
if (kids != null && kids.size() > 0)
{
- for (PDNameTreeNode kidsNode : kids)
+ for (PDNameTreeNode<T> kidsNode : kids)
{
kidsNode.setParent(this);
}
@@ -167,8 +167,8 @@ public abstract class PDNameTreeNode<T e
List<PDNameTreeNode<T>> kids = getKids();
if (kids != null && kids.size() > 0)
{
- PDNameTreeNode firstKid = kids.get(0);
- PDNameTreeNode lastKid = kids.get(kids.size() - 1);
+ PDNameTreeNode<T> firstKid = kids.get(0);
+ PDNameTreeNode<T> lastKid = kids.get(kids.size() - 1);
String lowerLimit = firstKid.getLowerLimit();
setLowerLimit(lowerLimit);
String upperLimit = lastKid.getUpperLimit();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java?rev=1757041&r1=1757040&r2=1757041&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureTreeRoot.java Sun Aug 21 08:04:35 2016
@@ -118,7 +118,7 @@ public class PDStructureTreeRoot extends
*
* @return the ID tree
*/
- public PDNameTreeNode getIDTree()
+ public PDNameTreeNode<PDStructureElement> getIDTree()
{
COSDictionary idTreeDic = (COSDictionary) this.getCOSObject().getDictionaryObject(COSName.ID_TREE);
if (idTreeDic != null)
@@ -133,7 +133,7 @@ public class PDStructureTreeRoot extends
*
* @param idTree the ID tree
*/
- public void setIDTree(PDNameTreeNode idTree)
+ public void setIDTree(PDNameTreeNode<PDStructureElement> idTree)
{
this.getCOSObject().setItem(COSName.ID_TREE, idTree);
}