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

Created ReportProgressPanel API and ReportProgressDialog

Browse Source
This commit is contained in:
Eugene Livis 2019-08-06 15:07:30 -04:00
parent 47ca52f8da
commit a2b436630f
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Core/src/org/sleuthkit/autopsy/report/ReportKML.java
View File

@ -184,7 +184,7 @@ class ReportKML implements GeneralReportModule {
document.addContent(gpsSearchesFolder);
document.addContent(gpsTrackpointsFolder);
ReportProgressDialog.ReportStatus result = ReportProgressDialog.ReportStatus.COMPLETE;
ReportProgressDialog.ReportStatus result = ReportProgressPanel.ReportStatus.COMPLETE;
/**
* In the following code, nulls are okay, and are handled when we go to
@ -233,12 +233,12 @@ class ReportKML implements GeneralReportModule {
logger.log(Level.WARNING, String.format("Error reading file '%s' (id=%d).", fileName, fileId), ex);
} catch (Exception ex) {
logger.log(Level.SEVERE, "Could not extract photo information.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Could not extract photos with EXIF metadata.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
try {
@ -254,12 +254,12 @@ class ReportKML implements GeneralReportModule {
gpsBookmarksFolder.addContent(makePlacemark(bookmarkName, FeatureColor.BLUE, desc, timestamp, point, formattedCoordinates));
} catch (Exception ex) {
logger.log(Level.SEVERE, "Could not extract Bookmark information.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Could not get GPS Bookmarks from database.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
try {
@ -275,12 +275,12 @@ class ReportKML implements GeneralReportModule {
gpsLastKnownLocationFolder.addContent(makePlacemark("Last Known Location", FeatureColor.PURPLE, desc, timestamp, point, formattedCoordinates)); //NON-NLS
} catch (Exception ex) {
logger.log(Level.SEVERE, "Could not extract Last Known Location information.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Could not get GPS Last Known Location from database.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
try {
@ -308,12 +308,12 @@ class ReportKML implements GeneralReportModule {
gpsRouteFolder.addContent(makePlacemark("End", FeatureColor.GREEN, desc, timestamp, endingPoint, formattedCoordinates)); //NON-NLS
} catch (Exception ex) {
logger.log(Level.SEVERE, "Could not extract GPS Route information.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Could not get GPS Routes from database.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
try {
@ -336,7 +336,7 @@ class ReportKML implements GeneralReportModule {
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Could not get GPS Searches from database.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
try {
@ -362,12 +362,12 @@ class ReportKML implements GeneralReportModule {
gpsTrackpointsFolder.addContent(makePlacemark(trackName, FeatureColor.YELLOW, desc, timestamp, point, formattedCoordinates));
} catch (Exception ex) {
logger.log(Level.SEVERE, "Could not extract Trackpoint information.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
}
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Could not get GPS Trackpoints from database.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
// Copy the style sheet
@ -377,14 +377,14 @@ class ReportKML implements GeneralReportModule {
FileUtil.copy(input, output);
} catch (IOException ex) {
logger.log(Level.SEVERE, "Error placing KML stylesheet. The .KML file will not function properly.", ex); //NON-NLS
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
try (FileOutputStream writer = new FileOutputStream(kmlFileFullPath)) {
XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat());
outputter.output(kmlDocument, writer);
String prependedStatus = "";
if (result == ReportProgressDialog.ReportStatus.ERROR) {
if (result == ReportProgressPanel.ReportStatus.ERROR) {
prependedStatus = "Incomplete ";
}
Case.getCurrentCaseThrows().addReport(kmlFileFullPath,
@ -392,14 +392,14 @@ class ReportKML implements GeneralReportModule {
prependedStatus + NbBundle.getMessage(this.getClass(), "ReportKML.genReport.reportName"));
} catch (IOException ex) {
logger.log(Level.SEVERE, "Could not write the KML file.", ex); //NON-NLS
progressPanel.complete(ReportProgressDialog.ReportStatus.ERROR);
progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR);
} catch (TskCoreException ex) {
String errorMessage = String.format("Error adding %s to case as a report", kmlFileFullPath); //NON-NLS
logger.log(Level.SEVERE, errorMessage, ex);
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
} catch (NoCurrentCaseException ex) {
logger.log(Level.SEVERE, "Exception while getting open case.", ex);
result = ReportProgressDialog.ReportStatus.ERROR;
result = ReportProgressPanel.ReportStatus.ERROR;
}
progressPanel.complete(result);

4
Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
View File

@ -726,7 +726,7 @@ class TableReportGenerator {
String currentList = "";
while (resultSet.next()) {
// Check to see if all the TableReportModules have been canceled
if (progressPanel.getStatus() == ReportProgressDialog.ReportStatus.CANCELED) {
if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
break;
}
@ -884,7 +884,7 @@ class TableReportGenerator {
String currentSet = "";
while (resultSet.next()) {
// Check to see if all the TableReportModules have been canceled
if (progressPanel.getStatus() == ReportProgressDialog.ReportStatus.CANCELED) {
if (progressPanel.getStatus() == ReportProgressPanel.ReportStatus.CANCELED) {
break;
}