Merge remote-tracking branch 'origin/master' into dt-data-update

xpdota · Jun 26, 2024 · dd6d96b · dd6d96b
2 parents 1309d71 + 79dc3f2
commit dd6d96b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/xivsupport/src/main/java/gg/xp/xivsupport/gui/GuiMain.java b/xivsupport/src/main/java/gg/xp/xivsupport/gui/GuiMain.java
@@ -235,6 +235,8 @@ public void windowStateChanged(WindowEvent e) {
 		addTab("Library", container.getComponent(LibraryTab.class));
 		addTab("Groovy", new GroovyTab(container.getComponent(GroovyScriptManager.class)));
 		addTab("Updates", new UpdatesPanel(container.getComponent(PersistenceProvider.class), container.getComponent(UpdaterConfig.class)));
+		// This is instantiated here because we don't want it getting auto scanned in tests
+		container.addComponent(AdvancedTab.class);
 		addTab("Advanced", container.getComponent(AdvancedTab.class));
 		GlobalNavPanel nav = new GlobalNavPanel(guiReg);
 		SwingUtilities.invokeLater(() -> {

diff --git a/xivsupport/src/main/java/gg/xp/xivsupport/gui/tabs/AdvancedTab.java b/xivsupport/src/main/java/gg/xp/xivsupport/gui/tabs/AdvancedTab.java
@@ -2,6 +2,7 @@
 
 import gg.xp.reevent.events.BasicEventDistributor;
 import gg.xp.reevent.scan.HandleEvents;
+import gg.xp.reevent.scan.NoAutoScan;
 import gg.xp.xivsupport.callouts.audio.SoundPlayer;
 import gg.xp.xivsupport.events.misc.Management;
 import gg.xp.xivsupport.events.misc.RawEventStorage;
@@ -45,6 +46,7 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+@NoAutoScan
 public class AdvancedTab extends SmartTabbedPane implements Refreshable {
 
 	private static final ExecutorService exs = Executors.newCachedThreadPool(Threading.namedDaemonThreadFactory("AdvancedTab"));