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

This commit is contained in:
William Schaefer 2018-09-13 12:52:37 -04:00
commit 17ea6ee74b

View File

@ -31,6 +31,7 @@ import org.openide.util.lookup.ServiceProvider;
import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
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.CorrelationDataSource;
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
* source file.
*/
sourceFile = (AbstractFile) node.getLookup().lookup(AbstractFile.class);
sourceFile = node.getLookup().lookup(AbstractFile.class);
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, String.format(
@ -235,7 +236,7 @@ public class AnnotationsContentViewer extends javax.swing.JPanel implements Data
if (commentDataFound == false) {
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
}
endSection(html);