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

Revert "used non deprecated complete(ReportStatus)"

Browse Source 
This reverts commit f18420aa113a25f05d2e73de7d1b085f7f229f55.
This commit is contained in:
sidheshenator 2015-03-26 16:28:37 -04:00
parent dca20e80cd
commit b1284625d2
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/casemodule/StartupWindow.java
View File

@ -63,7 +63,7 @@ public final class StartupWindow extends JDialog implements StartupWindowInterfa
setLocation((screenDimension.width - w) / 2, (screenDimension.height - h) / 2); setLocation((screenDimension.width - w) / 2, (screenDimension.height - h) / 2);
CueBannerPanel welcomeWindow = new CueBannerPanel(); CueBannerPanel welcomeWindow = new CueBannerPanel();
CueBannerPanel.refresh(); welcomeWindow.refresh();
// add the command to close the window to the button on the Volume Detail Panel // add the command to close the window to the button on the Volume Detail Panel
welcomeWindow.setCloseButtonActionListener(new ActionListener() { welcomeWindow.setCloseButtonActionListener(new ActionListener() {

13
Core/src/org/sleuthkit/autopsy/modules/stix/STIXReportModule.java
View File

@ -59,7 +59,6 @@ import org.mitre.cybox.objects.DomainName;
import org.mitre.cybox.objects.WindowsRegistryKey; import org.mitre.cybox.objects.WindowsRegistryKey;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
import org.sleuthkit.autopsy.coreutils.ModuleSettings; import org.sleuthkit.autopsy.coreutils.ModuleSettings;
import org.sleuthkit.autopsy.report.ReportProgressPanel.ReportStatus;
/** /**
* *
@ -121,7 +120,7 @@ public class STIXReportModule implements GeneralReportModule {
"STIXReportModule.notifyMsg.unableToOpenReportFile", "STIXReportModule.notifyMsg.unableToOpenReportFile",
reportPath), reportPath),
MessageNotifyUtil.MessageType.ERROR); MessageNotifyUtil.MessageType.ERROR);
progressPanel.complete(ReportStatus.ERROR); progressPanel.complete();
progressPanel.updateStatusLabel( progressPanel.updateStatusLabel(
NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.completedWithErrors")); NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.completedWithErrors"));
return; return;
@ -136,7 +135,7 @@ public class STIXReportModule implements GeneralReportModule {
logger.log(Level.SEVERE, "STIXReportModuleConfigPanel.stixFile not initialized "); //NON-NLS logger.log(Level.SEVERE, "STIXReportModuleConfigPanel.stixFile not initialized "); //NON-NLS
MessageNotifyUtil.Message.error( MessageNotifyUtil.Message.error(
NbBundle.getMessage(this.getClass(), "STIXReportModule.notifyErr.noFildDirProvided")); NbBundle.getMessage(this.getClass(), "STIXReportModule.notifyErr.noFildDirProvided"));
progressPanel.complete(ReportStatus.ERROR); progressPanel.complete();
progressPanel.updateStatusLabel( progressPanel.updateStatusLabel(
NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.noFildDirProvided")); NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.noFildDirProvided"));
return; return;
@ -145,7 +144,7 @@ public class STIXReportModule implements GeneralReportModule {
logger.log(Level.SEVERE, "No STIX file/directory provided "); //NON-NLS logger.log(Level.SEVERE, "No STIX file/directory provided "); //NON-NLS
MessageNotifyUtil.Message.error( MessageNotifyUtil.Message.error(
NbBundle.getMessage(this.getClass(), "STIXReportModule.notifyErr.noFildDirProvided")); NbBundle.getMessage(this.getClass(), "STIXReportModule.notifyErr.noFildDirProvided"));
progressPanel.complete(ReportStatus.ERROR); progressPanel.complete();
progressPanel.updateStatusLabel( progressPanel.updateStatusLabel(
NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.noFildDirProvided")); NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.noFildDirProvided"));
return; return;
@ -157,7 +156,7 @@ public class STIXReportModule implements GeneralReportModule {
MessageNotifyUtil.Message.error(NbBundle.getMessage(this.getClass(), MessageNotifyUtil.Message.error(NbBundle.getMessage(this.getClass(),
"STIXReportModule.notifyMsg.unableToOpenFileDir", "STIXReportModule.notifyMsg.unableToOpenFileDir",
stixFileName)); stixFileName));
progressPanel.complete(ReportStatus.ERROR); progressPanel.complete();
progressPanel.updateStatusLabel( progressPanel.updateStatusLabel(
NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.couldNotOpenFileDir", stixFileName)); NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.couldNotOpenFileDir", stixFileName));
return; return;
@ -202,12 +201,10 @@ public class STIXReportModule implements GeneralReportModule {
// Set the progress bar to done. If any errors occurred along the way, modify // Set the progress bar to done. If any errors occurred along the way, modify
// the "complete" message to indicate this. // the "complete" message to indicate this.
progressPanel.complete();
if (hadErrors) { if (hadErrors) {
progressPanel.complete(ReportStatus.ERROR);
progressPanel.updateStatusLabel( progressPanel.updateStatusLabel(
NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.completedWithErrors")); NbBundle.getMessage(this.getClass(), "STIXReportModule.progress.completedWithErrors"));
} else {
progressPanel.complete(ReportStatus.COMPLETE);
} }
} }

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

@ -358,7 +358,7 @@ import org.sleuthkit.datamodel.TskData;
for (FileReportModule module : fileModules) { for (FileReportModule module : fileModules) {
module.endTable(); module.endTable();
module.endReport(); module.endReport();
fileProgress.get(module).complete(ReportStatus.COMPLETE); fileProgress.get(module).complete();
} }
return 0; return 0;
@ -463,7 +463,7 @@ import org.sleuthkit.datamodel.TskData;
// finish progress, wrap up // finish progress, wrap up
for (TableReportModule module : tableModules) { for (TableReportModule module : tableModules) {
tableProgress.get(module).complete(ReportStatus.COMPLETE); tableProgress.get(module).complete();
module.endReport(); module.endReport();
} }

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

@ -339,12 +339,12 @@ class ReportKML implements GeneralReportModule {
} catch (IOException ex) { } catch (IOException ex) {
logger.log(Level.WARNING, "Could not write the KML report.", ex); //NON-NLS logger.log(Level.WARNING, "Could not write the KML report.", ex); //NON-NLS
} }
progressPanel.complete(ReportProgressPanel.ReportStatus.ERROR); progressPanel.complete();
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.WARNING, "Failed to get the unique path.", ex); //NON-NLS logger.log(Level.WARNING, "Failed to get the unique path.", ex); //NON-NLS
} }
progressPanel.increment(); progressPanel.increment();
progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE); progressPanel.complete();
} }
public static void copyFileUsingStream(AbstractFile file, File jFile) throws IOException { public static void copyFileUsingStream(AbstractFile file, File jFile) throws IOException {