[LMS-1600] refactoring

SVN: 16916

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableSectionPanel.java

@@ -46,7 +46,7 @@ abstract public class DisposableSectionPanel extends SingleSectionPanel
     }
 
     @Override
-    protected void disposeComponents()
+    public void disposeComponents()
     {
         if (disposableComponentOrNull != null)
         {

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SingleSectionPanel.java

@@ -42,9 +42,10 @@ abstract public class SingleSectionPanel extends ContentPanel
     private boolean isContentVisible = false;
 
     /**
-     * whether additional components created for this section (e.g. browsers) should be automatically
-     * disposed (for sections that can temporarily removed from container as in
-     * {@link SectionsPanel} it should be turned off until detach from the container)
+     * Whether additional components created for this section (e.g. browsers) should be
+     * automatically disposed when the section is detached from its container. For sections that can
+     * temporarily removed from container as in {@link SectionsPanel} it should be turned off and
+     * the container should dispose section components manually.
      */
     private boolean autoDisposeComponents = true;
 
@@ -95,14 +96,9 @@ abstract public class SingleSectionPanel extends ContentPanel
         return isContentVisible;
     }
 
-    public void enableAutoDisposeComponents()
-    {
-        setAutoDisposeComponents(true);
-    }
-
     public void disableAutoDisposeComponents()
     {
-        setAutoDisposeComponents(false);
+        this.autoDisposeComponents = false;
     }
 
     protected boolean isAutoDisposeComponents()
@@ -110,11 +106,6 @@ abstract public class SingleSectionPanel extends ContentPanel
         return autoDisposeComponents;
     }
 
-    private void setAutoDisposeComponents(boolean autoDisposeComponent)
-    {
-        this.autoDisposeComponents = autoDisposeComponent;
-    }
-
     @Override
     protected void onDetach()
     {
@@ -126,7 +117,7 @@ abstract public class SingleSectionPanel extends ContentPanel
     }
 
     /** disposes components created for the section (by default does nothing) */
-    protected void disposeComponents()
+    public void disposeComponents()
     {
     }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/grid/AbstractBrowserGrid.java

@@ -540,7 +540,7 @@ public abstract class AbstractBrowserGrid<T/* Entity */, M extends BaseEntityMod
 
                 public void dispose()
                 {
-                    debug("dispose a tab");
+                    debug("dispose a browser");
                     self.disposeCache();
                 }
 

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java

@@ -158,7 +158,7 @@ public class SectionsPanel extends ContentPanel
     {
         for (SectionElement el : elements)
         {
-            el.getPanel().enableAutoDisposeComponents();
+            el.getPanel().disposeComponents();
         }
         super.onDetach();
     }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java

@@ -73,7 +73,7 @@ public class DataViewSection extends SingleSectionPanel
     }
 
     @Override
-    protected void disposeComponents()
+    public void disposeComponents()
     {
         disposeCurrentReport();
     }