Merge pull request #2689 from millmanorama/cleanup-IG-OpenAction

cleanup up OpenAction.java
This commit is contained in:
Richard Cordovano 2017-04-13 12:54:35 -04:00 committed by GitHub
commit c0e8ff2279

View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2013 Basis Technology Corp. * Copyright 2011-17 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -53,10 +53,10 @@ import org.sleuthkit.autopsy.imagegallery.ImageGalleryTopComponent;
"OpenAction.stale.confDlg.title=Image Gallery"}) "OpenAction.stale.confDlg.title=Image Gallery"})
public final class OpenAction extends CallableSystemAction implements Presenter.Toolbar { public final class OpenAction extends CallableSystemAction implements Presenter.Toolbar {
private static final String VIEW_IMAGES_VIDEOS = Bundle.CTL_OpenAction();
private static final boolean fxInited = Installer.isJavaFxInited();
private static final Logger LOGGER = Logger.getLogger(OpenAction.class.getName()); private static final Logger LOGGER = Logger.getLogger(OpenAction.class.getName());
private JButton toolbarButton = new JButton(); private static final String VIEW_IMAGES_VIDEOS = Bundle.CTL_OpenAction();
private final JButton toolbarButton = new JButton();
private final PropertyChangeListener pcl; private final PropertyChangeListener pcl;
public OpenAction() { public OpenAction() {
@ -73,7 +73,7 @@ public final class OpenAction extends CallableSystemAction implements Presenter.
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
return Case.isCaseOpen() && fxInited && Case.getCurrentCase().hasData(); return Case.isCaseOpen() && Installer.isJavaFxInited() && Case.getCurrentCase().hasData();
} }
/** Returns the toolbar component of this action /** Returns the toolbar component of this action