You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/11/29 17:51:40 UTC
svn commit: r1883936 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: pdfparser/
pdfparser/xref/ pdfwriter/compress/
Author: lehmi
Date: Sun Nov 29 17:51:40 2020
New Revision: 1883936
URL: http://svn.apache.org/viewvc?rev=1883936&view=rev
Log:
PDFBOX-4952: sonar fixes
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/AbstractXReference.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/NormalXReference.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/COSWriterCompressionPool.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/TraversedCOSElement.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java?rev=1883936&r1=1883935&r2=1883936&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFXRefStream.java Sun Nov 29 17:51:40 2020
@@ -41,9 +41,9 @@ import org.apache.pdfbox.pdfparser.xref.
public class PDFXRefStream
{
- private final List<XReferenceEntry> streamData = new ArrayList<XReferenceEntry>();
+ private final List<XReferenceEntry> streamData = new ArrayList<>();
- private final Set<Long> objectNumbers = new TreeSet<>();;
+ private final Set<Long> objectNumbers = new TreeSet<>();
private final COSStream stream;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/AbstractXReference.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/AbstractXReference.java?rev=1883936&r1=1883935&r2=1883936&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/AbstractXReference.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/AbstractXReference.java Sun Nov 29 17:51:40 2020
@@ -34,7 +34,7 @@ public abstract class AbstractXReference
*
* @param type The {@link XReferenceType} of the crossreference stream entry.
*/
- public AbstractXReference(XReferenceType type)
+ protected AbstractXReference(XReferenceType type)
{
this.type = type;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/NormalXReference.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/NormalXReference.java?rev=1883936&r1=1883935&r2=1883936&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/NormalXReference.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/xref/NormalXReference.java Sun Nov 29 17:51:40 2020
@@ -46,15 +46,14 @@ public class NormalXReference extends Ab
this.byteOffset = byteOffset;
this.key = key;
this.object = object;
- COSBase base = object;
- if (base != null && (base instanceof COSStream || (base instanceof COSObject
- && (base = ((COSObject) base).getObject()) instanceof COSStream)))
+ COSBase base = object instanceof COSObject ? ((COSObject) object).getObject() : object;
+ if (base instanceof COSStream)
{
- this.objectStream = COSName.OBJ_STM.equals(((COSStream) base).getCOSName(COSName.TYPE));
+ objectStream = COSName.OBJ_STM.equals(((COSStream) base).getCOSName(COSName.TYPE));
}
else
{
- this.objectStream = false;
+ objectStream = false;
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/COSWriterCompressionPool.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/COSWriterCompressionPool.java?rev=1883936&r1=1883935&r2=1883936&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/COSWriterCompressionPool.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/COSWriterCompressionPool.java Sun Nov 29 17:51:40 2020
@@ -290,7 +290,7 @@ public class COSWriterCompressionPool
*/
public List<COSWriterObjectStream> createObjectStreams()
{
- List<COSWriterObjectStream> objectStreams = new ArrayList<COSWriterObjectStream>();
+ List<COSWriterObjectStream> objectStreams = new ArrayList<>();
COSWriterObjectStream objectStream = null;
for (int i = 0; i < objectStreamObjects.size(); i++)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/TraversedCOSElement.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/TraversedCOSElement.java?rev=1883936&r1=1883935&r2=1883936&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/TraversedCOSElement.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/compress/TraversedCOSElement.java Sun Nov 29 17:51:40 2020
@@ -130,24 +130,13 @@ public class TraversedCOSElement
public List<TraversedCOSElement> getTraversedElements()
{
- List<TraversedCOSElement> ancestry = this.parent == null
- ? new ArrayList<TraversedCOSElement>() : this.parent.getTraversedElements();
+ List<TraversedCOSElement> ancestry = parent == null ? new ArrayList<>()
+ : parent.getTraversedElements();
ancestry.add(this);
return ancestry;
}
/**
- * Returns true, if the given {@link COSBase} is equal to the object wrapped by this traversal node.
- *
- * @param object The object, that shall be compared.
- * @return True, if the given {@link COSBase} is equal to the object wrapped by this traversal node.
- */
- public boolean equals(COSBase object)
- {
- return this.currentObject == object;
- }
-
- /**
* Searches all known traversed child nodes of the current traversal node for the given {@link COSBase}.
*
* @param object The {@link COSBase}, that shall be found.
@@ -157,12 +146,11 @@ public class TraversedCOSElement
{
for (TraversedCOSElement child : traversedChildren)
{
- if (child.equals(object))
+ if (child.getCurrentObject() == object)
{
return child;
}
}
-
return null;
}