Fixed IllegalStateException

This commit is contained in:
Kelly Kelly 2022-01-05 14:05:37 -05:00
parent cf318e9daa
commit ecfba49a35
2 changed files with 8 additions and 3 deletions

View File

@ -28,6 +28,7 @@ import org.sleuthkit.autopsy.filesearch.FileSearchAction;
public class FileSearchTreeAction extends AbstractAction { public class FileSearchTreeAction extends AbstractAction {
private final long dataSourceId; private final long dataSourceId;
private FileSearchAction searcher;
/** /**
* Main constructor. * Main constructor.
@ -43,7 +44,10 @@ public class FileSearchTreeAction extends AbstractAction {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
FileSearchAction searcher = new FileSearchAction(); if(searcher == null) {
searcher = FileSearchAction.getDefault();
}
searcher.showDialog(dataSourceId); searcher.showDialog(dataSourceId);
} }

View File

@ -25,6 +25,7 @@ import org.openide.util.HelpCtx;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
import org.openide.util.actions.CallableSystemAction; import org.openide.util.actions.CallableSystemAction;
import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.Case;
import org.sleuthkit.autopsy.timeline.OpenTimelineAction;
final public class FileSearchAction extends CallableSystemAction { final public class FileSearchAction extends CallableSystemAction {
@ -33,7 +34,7 @@ final public class FileSearchAction extends CallableSystemAction {
private static FileSearchDialog searchDialog; private static FileSearchDialog searchDialog;
private static Long selectedDataSourceId; private static Long selectedDataSourceId;
public FileSearchAction() { private FileSearchAction() {
super(); super();
setEnabled(Case.isCaseOpen()); setEnabled(Case.isCaseOpen());
Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), (PropertyChangeEvent evt) -> { Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), (PropertyChangeEvent evt) -> {
@ -48,7 +49,7 @@ final public class FileSearchAction extends CallableSystemAction {
public static FileSearchAction getDefault() { public static FileSearchAction getDefault() {
if (instance == null) { if (instance == null) {
instance = new FileSearchAction(); instance = CallableSystemAction.get(FileSearchAction.class);
} }
return instance; return instance;
} }