From e4f61fa06d162855ed0d01e0d6f0cab1c934dac4 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Thu, 8 Oct 2020 14:03:01 -0400 Subject: [PATCH] Removed debug statement --- .../java/docking/ComponentLoadedListener.java | 7 +++-- .../java/docking/DockingWindowManager.java | 30 ++----------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/Ghidra/Framework/Docking/src/main/java/docking/ComponentLoadedListener.java b/Ghidra/Framework/Docking/src/main/java/docking/ComponentLoadedListener.java index ec618d9e3d..b43e3d112d 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/ComponentLoadedListener.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/ComponentLoadedListener.java @@ -26,9 +26,10 @@ public interface ComponentLoadedListener { /** * Called when the component is made displayable * - * @param windowManager the window manager associated with the loaded component - * @param provider the provider that is the parent of the given component; null if this - * component is not the child of a component provider + * @param windowManager the window manager associated with the loaded component; null if the + * component for this listener is not parented by a docking window manager + * @param provider the provider that is the parent of the given component; null if the + * component for this listener is not the child of a component provider */ public void componentLoaded(DockingWindowManager windowManager, ComponentProvider provider); } diff --git a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java index cc71c9c4d4..764ada8ed5 100644 --- a/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java +++ b/Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java @@ -41,7 +41,6 @@ import ghidra.util.datastruct.*; import ghidra.util.exception.AssertException; import ghidra.util.task.SwingUpdateManager; import util.CollectionUtils; -import utilities.util.reflection.ReflectionUtilities; /** * Manages the "Docking" arrangement of a set of components and actions. The components can be "docked" @@ -2237,33 +2236,8 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder component.removeHierarchyListener(this); DockingWindowManager dwm = getInstance(component); - if (dwm != null) { - ComponentProvider provider = dwm.getComponentProvider(component); - listener.componentLoaded(dwm, provider); - return; - } - - // Unable to find the manager. This can happen during testing; only report if - // it is unexpected - maybeReportMissingManager(); - } - - private void maybeReportMissingManager() { - if (instances.isEmpty()) { - return; // not manager means no tool; assume testing - } - - if (instances.size() == 1) { - DockingWindowManager dwm = instances.get(0); - if (!dwm.isVisible()) { - return; // not showing; assume testing with tool not shown - } - } - - Msg.debug(DockingWindowManager.class, - "Unable to find Docking Window Manager for " + - component.getClass().getSimpleName(), - ReflectionUtilities.createJavaFilteredThrowable()); + ComponentProvider provider = dwm.getComponentProvider(component); + listener.componentLoaded(dwm, provider); } });