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

Tweaked exception handling

Browse Source
This commit is contained in:
Kelly Kelly 2021-06-17 16:04:35 -04:00
parent 4b76e26f2b
commit 54e56b9bc2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/OtherOccurrencesPanel.java
View File

@ -49,7 +49,6 @@ import javax.swing.SwingWorker;
import javax.swing.filechooser.FileNameExtensionFilter; import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.table.TableModel; import javax.swing.table.TableModel;
import javax.swing.table.TableRowSorter; import javax.swing.table.TableRowSorter;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException; import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@ -87,6 +86,8 @@ public final class OtherOccurrencesPanel extends javax.swing.JPanel {
private SwingWorker<?, ?> worker; private SwingWorker<?, ?> worker;
// Initializing the JFileChooser in a thread to prevent a block on the EDT
// see https://stackoverflow.com/questions/49792375/jfilechooser-is-very-slow-when-using-windows-look-and-feel
private final FutureTask<JFileChooser> futureFileChooser = new FutureTask<>(JFileChooser::new); private final FutureTask<JFileChooser> futureFileChooser = new FutureTask<>(JFileChooser::new);
private JFileChooser CSVFileChooser; private JFileChooser CSVFileChooser;
@ -254,11 +255,14 @@ public final class OtherOccurrencesPanel extends javax.swing.JPanel {
if (casesTableModel.getRowCount() > 0) { if (casesTableModel.getRowCount() > 0) {
if(CSVFileChooser == null) { if(CSVFileChooser == null) {
try { try{
CSVFileChooser = futureFileChooser.get(); CSVFileChooser = futureFileChooser.get();
} catch (InterruptedException | ExecutionException ex) { } catch (InterruptedException | ExecutionException ex) {
Exceptions.printStackTrace(ex); // If something happened with the thread try and
} // initalized the chooser now
logger.log(Level.WARNING, "A failure occurred in the JFileChooser background thread");
CSVFileChooser = new JFileChooser();
}
} }
Calendar now = Calendar.getInstance(); Calendar now = Calendar.getInstance();

8
Core/src/org/sleuthkit/autopsy/contentviewers/MediaViewImagePanel.java
View File

@ -72,7 +72,6 @@ import javax.swing.SwingUtilities;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.controlsfx.control.MaskerPane; import org.controlsfx.control.MaskerPane;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.sleuthkit.autopsy.actions.GetTagNameAndCommentDialog; import org.sleuthkit.autopsy.actions.GetTagNameAndCommentDialog;
import org.sleuthkit.autopsy.actions.GetTagNameAndCommentDialog.TagNameAndComment; import org.sleuthkit.autopsy.actions.GetTagNameAndCommentDialog.TagNameAndComment;
@ -194,6 +193,8 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
private Task<Image> readImageFileTask; private Task<Image> readImageFileTask;
private volatile ImageTransforms imageTransforms; private volatile ImageTransforms imageTransforms;
// Initializing the JFileChooser in a thread to prevent a block on the EDT
// see https://stackoverflow.com/questions/49792375/jfilechooser-is-very-slow-when-using-windows-look-and-feel
private final FutureTask<JFileChooser> futureFileChooser = new FutureTask<>(JFileChooser::new); private final FutureTask<JFileChooser> futureFileChooser = new FutureTask<>(JFileChooser::new);
/** /**
@ -1050,7 +1051,10 @@ class MediaViewImagePanel extends JPanel implements MediaFileViewer.MediaViewPan
try { try {
exportChooser = futureFileChooser.get(); exportChooser = futureFileChooser.get();
} catch (InterruptedException | ExecutionException ex) { } catch (InterruptedException | ExecutionException ex) {
Exceptions.printStackTrace(ex); // If something happened with the thread try and
// initalized the chooser now
logger.log(Level.WARNING, "A failure occurred in the JFileChooser background thread");
exportChooser = new JFileChooser();
} }
} }