Move Laf initialiation to SciView.create()

scenerygraphics · Sep 15, 2020 · 72f31ef · 72f31ef
1 parent d8102d3
commit 72f31ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/src/main/java/sc/iview/Main.java b/src/main/java/sc/iview/Main.java
@@ -28,27 +28,13 @@
  */
 package sc.iview;
 
-import com.formdev.flatlaf.FlatLightLaf;
-import graphics.scenery.SceneryBase;
-
-import javax.swing.*;
-
 /**
  * Entry point for testing SciView functionality.
  * 
  * @author Kyle Harrington
  */
 public class Main {
     public static void main( String... args ) throws Exception {
-        SceneryBase.xinitThreads();
-        FlatLightLaf.install();
-
-        try {
-            UIManager.setLookAndFeel( new FlatLightLaf() );
-        } catch( Exception ex ) {
-            System.err.println( "Failed to initialize Flat Light LaF, falling back to Swing default." );
-        }
-
         SciView.create();
     }
 }
diff --git a/src/main/java/sc/iview/SciView.java b/src/main/java/sc/iview/SciView.java
@@ -38,9 +38,8 @@
 import bdv.util.volatiles.VolatileViewData;
 import bdv.viewer.Source;
 import bdv.viewer.SourceAndConverter;
-import ch.systemsx.cisd.hdf5.HDF5Factory;
-import ch.systemsx.cisd.hdf5.IHDF5Reader;
 import cleargl.GLVector;
+import com.formdev.flatlaf.FlatLightLaf;
 import com.intellij.ui.tabs.JBTabsPosition;
 import com.intellij.ui.tabs.TabInfo;
 import com.intellij.ui.tabs.impl.JBEditorTabs;
@@ -75,20 +74,16 @@
 import net.imagej.lut.LUTService;
 import net.imagej.ops.OpService;
 import net.imagej.units.UnitService;
-import net.imglib2.*;
 import net.imglib2.Cursor;
 import net.imglib2.RandomAccess;
+import net.imglib2.*;
 import net.imglib2.display.ColorTable;
 import net.imglib2.img.Img;
 import net.imglib2.realtransform.AffineTransform3D;
 import net.imglib2.type.numeric.ARGBType;
 import net.imglib2.type.numeric.RealType;
-import net.imglib2.type.numeric.integer.LongType;
 import net.imglib2.type.numeric.integer.UnsignedByteType;
 import net.imglib2.view.Views;
-import org.intellij.lang.annotations.JdkConstants;
-import org.janelia.saalfeldlab.n5.hdf5.N5HDF5Reader;
-import org.janelia.saalfeldlab.n5.imglib2.N5Utils;
 import org.joml.Quaternionf;
 import org.joml.Vector2f;
 import org.joml.Vector3f;
@@ -129,8 +124,8 @@
 import javax.imageio.ImageIO;
 import javax.script.ScriptException;
 import javax.swing.*;
-import java.awt.*;
 import java.awt.Image;
+import java.awt.*;
 import java.awt.event.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
@@ -2446,6 +2441,13 @@ public String nodeInfoString(Node n) {
     public static SciView create() throws Exception {
         SceneryBase.xinitThreads();
 
+        FlatLightLaf.install();
+        try {
+            UIManager.setLookAndFeel( new FlatLightLaf() );
+        } catch( Exception ex ) {
+            System.err.println( "Failed to initialize Flat Light LaF, falling back to Swing default." );
+        }
+
         System.setProperty( "scijava.log.level:sc.iview", "debug" );
         Context context = new Context( ImageJService.class, SciJavaService.class, SCIFIOService.class, ThreadService.class);