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 2023/04/14 13:54:44 UTC
svn commit: r1909134 - in /pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger: PDFDebugger.java ui/PDFTreeCellRenderer.java ui/XrefEntries.java ui/XrefEntry.java
Author: lehmi
Date: Fri Apr 14 13:54:44 2023
New Revision: 1909134
URL: http://svn.apache.org/viewvc?rev=1909134&view=rev
Log:
PDFBOX-5539: sonar fix
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntries.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntry.java
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java?rev=1909134&r1=1909133&r2=1909134&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java Fri Apr 14 13:54:44 2023
@@ -193,7 +193,7 @@ public class PDFDebugger extends JFrame
private JMenuItem findPreviousMenuItem;
// current view mode of the tree
- private String treeViewMode = TreeViewMenu.VIEW_PAGES;
+ private String currentTreeViewMode = TreeViewMenu.VIEW_PAGES;
// cli options
// Expected for CLI app to write to System.out/System.err
@@ -224,7 +224,7 @@ public class PDFDebugger extends JFrame
{
if (viewstructure)
{
- treeViewMode = TreeViewMenu.VIEW_STRUCTURE;
+ currentTreeViewMode = TreeViewMenu.VIEW_STRUCTURE;
}
}
@@ -238,7 +238,7 @@ public class PDFDebugger extends JFrame
{
if (TreeViewMenu.isValidViewMode(initialViewMode))
{
- treeViewMode = initialViewMode;
+ currentTreeViewMode = initialViewMode;
}
else
{
@@ -319,7 +319,7 @@ public class PDFDebugger extends JFrame
*/
public String getTreeViewMode()
{
- return treeViewMode;
+ return currentTreeViewMode;
}
/**
@@ -332,7 +332,7 @@ public class PDFDebugger extends JFrame
{
if (TreeViewMenu.isValidViewMode(viewMode))
{
- treeViewMode = viewMode;
+ currentTreeViewMode = viewMode;
}
}
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java?rev=1909134&r1=1909133&r2=1909134&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/PDFTreeCellRenderer.java Fri Apr 14 13:54:44 2023
@@ -262,7 +262,6 @@ public class PDFTreeCellRenderer extends
else if (nodeValue instanceof XrefEntry)
{
isIndirect = true;
- isStream = false;
}
if (isIndirect && !isStream)
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntries.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntries.java?rev=1909134&r1=1909133&r2=1909134&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntries.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntries.java Fri Apr 14 13:54:44 2023
@@ -35,15 +35,15 @@ import org.apache.pdfbox.cos.COSObjectKe
*/
public class XrefEntries
{
- public static final String path = "CRT";
+ public static final String PATH = "CRT";
- private final List<Entry<COSObjectKey, Long>> xrefEntries;
+ private final List<Entry<COSObjectKey, Long>> entries;
private final COSDocument document;
public XrefEntries(PDDocument document)
{
Map<COSObjectKey, Long> xrefTable = document.getDocument().getXrefTable();
- xrefEntries = xrefTable.entrySet().stream()
+ entries = xrefTable.entrySet().stream()
.sorted(Comparator.comparingLong(e -> e.getKey().getNumber()))
.collect(Collectors.toList());
this.document = document.getDocument();
@@ -51,31 +51,28 @@ public class XrefEntries
public int getXrefEntryCount()
{
- return xrefEntries.size();
+ return entries.size();
}
public XrefEntry getXrefEntry(int index)
{
- Entry<COSObjectKey, Long> entry = xrefEntries.get(index);
+ Entry<COSObjectKey, Long> entry = entries.get(index);
COSObject objectFromPool = document.getObjectFromPool(entry.getKey());
-
- XrefEntry xrefEntry = new XrefEntry(index, entry.getKey(), entry.getValue(),
- objectFromPool);
- return xrefEntry;
+ return new XrefEntry(index, entry.getKey(), entry.getValue(), objectFromPool);
}
public int indexOf(XrefEntry xrefEntry)
{
COSObjectKey key = xrefEntry.getKey();
- Entry<COSObjectKey, Long> entry = xrefEntries.stream().filter(e -> key.equals(e.getKey()))
+ Entry<COSObjectKey, Long> entry = entries.stream().filter(e -> key.equals(e.getKey()))
.findFirst().orElse(null);
- return entry != null ? xrefEntries.indexOf(entry) : 0;
+ return entry != null ? entries.indexOf(entry) : 0;
}
@Override
public String toString()
{
- return path;
+ return PATH;
}
}
Modified: pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntry.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntry.java?rev=1909134&r1=1909133&r2=1909134&view=diff
==============================================================================
--- pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntry.java (original)
+++ pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/XrefEntry.java Fri Apr 14 13:54:44 2023
@@ -62,7 +62,7 @@ public class XrefEntry
public String getPath()
{
- return XrefEntries.path + "/" + toString();
+ return XrefEntries.PATH + "/" + toString();
}
@Override