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 2021/11/21 11:31:51 UTC
svn commit: r1895225 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
Author: tilman
Date: Sun Nov 21 11:31:51 2021
New Revision: 1895225
URL: http://svn.apache.org/viewvc?rev=1895225&view=rev
Log:
PDFBOX-4892: optimize, as suggested by valerybokov
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=1895225&r1=1895224&r2=1895225&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 Nov 21 11:31:51 2021
@@ -214,34 +214,31 @@ public abstract class PDNameTreeNode<T e
{
T retval = null;
Map<String, T> names = getNames();
- if( names != null )
+ if (names != null)
{
- retval = names.get( name );
+ return names.get(name);
}
- else
+ List<PDNameTreeNode<T>> kids = getKids();
+ if (kids != null)
{
- List<PDNameTreeNode<T>> kids = getKids();
- if (kids != null)
+ for (int i = 0; i < kids.size(); i++)
{
- for( int i=0; i<kids.size() && retval == null; i++ )
+ PDNameTreeNode<T> childNode = kids.get(i);
+ String upperLimit = childNode.getUpperLimit();
+ String lowerLimit = childNode.getLowerLimit();
+ if (upperLimit == null || lowerLimit == null ||
+ upperLimit.compareTo(lowerLimit) < 0 ||
+ (lowerLimit.compareTo(name) <= 0 && upperLimit.compareTo(name) >= 0))
{
- PDNameTreeNode<T> childNode = kids.get( i );
- String upperLimit = childNode.getUpperLimit();
- String lowerLimit = childNode.getLowerLimit();
- if (upperLimit == null || lowerLimit == null ||
- upperLimit.compareTo(lowerLimit) < 0 ||
- (lowerLimit.compareTo(name) <= 0 && upperLimit.compareTo(name) >= 0))
- {
- retval = childNode.getValue( name );
- }
+ return childNode.getValue(name);
}
}
- else
- {
- LOG.warn("NameTreeNode does not have \"names\" nor \"kids\" objects.");
- }
}
- return retval;
+ else
+ {
+ LOG.warn("NameTreeNode does not have \"names\" nor \"kids\" objects.");
+ }
+ return null;
}
/**