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 2020/02/05 20:31:49 UTC
svn commit: r1873669 - in /pdfbox/trunk:
debugger/src/main/java/org/apache/pdfbox/debugger/streampane/
debugger/src/main/java/org/apache/pdfbox/debugger/ui/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/
preflight/src/main/java/org/apac...
Author: tilman
Date: Wed Feb 5 20:31:48 2020
New Revision: 1873669
URL: http://svn.apache.org/viewvc?rev=1873669&view=rev
Log:
PDFBOX-4767: null check no longer needed
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/Tree.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java?rev=1873669&r1=1873668&r2=1873669&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java Wed Feb 5 20:31:48 2020
@@ -196,16 +196,14 @@ public class Stream
filterList.put(DECODED, null);
PDStream pdStream = new PDStream(stream);
- if (pdStream.getFilters() != null)
- {
- int filtersSize = pdStream.getFilters().size();
+ int filtersSize = pdStream.getFilters().size();
- for (int i = filtersSize - 1; i >= 1; i--)
- {
- filterList.put(getPartialStreamCommand(i), getStopFilterList(i));
- }
- filterList.put(getFilteredLabel(), null);
+ for (int i = filtersSize - 1; i >= 1; i--)
+ {
+ filterList.put(getPartialStreamCommand(i), getStopFilterList(i));
}
+ filterList.put(getFilteredLabel(), null);
+
return filterList;
}
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/Tree.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/Tree.java?rev=1873669&r1=1873668&r2=1873669&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/Tree.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/Tree.java Wed Feb 5 20:31:48 2020
@@ -52,6 +52,7 @@ import java.util.List;
@SuppressWarnings({"serial","squid:S1948"})
public class Tree extends JTree
{
+ // No logging possible because this class is created before the "LogDialog.init()" call
private final JPopupMenu treePopupMenu;
private final Object rootNode;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1873669&r1=1873668&r2=1873669&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java Wed Feb 5 20:31:48 2020
@@ -134,7 +134,7 @@ public final class PDImageXObject extend
super(stream, COSName.IMAGE);
this.resources = resources;
List<COSName> filters = stream.getFilters();
- if (filters != null && !filters.isEmpty() && COSName.JPX_DECODE.equals(filters.get(filters.size()-1)))
+ if (!filters.isEmpty() && COSName.JPX_DECODE.equals(filters.get(filters.size() - 1)))
{
try (COSInputStream is = stream.createInputStream())
{
@@ -831,7 +831,7 @@ public final class PDImageXObject extend
{
List<COSName> filters = getStream().getFilters();
- if (filters == null)
+ if (filters.isEmpty())
{
return "png";
}
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java?rev=1873669&r1=1873668&r2=1873669&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java Wed Feb 5 20:31:48 2020
@@ -218,7 +218,7 @@ public abstract class FontDescriptorHelp
if (metadata != null)
{
// Filters are forbidden in a XMP stream
- if (metadata.getFilters() != null && !metadata.getFilters().isEmpty())
+ if (!metadata.getFilters().isEmpty())
{
this.fContainer.push(new ValidationError(ERROR_SYNTAX_STREAM_INVALID_FILTER,
this.font.getName() + ": Filter specified in font file metadata dictionary"));