[LMS-1600] dispose sections on detach of sections panel (fixes problem with...

[LMS-1600] dispose sections on detach of sections panel (fixes problem with filters not working after changing visibility of a section)

SVN: 16901

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

@@ -46,13 +46,12 @@ abstract public class DisposableSectionPanel extends SingleSectionPanel
     }
 
     @Override
-    protected void onDetach()
+    protected void disposeComponents()
     {
         if (disposableComponentOrNull != null)
         {
             disposableComponentOrNull.dispose();
         }
-        super.onDetach();
     }
 
     @Override

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

@@ -41,6 +41,13 @@ 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)
+     */
+    private boolean autoDisposeComponents = true;
+
     public SingleSectionPanel(final String header, IViewContext<?> viewContext)
     {
         this.viewContext = viewContext;
@@ -82,4 +89,45 @@ abstract public class SingleSectionPanel extends ContentPanel
             isContentVisible = true;
         }
     }
+
+    public boolean isContentVisible()
+    {
+        return isContentVisible;
+    }
+
+    public void enableAutoDisposeComponents()
+    {
+        setAutoDisposeComponents(true);
+    }
+
+    public void disableAutoDisposeComponents()
+    {
+        setAutoDisposeComponents(false);
+    }
+
+    protected boolean isAutoDisposeComponents()
+    {
+        return autoDisposeComponents;
+    }
+
+    private void setAutoDisposeComponents(boolean autoDisposeComponent)
+    {
+        this.autoDisposeComponents = autoDisposeComponent;
+    }
+
+    @Override
+    protected void onDetach()
+    {
+        if (isAutoDisposeComponents())
+        {
+            disposeComponents();
+        }
+        super.onDetach();
+    }
+
+    /** disposes components created for the section (by default does nothing) */
+    protected void disposeComponents()
+    {
+    }
+
 }

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

@@ -145,11 +145,24 @@ public class SectionsPanel extends ContentPanel
                     refreshLayout();
                 }
             });
+        // sections will be disposed when section panel is removed, not when they are hidden
+        // (see onDetach())
+        panel.disableAutoDisposeComponents();
         elements.add(element);
         addToToolbar(element.getButton());
         updateElementVisibility(element);
     }
 
+    @Override
+    protected void onDetach()
+    {
+        for (SectionElement el : elements)
+        {
+            el.getPanel().enableAutoDisposeComponents();
+        }
+        super.onDetach();
+    }
+
     /** removes all sections and adds them once again with with refreshed state */
     private void refreshLayout()
     {

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 onDetach()
+    protected void disposeComponents()
     {
         disposeCurrentReport();
     }