PDFBOX-5660: refactor, avoid leaking this in constructor; remove unused

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1934034 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

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

@@ -377,6 +377,7 @@ private void initComponents()
         jSplitPane = new javax.swing.JSplitPane();
         JScrollPane jScrollPaneLeft = new JScrollPane();
         tree = new Tree();
+        tree.init();
         jScrollPaneRight = new JScrollPane();
         jTextPane = new javax.swing.JTextPane();
 

debugger/src/main/java/org/apache/pdfbox/debugger/treestatus/TreeStatus.java

@@ -34,12 +34,8 @@
  */
 public final class TreeStatus
 {
-    private Object rootNode;
+    private final Object rootNode;
 
-    private TreeStatus()
-    {
-    }
-    
     /**
      * Constructor.
      *

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

@@ -59,7 +59,6 @@ public class Tree extends JTree
 {
     // No logging possible in this class because it is created before the "LogDialog.init()" call
     private final JPopupMenu treePopupMenu;
-    private final Object rootNode;
 
     // Temporary files are stored in a private temp directory with restricted permissions,
     // which is deleted on exit using a shutdown hook.
@@ -72,8 +71,14 @@ public class Tree extends JTree
     public Tree()
     {
         treePopupMenu = new JPopupMenu();
+    }
+
+    /**
+     * Initialization, to be called immediately after construction.
+     */
+    public void init()
+    {
         setComponentPopupMenu(treePopupMenu);
-        rootNode = getModel().getRoot();
         int treeRowHeight = Integer.parseInt(PDFDebugger.configuration.getProperty(
                                     "treeRowHeight", Integer.toString(getRowHeight())));
         setRowHeight(treeRowHeight);
@@ -159,7 +164,8 @@ private JMenuItem getTreePathMenuItem(final TreePath path)
         copyPathMenuItem.addActionListener(actionEvent ->
         {
             Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-            clipboard.setContents(new StringSelection(new TreeStatus(rootNode).getStringForPath(path)), null);
+            String pathString = new TreeStatus(getModel().getRoot()).getStringForPath(path);
+            clipboard.setContents(new StringSelection(pathString), null);
         });
         return copyPathMenuItem;
     }