mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 09:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

4961 make internal listeners for HexView and RejTreeView to avoid leaking this

Browse Source
This commit is contained in:
William Schaefer 2019-05-10 18:28:20 -04:00
parent 711ae01f20
commit 6feed3db22
2 changed files with 168 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
Core/src/org/sleuthkit/autopsy/rejview/HexView.java
View File

@ -51,7 +51,7 @@ import org.sleuthkit.autopsy.coreutils.Logger;
* estimate it to load three strings with length equal to the given ByteBuffer.
* So its probably not good to use this view with large files.
*/
final class HexView extends JPanel implements CaretListener {
final class HexView extends JPanel {
private final static int DEFAULT_BYTES_PER_LINE = 0x10;
private final static char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
@ -59,6 +59,7 @@ final class HexView extends JPanel implements CaretListener {
private static final long serialVersionUID = 1L;
private final int bytesPerLine;
private final ByteBuffer buf;
private final HexViewListener listener = new HexViewListener();
private final JTextComponent offsetView;
private final JTextComponent hexView;
private final JTextComponent asciiView;
@ -155,45 +156,84 @@ 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.hexView.addCaretListener(listener);
this.asciiView.addCaretListener(listener);
this.asciiView.setSelectedTextColor(this.asciiView.getForeground());
this.hexView.setSelectedTextColor(this.asciiView.getForeground());
this.highlightColor = this.hexView.getSelectionColor();
this.highlighterPainter = new DefaultHighlighter.DefaultHighlightPainter(this.highlightColor);
}
/**
* clearHighlight removes any colors applied to the text views.
*/
private void clearHighlight() {
this.asciiView.getHighlighter().removeAllHighlights();
this.hexView.getHighlighter().removeAllHighlights();
}
/**
* setHighlight colors the given byte range.
*
* @param startByte The starting byte index of the selection.
* @param endByte The ending byte index of the selection.
*/
private void setHighlight(int startByte, int endByte) {
int startRows = (startByte - (startByte % this.bytesPerLine)) / this.bytesPerLine;
int endRows = (endByte - (endByte % this.bytesPerLine)) / this.bytesPerLine;
private class HexViewListener implements CaretListener {
@Override
public void caretUpdate(CaretEvent e) {
if (e.getMark() == e.getDot()) {
this.clearHighlight();
}
try {
this.asciiView.getHighlighter().addHighlight(startByte + startRows, endByte + endRows, this.highlighterPainter);
this.hexView.getHighlighter().addHighlight((startByte * 3) + startRows, (endByte * 3) + endRows, this.highlighterPainter);
} catch (BadLocationException ex) {
logger.log(Level.WARNING, "bad location", ex);
if (e.getSource() == asciiView) {
int startByte = e.getMark();
int endByte = e.getDot();
if (startByte > endByte) {
int t = endByte;
endByte = startByte;
startByte = t;
}
// the number of line endings before the start,end points
int startRows = (startByte - (startByte % bytesPerLine)) / bytesPerLine;
int endRows = (endByte - (endByte % bytesPerLine)) / bytesPerLine;
// the byte index of the start,end points in the ASCII view
startByte -= startRows;
endByte -= endRows;
// avoid the loop
if (asciiLastSelectionStart == startByte && asciiLastSelectionEnd == endByte) {
return;
}
asciiLastSelectionStart = startByte;
asciiLastSelectionEnd = endByte;
this.setSelection(startByte, endByte);
} else if (e.getSource() == hexView) {
int startByte = e.getMark();
int endByte = e.getDot();
if (startByte > endByte) {
int t = endByte;
endByte = startByte;
startByte = t;
}
// the number of line endings before the start,end points
int startRows = (startByte - (startByte % bytesPerLine)) / (3 * bytesPerLine);
int endRows = (endByte - (endByte % bytesPerLine)) / (3 * bytesPerLine);
// the byte index of the start,end points in the ASCII view
startByte -= startRows;
startByte /= 3;
endByte -= endRows;
endByte /= 3;
if (hexLastSelectionStart == startByte && hexLastSelectionEnd == endByte) {
return;
}
hexLastSelectionStart = startByte;
hexLastSelectionEnd = endByte;
this.setSelection(startByte, endByte);
} else {
logger.log(Level.INFO, "from unknown");
}
}
/**
* setSelection sets the given byte range as "selected", which from a GUI
* perspective means the bytes are highlighted, and the status bar updated.
* setSelection sets the given byte range as "selected", which from a
* GUI perspective means the bytes are highlighted, and the status bar
* updated.
*
* @param startByte The starting byte index of the selection.
* @param endByte The ending byte index of the selection.
@ -225,77 +265,42 @@ final class HexView extends JPanel implements CaretListener {
String.format("0x%1$x", startByte),
String.format("0x%1$x", endByte),
String.format("0x%1$x", length));
this.statusLabel.setText(text);
statusLabel.setText(text);
} else {
/**
* @param 1 Start
*/
String text = Bundle.HexView_statusTemplate_zeroLength(startByte, String.format("0x%1$x", startByte));
this.statusLabel.setText(text);
statusLabel.setText(text);
}
}
@Override
public void caretUpdate(CaretEvent e) {
if (e.getMark() == e.getDot()) {
/**
* clearHighlight removes any colors applied to the text views.
*/
private void clearHighlight() {
asciiView.getHighlighter().removeAllHighlights();
hexView.getHighlighter().removeAllHighlights();
}
/**
* setHighlight colors the given byte range.
*
* @param startByte The starting byte index of the selection.
* @param endByte The ending byte index of the selection.
*/
private void setHighlight(int startByte, int endByte) {
int startRows = (startByte - (startByte % bytesPerLine)) / bytesPerLine;
int endRows = (endByte - (endByte % bytesPerLine)) / bytesPerLine;
this.clearHighlight();
}
if (e.getSource() == this.asciiView) {
int startByte = e.getMark();
int endByte = e.getDot();
if (startByte > endByte) {
int t = endByte;
endByte = startByte;
startByte = t;
}
// the number of line endings before the start,end points
int startRows = (startByte - (startByte % this.bytesPerLine)) / this.bytesPerLine;
int endRows = (endByte - (endByte % this.bytesPerLine)) / this.bytesPerLine;
// the byte index of the start,end points in the ASCII view
startByte -= startRows;
endByte -= endRows;
// avoid the loop
if (asciiLastSelectionStart == startByte && asciiLastSelectionEnd == endByte) {
return;
}
asciiLastSelectionStart = startByte;
asciiLastSelectionEnd = endByte;
this.setSelection(startByte, endByte);
} else if (e.getSource() == this.hexView) {
int startByte = e.getMark();
int endByte = e.getDot();
if (startByte > endByte) {
int t = endByte;
endByte = startByte;
startByte = t;
}
// the number of line endings before the start,end points
int startRows = (startByte - (startByte % this.bytesPerLine)) / (3 * this.bytesPerLine);
int endRows = (endByte - (endByte % this.bytesPerLine)) / (3 * this.bytesPerLine);
// the byte index of the start,end points in the ASCII view
startByte -= startRows;
startByte /= 3;
endByte -= endRows;
endByte /= 3;
if (hexLastSelectionStart == startByte && hexLastSelectionEnd == endByte) {
return;
}
hexLastSelectionStart = startByte;
hexLastSelectionEnd = endByte;
this.setSelection(startByte, endByte);
} else {
logger.log(Level.INFO, "from unknown");
try {
asciiView.getHighlighter().addHighlight(startByte + startRows, endByte + endRows, highlighterPainter);
hexView.getHighlighter().addHighlight((startByte * 3) + startRows, (endByte * 3) + endRows, highlighterPainter);
} catch (BadLocationException ex) {
logger.log(Level.WARNING, "bad location", ex);
}
}
}
}

31
Core/src/org/sleuthkit/autopsy/rejview/RejTreeView.java
View File

@ -38,14 +38,16 @@ import javax.swing.JTree;
import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.coreutils.Logger;
final class RejTreeView extends JScrollPane implements TreeExpansionListener, TreeSelectionListener {
final class RejTreeView extends JScrollPane {
private static final Logger logger = Logger.getLogger(HexView.class.getName());
private static final long serialVersionUID = 1L;
private final DefaultTreeModel treeModel;
private final RejTreeViewListener listener = new RejTreeViewListener();
private final RegistryHive hive;
private final CopyOnWriteArrayList<RejTreeNodeSelectionListener> nodeSelectionListeners;
private final JTree tree;
@NbBundle.Messages({"RejTreeView.failureValueName.text=PARSE FAILED"})
RejTreeView(RegistryHive hive) {
this.hive = hive;
@ -63,8 +65,8 @@ final class RejTreeView extends JScrollPane implements TreeExpansionListener, Tr
this.treeModel.setAsksAllowsChildren(true);
this.tree = new JTree(this.treeModel);
this.tree.addTreeExpansionListener(this);
this.tree.addTreeSelectionListener(this);
this.tree.addTreeExpansionListener(listener);
this.tree.addTreeSelectionListener(listener);
// 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()));
@ -83,6 +85,16 @@ final class RejTreeView extends JScrollPane implements TreeExpansionListener, Tr
return ret;
}
void addRejTreeNodeSelectionListener(RejTreeNodeSelectionListener l) {
this.nodeSelectionListeners.add(l);
}
void removeRejTreeNodeSelectionListener(RejTreeNodeSelectionListener l) {
this.nodeSelectionListeners.remove(l);
}
private class RejTreeViewListener implements TreeExpansionListener, TreeSelectionListener {
@Override
public void treeExpanded(TreeExpansionEvent event) {
TreePath path = event.getPath();
@ -93,7 +105,7 @@ final class RejTreeView extends JScrollPane implements TreeExpansionListener, Tr
for (RejTreeNode rejTreeNode : n.getChildren()) {
node.add(getTreeNode(rejTreeNode));
}
this.treeModel.nodeStructureChanged(node);
treeModel.nodeStructureChanged(node);
}
}
@ -108,18 +120,11 @@ final class RejTreeView extends JScrollPane implements TreeExpansionListener, Tr
this.triggerRejTreeNodeSelection((RejTreeNode) node.getUserObject());
}
void addRejTreeNodeSelectionListener(RejTreeNodeSelectionListener l) {
this.nodeSelectionListeners.add(l);
}
void removeRejTreeNodeSelectionListener(RejTreeNodeSelectionListener l) {
this.nodeSelectionListeners.remove(l);
}
void triggerRejTreeNodeSelection(RejTreeNode n) {
RejTreeNodeSelectionEvent e = new RejTreeNodeSelectionEvent(n);
for (RejTreeNodeSelectionListener listener : this.nodeSelectionListeners) {
for (RejTreeNodeSelectionListener listener : nodeSelectionListeners) {
listener.nodeSelected(e);
}
}
}
}