Skip to content

Commit bafbbe4

Browse files
committed
PDFBOX-5660: use String switch; throw exception for state that never happens
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1924375 13f79535-47bb-0310-9956-ffa450edef68
1 parent ef84478 commit bafbbe4

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,30 +1493,32 @@ public void initTree()
14931493
statusPane.updateTreeStatus(treeStatus);
14941494

14951495
String treeViewMode = TreeViewMenu.getInstance().getTreeViewSelection();
1496-
if (TreeViewMenu.VIEW_PAGES.equals(treeViewMode))
1497-
{
1498-
File file = new File(currentFilePath);
1499-
DocumentEntry documentEntry = new DocumentEntry(document, file.getName());
1500-
ZoomMenu.getInstance().resetZoom();
1501-
RotationMenu.getInstance().setRotationSelection(RotationMenu.ROTATE_0_DEGREES);
1502-
ImageTypeMenu.getInstance().setImageTypeSelection(ImageTypeMenu.IMAGETYPE_RGB);
1503-
RenderDestinationMenu.getInstance()
1504-
.setRenderDestinationSelection(RenderDestinationMenu.RENDER_DESTINATION_EXPORT);
1505-
tree.setModel(new PDFTreeModel(documentEntry));
1506-
// Root/Pages/Kids/[0] is not always the first page, so use the first row instead:
1507-
tree.setSelectionPath(tree.getPathForRow(1));
1508-
}
1509-
else if (TreeViewMenu.VIEW_STRUCTURE.equals(treeViewMode))
1510-
{
1511-
tree.setModel(new PDFTreeModel(document));
1512-
tree.setSelectionPath(treeStatus.getPathForString("Root"));
1513-
tree.setSelectionPath(tree.getPathForRow(1));
1514-
}
1515-
else if (TreeViewMenu.VIEW_CROSS_REF_TABLE.equals(treeViewMode))
1516-
{
1517-
tree.setModel(new PDFTreeModel(new XrefEntries(document)));
1518-
tree.setSelectionPath(treeStatus.getPathForString("CRT"));
1519-
tree.setSelectionPath(tree.getPathForRow(1));
1496+
switch (treeViewMode)
1497+
{
1498+
case TreeViewMenu.VIEW_PAGES:
1499+
File file = new File(currentFilePath);
1500+
DocumentEntry documentEntry = new DocumentEntry(document, file.getName());
1501+
ZoomMenu.getInstance().resetZoom();
1502+
RotationMenu.getInstance().setRotationSelection(RotationMenu.ROTATE_0_DEGREES);
1503+
ImageTypeMenu.getInstance().setImageTypeSelection(ImageTypeMenu.IMAGETYPE_RGB);
1504+
RenderDestinationMenu.getInstance()
1505+
.setRenderDestinationSelection(RenderDestinationMenu.RENDER_DESTINATION_EXPORT);
1506+
tree.setModel(new PDFTreeModel(documentEntry));
1507+
// Root/Pages/Kids/[0] is not always the first page, so use the first row instead:
1508+
tree.setSelectionPath(tree.getPathForRow(1));
1509+
break;
1510+
case TreeViewMenu.VIEW_STRUCTURE:
1511+
tree.setModel(new PDFTreeModel(document));
1512+
tree.setSelectionPath(treeStatus.getPathForString("Root"));
1513+
tree.setSelectionPath(tree.getPathForRow(1));
1514+
break;
1515+
case TreeViewMenu.VIEW_CROSS_REF_TABLE:
1516+
tree.setModel(new PDFTreeModel(new XrefEntries(document)));
1517+
tree.setSelectionPath(treeStatus.getPathForString("CRT"));
1518+
tree.setSelectionPath(tree.getPathForRow(1));
1519+
break;
1520+
default:
1521+
break;
15201522
}
15211523
}
15221524

debugger/src/main/java/org/apache/pdfbox/debugger/ui/TreeViewMenu.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public String getTreeViewSelection()
107107
{
108108
return VIEW_CROSS_REF_TABLE;
109109
}
110-
return null;
110+
throw new IllegalStateException("No tree view selection");
111111
}
112112

113113
/**

0 commit comments

Comments
 (0)