diff --git a/Core/src/org/sleuthkit/autopsy/rejview/HexView.java b/Core/src/org/sleuthkit/autopsy/rejview/HexView.java index 5414231904..0f550423d7 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/HexView.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/HexView.java @@ -155,18 +155,14 @@ final class HexView extends JPanel implements CaretListener { this._offsetView.setText(offsetSB.toString()); this._hexView.setText(hexSB.toString()); this._asciiView.setText(asciiSB.toString()); - + this._hexView.addCaretListener(this); + this._asciiView.addCaretListener(this); this._asciiView.setSelectedTextColor(this._asciiView.getForeground()); this._hexView.setSelectedTextColor(this._asciiView.getForeground()); this._highlightColor = this._hexView.getSelectionColor(); this._highlighterPainter = new DefaultHighlighter.DefaultHighlightPainter(this._highlightColor); } - void addCaretListeners() { - this._hexView.addCaretListener(this); - this._asciiView.addCaretListener(this); - } - /** * clearHighlight removes any colors applied to the text views. */ diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java index 0512f57194..08634087e3 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeValueView.java @@ -124,7 +124,6 @@ public final class RejTreeValueView extends RejTreeNodeView { } default: { HexView hexView = new HexView(data.getAsRawData()); - hexView.addCaretListeners(); hexView.setBorder(BorderFactory.createTitledBorder(Bundle.RejTreeValueView_valueBorder_title())); valueComponent = hexView; break; diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeView.java b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeView.java index 2da3a7034b..3131c7e66a 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejTreeView.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejTreeView.java @@ -63,7 +63,8 @@ final class RejTreeView extends JScrollPane implements TreeExpansionListener, Tr this._tree_model.setAsksAllowsChildren(true); this._tree = new JTree(this._tree_model); - + this._tree.addTreeExpansionListener(this); + this._tree.addTreeSelectionListener(this); // here's a bit of a hack to force the children to be loaded and shown this._tree.collapsePath(new TreePath(rootNode.getPath())); this._tree.expandPath(new TreePath(rootNode.getPath())); @@ -72,11 +73,6 @@ final class RejTreeView extends JScrollPane implements TreeExpansionListener, Tr setPreferredSize(new Dimension(250, 400)); } - void addTreeListeners() { - this._tree.addTreeExpansionListener(this); - this._tree.addTreeSelectionListener(this); - } - /** * getTreeNode creates a TreeNode from a RejTreeNode, settings the * appropriate fields. diff --git a/Core/src/org/sleuthkit/autopsy/rejview/RejView.java b/Core/src/org/sleuthkit/autopsy/rejview/RejView.java index ce72bffb7a..490efc1873 100644 --- a/Core/src/org/sleuthkit/autopsy/rejview/RejView.java +++ b/Core/src/org/sleuthkit/autopsy/rejview/RejView.java @@ -41,7 +41,6 @@ public final class RejView extends JPanel implements RejTreeNodeSelectionListene this._hive = hive; // have to do these cause they're final this._tree_view = new RejTreeView(this._hive); - this._tree_view.addTreeListeners(); this._splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, this._tree_view, new JPanel()); this.setupUI(); @@ -53,7 +52,6 @@ public final class RejView extends JPanel implements RejTreeNodeSelectionListene // have to do these cause they're final this._tree_view = new RejTreeView(this._hive); - this._tree_view.addTreeListeners(); this._splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, this._tree_view, new JPanel()); this.setupUI();