changed method name

diff --git a/platform/platform-api/src/com/intellij/ui/docking/DockContainer.java b/platform/platform-api/src/com/intellij/ui/docking/DockContainer.java
index f599a1d8bcd236760066a83036b7ca6f3b7ba247..25fb0289681322209015af5ef266af07e1897749 100644 (file)
--- a/platform/platform-api/src/com/intellij/ui/docking/DockContainer.java
+++ b/platform/platform-api/src/com/intellij/ui/docking/DockContainer.java
@@ -30,7 +30,7 @@ public interface DockContainer extends Disposable, Activatable {
   RelativeRectangle getAcceptArea();
   boolean canAccept(DockableContent content, RelativePoint point);
 
-  JComponent getComponent();
+  JComponent getContainerComponent();
 
   void add(DockableContent content, RelativePoint dropTarget);
 

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorTabbedContainer.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorTabbedContainer.java
index f2c24a9de9733094e1b91a6cff519ef0f744d6a0..11c212bc71cab87533d814adcd9b14236869c018 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorTabbedContainer.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/DockableEditorTabbedContainer.java
@@ -187,7 +187,7 @@ public class DockableEditorTabbedContainer implements DockContainer.Persistent {
   }
 
   @Override
-  public JComponent getComponent() {
+  public JComponent getContainerComponent() {
     return mySplitters;
   }
 

diff --git a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
index fe6e01c69e78782d5398066371295674df3935a4..738d25fdfc269814d2c1a51e8b9ede17287a0a71 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/docking/impl/DockManagerImpl.java
@@ -122,7 +122,7 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
 
   @Override
   public IdeFrame getIdeFrame(DockContainer container) {
-    Component parent = UIUtil.findUltimateParent(container.getComponent());
+    Component parent = UIUtil.findUltimateParent(container.getContainerComponent());
     if (parent instanceof IdeFrame) {
       return (IdeFrame)parent;
     }
@@ -143,7 +143,7 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
     if (c == null) return null;
 
     for (DockContainer eachContainer : myContainers) {
-      if (SwingUtilities.isDescendingFrom(c, eachContainer.getComponent())) {
+      if (SwingUtilities.isDescendingFrom(c, eachContainer.getContainerComponent())) {
         return eachContainer;
       }
     }
@@ -152,7 +152,7 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
     if (parent == null) return null;
 
     for (DockContainer eachContainer : myContainers) {
-      if (parent == UIUtil.findUltimateParent(eachContainer.getComponent())) {
+      if (parent == UIUtil.findUltimateParent(eachContainer.getContainerComponent())) {
         return eachContainer;
       }
     }
@@ -424,7 +424,7 @@ public class DockManagerImpl extends DockManager implements PersistentStateCompo
       center.add(myNorthPanel, BorderLayout.NORTH);
 
       myDockContentUiContainer = new NonOpaquePanel(new BorderLayout());
-      myDockContentUiContainer.add(myContainer.getComponent(), BorderLayout.CENTER);
+      myDockContentUiContainer.add(myContainer.getContainerComponent(), BorderLayout.CENTER);
       center.add(myDockContentUiContainer, BorderLayout.CENTER);
 
       myUiContainer.add(center, BorderLayout.CENTER);