From 93ec4fa1b30b0e7ac2aa34c81de62b45f912deef Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Thu, 13 Dec 2018 01:14:41 -0500 Subject: [PATCH 1/3] Lessened the severity of log message. --- .../autopsy/centralrepository/datamodel/EamArtifactUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java index 3ee0a40d85..89fa1d61ca 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java @@ -235,9 +235,12 @@ public class EamArtifactUtil { TskData.FileKnown.UNKNOWN, bbSourceFile.getId()); - } catch (TskCoreException | EamDbException | CorrelationAttributeNormalizationException ex) { + } catch (TskCoreException | EamDbException ex) { logger.log(Level.SEVERE, "Error creating artifact instance.", ex); // NON-NLS return null; + } catch (CorrelationAttributeNormalizationException ex) { + logger.log(Level.WARNING, "Error creating artifact instance.", ex.getMessage()); // NON-NLS + return null; } catch (NoCurrentCaseException ex) { logger.log(Level.SEVERE, "Case is closed.", ex); // NON-NLS return null; From 025e674a3e6df6ab9647034a77a8813721263fd4 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Mon, 17 Dec 2018 13:38:02 -0500 Subject: [PATCH 2/3] Fixed panel sizing. --- .../autopsy/keywordsearch/GlobalListsManagementPanel.form | 2 +- .../autopsy/keywordsearch/GlobalListsManagementPanel.java | 2 +- .../autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form | 2 +- .../autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.form index 630cefd77f..85ffa4c6f1 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.form @@ -53,7 +53,7 @@ - + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java index 56c1fcd4c5..554f791d05 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/GlobalListsManagementPanel.java @@ -318,7 +318,7 @@ class GlobalListsManagementPanel extends javax.swing.JPanel implements OptionsPa .addGap(22, 22, 22) .addComponent(keywordListsLabel) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1) + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 354, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(newListButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form index b8ae7ca14a..a535671375 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.form @@ -17,7 +17,7 @@ - + diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java index 156bbd0220..c53b094453 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchGlobalSettingsPanel.java @@ -106,7 +106,7 @@ final class KeywordSearchGlobalSettingsPanel extends IngestModuleGlobalSettingsP layout.setHorizontalGroup( layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(layout.createSequentialGroup() - .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 824, Short.MAX_VALUE) + .addComponent(tabbedPane, javax.swing.GroupLayout.DEFAULT_SIZE, 926, Short.MAX_VALUE) .addGap(0, 0, 0)) ); layout.setVerticalGroup( From be303b4384ce2924fc4be4bc0ac50b76301cd920 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Mon, 17 Dec 2018 13:42:52 -0500 Subject: [PATCH 3/3] Fixed merge. --- .../autopsy/centralrepository/datamodel/EamArtifactUtil.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java index 799262faa7..8c137472e2 100644 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java @@ -213,12 +213,9 @@ public class EamArtifactUtil { TskData.FileKnown.UNKNOWN, bbSourceFile.getId()); - } catch (TskCoreException | EamDbException ex) { + } catch (TskCoreException | EamDbException | CorrelationAttributeNormalizationException ex) { logger.log(Level.SEVERE, "Error creating artifact instance.", ex); // NON-NLS return null; - } catch (CorrelationAttributeNormalizationException ex) { - logger.log(Level.WARNING, "Error creating artifact instance.", ex.getMessage()); // NON-NLS - return null; } catch (NoCurrentCaseException ex) { logger.log(Level.SEVERE, "Case is closed.", ex); // NON-NLS return null;