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

Merge branch 'FixNewExceptionError' of https://github.com/wschaeferB/autopsy into 4121_correlation_types

Browse Source
This commit is contained in:
William Schaefer 2018-09-13 12:52:37 -04:00
commit 17ea6ee74b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/src/org/sleuthkit/autopsy/contentviewers/AnnotationsContentViewer.java
View File

@ -31,6 +31,7 @@ import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeNormalizationException;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource; import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationDataSource;
import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactUtil; import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactUtil;
@ -92,7 +93,7 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
* present in the node. In this case, the selected item IS the * present in the node. In this case, the selected item IS the
* source file. * source file.
*/ */
sourceFile = (AbstractFile) node.getLookup().lookup(AbstractFile.class); sourceFile = node.getLookup().lookup(AbstractFile.class);
} }
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, String.format( logger.log(Level.SEVERE, String.format(
@ -235,7 +236,7 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
if (commentDataFound == false) { if (commentDataFound == false) {
addMessage(html, "There is no comment data for the selected content in the central repository."); addMessage(html, "There is no comment data for the selected content in the central repository.");
} }
} catch (EamDbException | TskCoreException ex) { } catch (EamDbException | TskCoreException | CorrelationAttributeNormalizationException ex) {
logger.log(Level.SEVERE, "Error connecting to the central repository database.", ex); // NON-NLS logger.log(Level.SEVERE, "Error connecting to the central repository database.", ex); // NON-NLS
} }
endSection(html); endSection(html);