diff --git a/pom.xml b/pom.xml index f56105d7..d2580a11 100644 --- a/pom.xml +++ b/pom.xml @@ -174,10 +174,6 @@ net.imglib2 imglib2-algorithm - - net.imagej - imagej-legacy - net.imglib2 imglib2 diff --git a/src/main/java/sc/fiji/labkit/ui/LabkitFrame.java b/src/main/java/sc/fiji/labkit/ui/LabkitFrame.java index 7c9ab723..de421672 100644 --- a/src/main/java/sc/fiji/labkit/ui/LabkitFrame.java +++ b/src/main/java/sc/fiji/labkit/ui/LabkitFrame.java @@ -31,7 +31,6 @@ import io.scif.services.DatasetIOService; import net.imagej.Dataset; -import net.imagej.legacy.ui.LegacyApplicationFrame; import org.scijava.ui.ApplicationFrame; import org.scijava.ui.UIService; import org.scijava.widget.UIComponent; @@ -113,11 +112,14 @@ private Image getImageJIcon(Context context) { // NB: get ImageJ icon form the main UI window UIService uiService = context.service(UIService.class); ApplicationFrame applicationFrame = uiService.getDefaultUI().getApplicationFrame(); - if (applicationFrame instanceof LegacyApplicationFrame) - return ((LegacyApplicationFrame) applicationFrame).getComponent().getIconImage(); + Frame frame = null; if (applicationFrame instanceof Frame) - return ((Frame) applicationFrame).getIconImage(); - return null; + frame = (Frame) applicationFrame; + else if (applicationFrame instanceof UIComponent) { + Object uic = ((UIComponent) applicationFrame).getComponent(); + if (uic instanceof Frame) frame = (Frame) uic; + } + return frame == null ? null : frame.getIconImage(); } catch (Exception e) { return null;