Begin priority system for listener registration

Author: Col-E

recaf-core/src/main/java/software/coley/recaf/behavior/PrioritySortable.java

@@ -0,0 +1,41 @@
+package software.coley.recaf.behavior;
+
+import jakarta.annotation.Nonnull;
+import software.coley.collections.Lists;
+
+import java.util.List;
+
+/**
+ * Priority sortable item.
+ *
+ * @author Matt Coley
+ */
+public interface PrioritySortable extends Comparable<PrioritySortable> {
+	/**
+	 * @return This item's priority value.
+	 */
+	default int getPriority() {
+		return 0;
+	}
+
+	@Override
+	default int compareTo(@Nonnull PrioritySortable o) {
+		return Integer.compare(getPriority(), o.getPriority());
+	}
+
+	/**
+	 * Add a sortable item to a sortable list.
+	 *
+	 * @param items
+	 * 		List to add to.
+	 * @param item
+	 * 		Item to add.
+	 * @param <T>
+	 * 		Child priority-sortable type.
+	 *
+	 * @return {@code true} on add. {@code false} on failure <i>(Insertion index cannot be computed)</i>,
+	 */
+	static <T extends PrioritySortable> boolean add(@Nonnull List<T> items, @Nonnull T item) {
+		return Lists.sortedInsert(PrioritySortable::compareTo, items, item);
+	}
+}

recaf-core/src/main/java/software/coley/recaf/services/workspace/BasicWorkspaceManager.java

@@ -6,13 +6,16 @@
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 import org.slf4j.Logger;
+import software.coley.collections.Lists;
 import software.coley.collections.Unchecked;
 import software.coley.recaf.analytics.logging.Logging;
+import software.coley.recaf.behavior.PrioritySortable;
 import software.coley.recaf.workspace.model.EmptyWorkspace;
 import software.coley.recaf.workspace.model.Workspace;
 import software.coley.recaf.workspace.model.WorkspaceModificationListener;
 import software.coley.recaf.workspace.model.resource.WorkspaceResource;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
@@ -91,7 +94,7 @@ public List<WorkspaceOpenListener> getWorkspaceOpenListeners() {
 
 	@Override
 	public void addWorkspaceOpenListener(@Nonnull WorkspaceOpenListener listener) {
-		openListeners.add(listener);
+		PrioritySortable.add(openListeners, listener);
 	}
 
 	@Override
@@ -107,7 +110,7 @@ public List<WorkspaceCloseListener> getWorkspaceCloseListeners() {
 
 	@Override
 	public void addWorkspaceCloseListener(@Nonnull WorkspaceCloseListener listener) {
-		closeListeners.add(listener);
+		PrioritySortable.add(closeListeners, listener);
 	}
 
 	@Override

recaf-core/src/main/java/software/coley/recaf/services/workspace/WorkspaceCloseListener.java

@@ -1,14 +1,15 @@
 package software.coley.recaf.services.workspace;
 
 import jakarta.annotation.Nonnull;
+import software.coley.recaf.behavior.PrioritySortable;
 import software.coley.recaf.workspace.model.Workspace;
 
 /**
  * Listener for when old workspaces are closed.
  *
  * @author Matt Coley
  */
-public interface WorkspaceCloseListener {
+public interface WorkspaceCloseListener extends PrioritySortable {
 	/**
 	 * Called when {@link WorkspaceManager#setCurrent(Workspace)} passes and a prior workspace is removed.
 	 *

recaf-core/src/main/java/software/coley/recaf/services/workspace/WorkspaceOpenListener.java

@@ -1,14 +1,15 @@
 package software.coley.recaf.services.workspace;
 
 import jakarta.annotation.Nonnull;
+import software.coley.recaf.behavior.PrioritySortable;
 import software.coley.recaf.workspace.model.Workspace;
 
 /**
  * Listener for when new workspaces are opened.
  *
  * @author Matt Coley
  */
-public interface WorkspaceOpenListener {
+public interface WorkspaceOpenListener extends PrioritySortable {
 	/**
 	 * Called when {@link WorkspaceManager#setCurrent(Workspace)} passes.
 	 *

recaf-ui/src/main/java/software/coley/recaf/ui/docking/DockingManager.java

@@ -394,14 +394,17 @@ public void onWorkspaceOpened(@Nonnull Workspace workspace) {
 		@Override
 		public void onWorkspaceClosed(@Nonnull Workspace workspace) {
 			// When a workspace is closed, show the welcome screen.
-			// TODO: Combining 'DockingManager' and 'DockingLayoutManager' made this fire earlier which
-			//  happens before 'NavigationManager' does. The nav manager closes this if we open it immediately.
-			//  - Need to have an order of operation system...
-			FxThreadUtil.delayedRun(25, () -> {
+			FxThreadUtil.run(() -> {
 				if (!bento.search().replaceContainer(ID_CONTAINER_ROOT_TOP, DockingManager.this::newWelcomeContainer))
 					logger.error("Failed replacing root on workspace close");
 			});
 		}
+
+		@Override
+		public int getPriority() {
+			// TODO: Arbitrary number to ensure this happens later than other close listeners
+			return 100;
+		}
 	}
 
 	/**