yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 10:19:23 +02:00
Code Issues Releases Wiki Activity

GT-2971: Fixing merge issues.

Browse source
This commit is contained in:
Ryan Kurtz 2019-07-19 14:07:18 -04:00
parent 479f595af8
commit c7f934c9d1
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
View file

@ -191,10 +191,10 @@ public class DockableComponent extends JPanel implements ContainerListener {
* @return the provider * @return the provider
*/ */
public ComponentProvider getComponentProvider() { public ComponentProvider getComponentProvider() {
if (componentInfo == null) { if (placeholder == null) {
return null; return null;
} }
return componentInfo.getProvider(); return placeholder.getProvider();
} }
/** /**
@ -202,10 +202,10 @@ public class DockableComponent extends JPanel implements ContainerListener {
* @return the manager * @return the manager
*/ */
public DockingWindowManager getDockingWindowManager() { public DockingWindowManager getDockingWindowManager() {
if (componentInfo == null) { if (placeholder == null) {
return null; return null;
} }
return componentInfo.getNode().getDockingWindowManager(); return placeholder.getNode().getDockingWindowManager();
} }
@Override @Override