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

Merge pull request #6491 from gdicristofaro/7046-programmaticNav

Browse Source 
7046 programmatic navigation
This commit is contained in:
Richard Cordovano 2020-11-24 14:14:56 -05:00 committed by GitHub
commit af26da9f4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
View File

@ -434,7 +434,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
} }
setColumnWidths(); setColumnWidths();
/* /*
* Load column sorting information from preferences file and apply it to * Load column sorting information from preferences file and apply it to
* columns. * columns.
@ -460,26 +460,27 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
* If one of the child nodes of the root node is to be selected, select * If one of the child nodes of the root node is to be selected, select
* it. * it.
*/ */
SwingUtilities.invokeLater(() -> { if (rootNode instanceof TableFilterNode) {
if (rootNode instanceof TableFilterNode) { NodeSelectionInfo selectedChildInfo = ((TableFilterNode) rootNode).getChildNodeSelectionInfo();
NodeSelectionInfo selectedChildInfo = ((TableFilterNode) rootNode).getChildNodeSelectionInfo(); if (null != selectedChildInfo) {
if (null != selectedChildInfo) { Node[] childNodes = rootNode.getChildren().getNodes(true);
Node[] childNodes = rootNode.getChildren().getNodes(true); for (int i = 0; i < childNodes.length; ++i) {
for (int i = 0; i < childNodes.length; ++i) { Node childNode = childNodes[i];
Node childNode = childNodes[i]; if (selectedChildInfo.matches(childNode)) {
if (selectedChildInfo.matches(childNode)) { SwingUtilities.invokeLater(() -> {
try { try {
this.getExplorerManager().setSelectedNodes(new Node[]{childNode}); this.getExplorerManager().setExploredContextAndSelection(this.rootNode, new Node[]{childNode});
} catch (PropertyVetoException ex) { } catch (PropertyVetoException ex) {
LOGGER.log(Level.SEVERE, "Failed to select node specified by selected child info", ex); LOGGER.log(Level.SEVERE, "Failed to select node specified by selected child info", ex);
} }
break; });
}
break;
} }
((TableFilterNode) rootNode).setChildNodeSelectionInfo(null);
} }
((TableFilterNode) rootNode).setChildNodeSelectionInfo(null);
} }
}); }
/* /*
* The table setup is done, so any added/removed events can now be * The table setup is done, so any added/removed events can now be
@ -516,7 +517,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
protected void setColumnWidths() { protected void setColumnWidths() {
if (rootNode.getChildren().getNodesCount() != 0) { if (rootNode.getChildren().getNodesCount() != 0) {
final Graphics graphics = outlineView.getGraphics(); final Graphics graphics = outlineView.getGraphics();
if (graphics != null) { if (graphics != null) {
// Current width of the outlineView // Current width of the outlineView
double outlineViewWidth = outlineView.getSize().getWidth(); double outlineViewWidth = outlineView.getSize().getWidth();
@ -526,10 +527,10 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
int margin = 4; int margin = 4;
int padding = 8; int padding = 8;
int totalColumnWidth = 0; int totalColumnWidth = 0;
int cntMaxSizeColumns =0; int cntMaxSizeColumns = 0;
// Calulate the width for each column keeping track of the number // Calulate the width for each column keeping track of the number
// of columns that were set to columnwidthLimit. // of columns that were set to columnwidthLimit.
for (int column = 0; column < outline.getModel().getColumnCount(); column++) { for (int column = 0; column < outline.getModel().getColumnCount(); column++) {
@ -552,40 +553,40 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
columnWidth = Math.min(columnWidth, columnWidthLimit); columnWidth = Math.min(columnWidth, columnWidthLimit);
columnWidths.add(columnWidth); columnWidths.add(columnWidth);
totalColumnWidth += columnWidth; totalColumnWidth += columnWidth;
if( columnWidth == columnWidthLimit) { if (columnWidth == columnWidthLimit) {
cntMaxSizeColumns++; cntMaxSizeColumns++;
} }
} }
// Figure out how much extra, if any can be given to the columns // Figure out how much extra, if any can be given to the columns
// so that the table is as wide as outlineViewWidth. If cntMaxSizeColumns // so that the table is as wide as outlineViewWidth. If cntMaxSizeColumns
// is greater than 0 divide the extra space between the columns // is greater than 0 divide the extra space between the columns
// that could use more space. Otherwise divide evenly amoung // that could use more space. Otherwise divide evenly amoung
// all columns. // all columns.
int extraWidth = 0; int extraWidth = 0;
if (totalColumnWidth < outlineViewWidth) { if (totalColumnWidth < outlineViewWidth) {
if (cntMaxSizeColumns > 0) { if (cntMaxSizeColumns > 0) {
extraWidth = (int) ((outlineViewWidth - totalColumnWidth)/cntMaxSizeColumns); extraWidth = (int) ((outlineViewWidth - totalColumnWidth) / cntMaxSizeColumns);
} else { } else {
extraWidth = (int) ((outlineViewWidth - totalColumnWidth)/columnWidths.size()); extraWidth = (int) ((outlineViewWidth - totalColumnWidth) / columnWidths.size());
} }
} }
for(int column = 0; column < columnWidths.size(); column++) { for (int column = 0; column < columnWidths.size(); column++) {
int columnWidth = columnWidths.get(column); int columnWidth = columnWidths.get(column);
if(cntMaxSizeColumns > 0) { if (cntMaxSizeColumns > 0) {
if(columnWidth >= ((column == 0) ? 350 : 300)) { if (columnWidth >= ((column == 0) ? 350 : 300)) {
columnWidth += extraWidth; columnWidth += extraWidth;
} }
} else { } else {
columnWidth += extraWidth; columnWidth += extraWidth;
} }
outline.getColumnModel().getColumn(column).setPreferredWidth(columnWidth); outline.getColumnModel().getColumn(column).setPreferredWidth(columnWidth);
} }
} }