Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-26 05:17:38 +08:00
Code Issues Actions Packages Projects 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
Ghidra/Framework/Docking/src/main/java/docking/DockableComponent.java
+4 -4
View File
@@ -191,10 +191,10 @@ public class DockableComponent extends JPanel implements ContainerListener {
* @return the provider
*/
public ComponentProvider getComponentProvider() {
if (componentInfo == null) {
if (placeholder == null) {
return null;
}
return componentInfo.getProvider();
return placeholder.getProvider();
}
/**
@@ -202,10 +202,10 @@ public class DockableComponent extends JPanel implements ContainerListener {
* @return the manager
*/
public DockingWindowManager getDockingWindowManager() {
if (componentInfo == null) {
if (placeholder == null) {
return null;
}
return componentInfo.getNode().getDockingWindowManager();
return placeholder.getNode().getDockingWindowManager();
}
@Override