From 6e42bc55d6f2da181136518ba31f365831961d18 Mon Sep 17 00:00:00 2001
From: Marcus Rockwell <marcusrockwelljr@gmail.com>
Date: Tue, 12 Nov 2024 20:35:45 -0600
Subject: [PATCH] Cleaning Up Imports

---
 .../java/trick/dre/DreApplicationTest.java    | 48 ++++++++-----------
 .../java/trick/dre/MockDreApplication.java    |  6 +--
 .../fixtures/FontChooserFixtureExtension.java |  1 -
 3 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/trick_source/java/src/test/java/trick/dre/DreApplicationTest.java b/trick_source/java/src/test/java/trick/dre/DreApplicationTest.java
index a3867dac..a443cb4e 100644
--- a/trick_source/java/src/test/java/trick/dre/DreApplicationTest.java
+++ b/trick_source/java/src/test/java/trick/dre/DreApplicationTest.java
@@ -1,28 +1,29 @@
 package trick.dre;
 
-import org.jdesktop.application.Application;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import trick.common.ApplicationTest;
-import trick.common.CheckApplicationProperties;
-import trick.dre.fixtures.DreFixture;
-import trick.dre.fixtures.DreFixture.Size;
-import trick.dre.MockDreApplication;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;
 import static org.assertj.swing.launcher.ApplicationLauncher.application;
-import static org.junit.Assert.assertTrue;
-import static trick.dre.fixtures.DreFixture.*;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
+import trick.common.ApplicationTest;
+import trick.dre.fixtures.DreFixture;
+import static trick.dre.fixtures.DreFixture.ALWAYS;
+import static trick.dre.fixtures.DreFixture.ASCII;
+import static trick.dre.fixtures.DreFixture.BINARY;
+import static trick.dre.fixtures.DreFixture.BUFFER;
+import static trick.dre.fixtures.DreFixture.CHANGES;
+import static trick.dre.fixtures.DreFixture.HDF5;
+import static trick.dre.fixtures.DreFixture.NO_BUFFER;
+import static trick.dre.fixtures.DreFixture.RING_BUFFER;
+import static trick.dre.fixtures.DreFixture.SINGLE_PREC_OFF;
+import static trick.dre.fixtures.DreFixture.SINGLE_PREC_ON;
+import static trick.dre.fixtures.DreFixture.STEP;
+import trick.dre.fixtures.DreFixture.Size;
 
 /**
  * 
@@ -50,17 +51,6 @@ public class DreApplicationTest extends ApplicationTest {
         dre_fix = new DreFixture(robot(), MockDreApplication.getInstance());
     }
 
-    // @Test
-    // public void testGeneric() {
-    //     boolean bool = true;
-    //     dre_fix.selectVar("drx/name");
-    //     dre_fix.setOptions(HDF5 | STEP | RING_BUFFER);
-    //     dre_fix.setGroupName("TestingTesting123");
-    //     dre_fix.saveMenuItem("TestingMenuBar");
-	// 	sleep(5000);
-	// 	assertThat(bool).isTrue();
-    // }
-
     @Test
     public void testFormatOptions() {
         // ARRANGE
diff --git a/trick_source/java/src/test/java/trick/dre/MockDreApplication.java b/trick_source/java/src/test/java/trick/dre/MockDreApplication.java
index 0010b60e..d5b2ff52 100644
--- a/trick_source/java/src/test/java/trick/dre/MockDreApplication.java
+++ b/trick_source/java/src/test/java/trick/dre/MockDreApplication.java
@@ -4,15 +4,11 @@ package trick.dre;
 import java.io.File;
 import java.io.StringWriter;
 
-import org.assertj.swing.core.GenericTypeMatcher;
-
+import static org.assertj.core.api.Assumptions.assumeThat;
 import org.jdesktop.application.Application;
 
-import trick.common.ApplicationTest;
 import trick.common.TestUtils;
 
-import static org.assertj.core.api.Assumptions.assumeThat;
-
 public class MockDreApplication extends DreApplication {
 	private static MockDreApplication the_dre = null;
 
diff --git a/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixtureExtension.java b/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixtureExtension.java
index dee60a51..ee79a8d8 100644
--- a/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixtureExtension.java
+++ b/trick_source/java/src/test/java/trick/simcontrol/fixtures/FontChooserFixtureExtension.java
@@ -5,7 +5,6 @@ import java.awt.Container;
 import org.assertj.swing.core.Robot;
 import org.assertj.swing.fixture.ComponentFixtureExtension;
 
-import trick.simcontrol.fixtures.FontChooserFixture;
 import trick.common.ui.components.FontChooser;
 
 public class FontChooserFixtureExtension extends ComponentFixtureExtension {