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

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 6985-MiniTimelineDiscovery

Browse Source
This commit is contained in:
William Schaefer 2020-11-25 15:15:51 -05:00
commit 186ca85b45
3 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/PostgresCentralRepo.java
View File

@ -198,13 +198,13 @@ final class PostgresCentralRepo extends RdbmsCentralRepo {
if (connectionPool == null) { if (connectionPool == null) {
setupConnectionPool(); setupConnectionPool();
} }
}
try { try {
return connectionPool.getConnection(); return connectionPool.getConnection();
} catch (SQLException ex) { } catch (SQLException ex) {
throw new CentralRepoException("Error getting connection from connection pool.", Bundle.PostgresEamDb_connectionFailed_message(), ex); // NON-NLS throw new CentralRepoException("Error getting connection from connection pool.", Bundle.PostgresEamDb_connectionFailed_message(), ex); // NON-NLS
} }
} }
}
@Override @Override
protected String getConflictClause() { protected String getConflictClause() {

2
Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModule.java
View File

@ -67,7 +67,7 @@ final class CentralRepoIngestModule implements FileIngestModule {
private static final String MODULE_NAME = CentralRepoIngestModuleFactory.getModuleName(); private static final String MODULE_NAME = CentralRepoIngestModuleFactory.getModuleName();
static final boolean DEFAULT_FLAG_TAGGED_NOTABLE_ITEMS = true; static final boolean DEFAULT_FLAG_TAGGED_NOTABLE_ITEMS = false;
static final boolean DEFAULT_FLAG_PREVIOUS_DEVICES = false; static final boolean DEFAULT_FLAG_PREVIOUS_DEVICES = false;
static final boolean DEFAULT_CREATE_CR_PROPERTIES = true; static final boolean DEFAULT_CREATE_CR_PROPERTIES = true;

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

@ -460,7 +460,6 @@ 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) {
@ -468,18 +467,20 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
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
@ -528,7 +529,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
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.
@ -555,7 +556,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
totalColumnWidth += columnWidth; totalColumnWidth += columnWidth;
if( columnWidth == columnWidthLimit) { if (columnWidth == columnWidthLimit) {
cntMaxSizeColumns++; cntMaxSizeColumns++;
} }
} }
@ -569,17 +570,17 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
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 {