diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.java
index 3ab3ba1faf61d7f46d87b14a9cfc073ce2df831a..2686d2db7762ac9aecab34fb5703e25b1ccf8379 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AttachmentVersionsSection.java
@@ -23,11 +23,11 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.dto.AttachmentVersions
import ch.systemsx.cisd.openbis.generic.shared.basic.IAttachmentHolder;
/**
- * {@link SingleSectionPanel} containing a list of {@link AttachmentVersions}.
+ * {@link TabContent} containing a list of {@link AttachmentVersions}.
*
* @author Piotr Buczek
*/
-public class AttachmentVersionsSection extends DisposableSectionPanel
+public class AttachmentVersionsSection extends DisposableTabContent
{
private final IAttachmentHolder attachmentHolder;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableSectionPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableTabContent.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableSectionPanel.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableTabContent.java
index 5bd25cb71736281ed2867cf51641ff576ecd0d67..9118853e36c2da065aa50b6311b53a3d5662cd1f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableSectionPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/DisposableTabContent.java
@@ -25,7 +25,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.ID
*
* @author Franz-Josef Elmer
*/
-abstract public class DisposableSectionPanel extends SingleSectionPanel
+abstract public class DisposableTabContent extends TabContent
{
abstract protected IDisposableComponent createDisposableContent();
@@ -35,7 +35,7 @@ abstract public class DisposableSectionPanel extends SingleSectionPanel
/**
* Creates section with specified header.
*/
- public DisposableSectionPanel(String header, IViewContext<?> viewContext)
+ public DisposableTabContent(String header, IViewContext<?> viewContext)
{
super(header, viewContext);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
index 075dc94a77755747d0d0b91371751c551a011af1..ff5bfe378047eb68983e091f59cc23a634aad7a7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ProjectViewer.java
@@ -110,7 +110,7 @@ public final class ProjectViewer extends AbstractViewer<IEntityInformationHolder
viewContext.getService().getProjectInfo(projectId, callback);
}
- private SingleSectionPanel createAttachmentsSection(final Project project)
+ private TabContent createAttachmentsSection(final Project project)
{
return new AttachmentVersionsSection(viewContext.getCommonViewContext(), project);
}
@@ -170,7 +170,7 @@ public final class ProjectViewer extends AbstractViewer<IEntityInformationHolder
public Component createCenterPanel(Project result)
{
- final SingleSectionPanel panel = createAttachmentsSection(result);
+ final TabContent panel = createAttachmentsSection(result);
// need to set content visibility here as this section is not added to SectionPanel
panel.setContentVisible(true);
return panel;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SingleSectionPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TabContent.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SingleSectionPanel.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TabContent.java
index 72c66284d7e03f95a58dc319152996b89c9d359e..1eb3749f924ff0cb57fb916257f2ea768163af32 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/SingleSectionPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/TabContent.java
@@ -30,7 +30,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.
*
* @author Izabela Adamczyk
*/
-abstract public class SingleSectionPanel extends ContentPanel
+abstract public class TabContent extends ContentPanel
{
/** creates a section content, called when the section is shown for the first time */
abstract protected void showContent();
@@ -49,12 +49,12 @@ abstract public class SingleSectionPanel extends ContentPanel
*/
private boolean autoDisposeComponents = true;
- public SingleSectionPanel(final String header, IViewContext<?> viewContext)
+ public TabContent(final String header, IViewContext<?> viewContext)
{
this.viewContext = viewContext;
setHeaderVisible(true);
setHeading(header);
- setCollapsible(true);
+ setCollapsible(false);
setAnimCollapse(false);
setBodyBorder(true);
setLayout(new FitLayout());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.java
index 1aa46275c639cbfb21201431ba7d4211d0a3082e..86976f787161d78261a35b46b97e34f8bc0a55fe 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/plugin/IModule.java
@@ -22,8 +22,8 @@ import java.util.List;
import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
/**
@@ -54,9 +54,9 @@ public interface IModule
List<? extends MenuItem> getMenuItems();
/**
- * Returns a collection of {@link DisposableSectionPanel}s that will be added to entity details
+ * Returns a collection of {@link DisposableTabContent}s that will be added to entity details
* view.
*/
- Collection<? extends SingleSectionPanel> getSections(
+ Collection<? extends TabContent> getSections(
IEntityInformationHolderWithIdentifier entity);
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.java
index c277a982fa187267f9c60424674524e5427dc595..0e975f9370f67d1d668143045a1fcd7be94d5d45 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/ModulesSectionsManager.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui;
import java.util.Collection;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.IModule;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.SectionsPanel;
@@ -77,8 +77,8 @@ public class ModulesSectionsManager
{
for (final IModule module : modules)
{
- final Collection<? extends SingleSectionPanel> sections = module.getSections(entity);
- for (final SingleSectionPanel panel : sections)
+ final Collection<? extends TabContent> sections = module.getSections(entity);
+ for (final TabContent panel : sections)
{
panel.setDisplayID(DisplayTypeIDGenerator.MODULE_SECTION, module.getName() + "-"
+ displayIdSuffix);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
index db2de02c10e09d234d7997d2f4cbd2e3fe56c892..830ca88dd9b650367f2469cc947a4994fe9bdb40 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/widget/SectionsPanel.java
@@ -4,54 +4,43 @@ import java.util.ArrayList;
import java.util.List;
import com.extjs.gxt.ui.client.event.BaseEvent;
-import com.extjs.gxt.ui.client.event.ButtonEvent;
import com.extjs.gxt.ui.client.event.Events;
import com.extjs.gxt.ui.client.event.Listener;
-import com.extjs.gxt.ui.client.event.SelectionListener;
+import com.extjs.gxt.ui.client.event.TabPanelEvent;
import com.extjs.gxt.ui.client.widget.Component;
-import com.extjs.gxt.ui.client.widget.ContentPanel;
-import com.extjs.gxt.ui.client.widget.button.ToggleButton;
+import com.extjs.gxt.ui.client.widget.LayoutContainer;
+import com.extjs.gxt.ui.client.widget.TabItem;
+import com.extjs.gxt.ui.client.widget.TabPanel;
import com.extjs.gxt.ui.client.widget.layout.FillLayout;
-import com.extjs.gxt.ui.client.widget.toolbar.ToolBar;
+import com.extjs.gxt.ui.client.widget.layout.FitLayout;
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplaySettingsManager.Modification;
/**
- * Content panel which allows to choose which contained panels should be visible and uses the whole
- * space available to show them.
+ * {@link LayoutContainer} which allows to choose which contained panels should be visible and uses
+ * the whole space available to show them.
*
* @author Izabela Adamczyk
*/
-public class SectionsPanel extends ContentPanel
+public class SectionsPanel extends LayoutContainer
{
- public static final String POSTFIX_BUTTON_ID = "_button";
+ public static final String POSTFIX_SECTION_TAB_ID = "_sections_tab";
- private List<SectionElement> elements = new ArrayList<SectionElement>();
+ private final List<SectionElement> elements = new ArrayList<SectionElement>();
- private final ToolBar toolbar;
-
- private final boolean withShowHide;
+ private final TabPanel toolbar;
private final IViewContext<ICommonClientServiceAsync> viewContext;
public SectionsPanel(IViewContext<ICommonClientServiceAsync> viewContext)
{
- this(true, viewContext);
- }
-
- private SectionsPanel(boolean withShowHide, IViewContext<ICommonClientServiceAsync> viewContext)
- {
- this.withShowHide = withShowHide;
this.viewContext = viewContext;
setLayout(new FillLayout());
- toolbar = new ToolBar();
- setHeaderVisible(false);
- setTopComponent(toolbar);
-
+ toolbar = new TabPanel();
+ super.add(toolbar);
addRefreshDisplaySettingsListener();
}
@@ -71,7 +60,6 @@ public class SectionsPanel extends ContentPanel
// loop
lastRefreshCheckTime = System.currentTimeMillis();
updateSettings();
- refreshLayout();
}
lastRefreshCheckTime = System.currentTimeMillis();
}
@@ -120,7 +108,7 @@ public class SectionsPanel extends ContentPanel
sectionID);
if (newSettings != null)
{
- sectionElement.getButton().toggle(newSettings);
+ // sectionElement.getButton().toggle(newSettings);
}
}
}
@@ -128,29 +116,15 @@ public class SectionsPanel extends ContentPanel
});
}
- public void addPanel(final SingleSectionPanel panel)
- {
- addPanel(panel, true);
- }
-
- public void addPanel(final SingleSectionPanel panel, boolean pressByDeafult)
+ public void addPanel(final TabContent panel)
{
- final SectionElement element =
- new SectionElement(panel, withShowHide, viewContext, pressByDeafult);
- element.getButton().addSelectionListener(new SelectionListener<ButtonEvent>()
- {
- @Override
- public void componentSelected(ButtonEvent ce)
- {
- refreshLayout();
- }
- });
+ final SectionElement element = new SectionElement(panel, viewContext);
// 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);
+ addToToolbar(element);
+ // panel.setContentVisible(true);
}
@Override
@@ -163,41 +137,13 @@ public class SectionsPanel extends ContentPanel
super.onDetach();
}
- /** removes all sections and adds them once again with with refreshed state */
- private void refreshLayout()
+ private void addToToolbar(SectionElement element)
{
- // NOTE: changing visibility of only those sections that changed state doesn't improve
- // performance but makes code more complex
- removeAll();
- for (SectionElement el : elements)
- {
- updateElementVisibility(el);
- }
- layout();
- }
-
- private void updateElementVisibility(SectionElement element)
- {
- boolean visible = element.getButton().isPressed();
- element.getPanel().setContentVisible(visible);
- if (visible)
- {
- internalAdd(element);
- }
- }
-
- private void addToToolbar(ToggleButton bb)
- {
- toolbar.add(bb);
- }
-
- private void internalAdd(final SectionElement element)
- {
- super.add(element.getPanel());
+ toolbar.add(element);
}
/**
- * Use {@link #addPanel(SingleSectionPanel)}
+ * Use {@link #addPanel(TabContent)}
*/
@Deprecated
@Override
@@ -206,80 +152,38 @@ public class SectionsPanel extends ContentPanel
return super.add(item);
}
- private class SectionElement
+ private class SectionElement extends TabItem
{
- private final ToggleButton button;
-
- private SingleSectionPanel panel;
+ private TabContent panel;
- public SectionElement(SingleSectionPanel panel, boolean withShowHide,
- IViewContext<ICommonClientServiceAsync> viewContext, boolean defaultPressedValue)
+ public SectionElement(final TabContent panel,
+ IViewContext<ICommonClientServiceAsync> viewContext)
{
- panel.setCollapsible(false);
+ setClosable(false);
+ setLayout(new FitLayout());
this.setPanel(panel);
- String heading = panel.getHeading();
- Boolean sectionSettings =
- viewContext.getDisplaySettingsManager()
- .getSectionSettings(panel.getDisplayID());
- boolean pressed = sectionSettings != null ? sectionSettings : defaultPressedValue;
- button = createButton(heading, pressed, panel.getDisplayID());
- }
-
- public ToggleButton getButton()
- {
- return button;
- }
-
- void setPanel(SingleSectionPanel panel)
- {
- this.panel = panel;
- }
-
- SingleSectionPanel getPanel()
- {
- return panel;
- }
-
- private String getHeading(String heading, boolean pressed)
- {
- final String showHeading = withShowHide ? ("Show " + heading) : heading;
- final String hideHeading = withShowHide ? ("Hide " + heading) : heading;
- return pressed ? hideHeading : showHeading;
- }
-
- private ToggleButton createButton(final String heading, boolean pressed,
- final String displayId)
- {
- final ToggleButton result = new ToggleButton(getHeading(heading, pressed));
- result.setId(GenericConstants.ID_PREFIX + displayId + POSTFIX_BUTTON_ID);
- initializePressedState(result, pressed);
-
- // when user clicks toggle button we store changed settings
- result.addSelectionListener(new SelectionListener<ButtonEvent>()
+ setText(panel.getHeading());
+ panel.setHeaderVisible(false);
+ add(panel);
+ addListener(Events.Select, new Listener<TabPanelEvent>()
{
- @Override
- public void componentSelected(ButtonEvent ce)
+ public void handleEvent(TabPanelEvent be)
{
- viewContext.getDisplaySettingsManager().storeSectionSettings(displayId,
- result.isPressed(), SectionsPanel.this);
- }
- });
- // heading needs to be updated also when we refresh settings using toggle
- result.addListener(Events.Toggle, new Listener<BaseEvent>()
- {
- public void handleEvent(BaseEvent be)
- {
- result.setText(getHeading(heading, result.isPressed()));
+ panel.setContentVisible(true);
+ layout();
}
});
+ }
- return result;
+ void setPanel(TabContent panel)
+ {
+ this.panel = panel;
}
- private void initializePressedState(ToggleButton result, boolean pressed)
+ TabContent getPanel()
{
- result.toggle(pressed);
+ return panel;
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.java
index 3b832e66de47316435bd195e5c6ae74454ed9ee4..dade425e203f52671d11fca5d8b72279d340cbee 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/demo/client/web/client/application/module/DemoModule.java
@@ -24,7 +24,7 @@ import java.util.List;
import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.IModule;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
@@ -68,9 +68,9 @@ public class DemoModule implements IModule
callback.onSuccess(null);
}
- public Collection<? extends DisposableSectionPanel> getSections(
+ public Collection<? extends DisposableTabContent> getSections(
IEntityInformationHolderWithIdentifier entity)
{
- return new ArrayList<DisposableSectionPanel>();
+ return new ArrayList<DisposableTabContent>();
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.java
index 5d344f95385982a15d754b1684d92317696f35ee..9569ac17a4fe5391cf4bbab1b9a753ba657771d3 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetChildrenSection.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
/**
* @author Piotr Buczek
*/
-class DataSetChildrenSection extends DisposableSectionPanel
+class DataSetChildrenSection extends DisposableTabContent
{
private final ExternalData dataset;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.java
index 5242f41bb860778402d6482e22ca4bcc793422e9..bf072abe56e8915a5f6ce7ef9ae12ff3e7fdbe66 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataSetParentsSection.java
@@ -16,7 +16,7 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.dataset;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -26,7 +26,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
/**
* @author Piotr Buczek
*/
-class DataSetParentsSection extends DisposableSectionPanel
+class DataSetParentsSection extends DisposableTabContent
{
private final ExternalData dataset;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
index e79c6948f294f62485747ada1d763bc5f15a18d0..0bcd3847feb112a7309ee881c8b1d84a3541b1ba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/DataViewSection.java
@@ -33,7 +33,7 @@ import com.google.gwt.user.client.ui.Widget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.ModelDataPropertyNames;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.NonHierarchicalBaseModelData;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DataSetReportGenerator;
@@ -54,7 +54,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
* @author Izabela Adamczyk
* @author Piotr Buczek
*/
-public class DataViewSection extends SingleSectionPanel
+public class DataViewSection extends TabContent
{
private static String DEFAULT_SERVICE_KEY_PREFIX = "default-";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
index 4a966751165a1a2cbcd750801a2fc42170395086..8febfb99efe87fa31c426f798ec5bef747f8aea8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/dataset/GenericDataSetViewer.java
@@ -34,7 +34,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAs
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.IDatabaseModificationObserver;
@@ -111,9 +111,9 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
* To be subclassed. Creates additional panels of the viewer in the right side section besides
* components, datasets and attachments
*/
- protected List<SingleSectionPanel> createAdditionalSectionPanels()
+ protected List<TabContent> createAdditionalSectionPanels()
{
- return new ArrayList<SingleSectionPanel>();
+ return new ArrayList<TabContent>();
}
private void extendToolBar()
@@ -171,28 +171,28 @@ abstract public class GenericDataSetViewer extends AbstractViewer<ExternalData>
final SectionsPanel container = new SectionsPanel(viewContext.getCommonViewContext());
displayIdSuffix = getDisplayIdSuffix(dataset.getDataSetType().getCode());
- List<SingleSectionPanel> additionalPanels = createAdditionalSectionPanels();
- for (SingleSectionPanel panel : additionalPanels)
+ List<TabContent> additionalPanels = createAdditionalSectionPanels();
+ for (TabContent panel : additionalPanels)
{
container.addPanel(panel);
}
// parents
- final SingleSectionPanel parentsSection = new DataSetParentsSection(viewContext, dataset);
+ final TabContent parentsSection = new DataSetParentsSection(viewContext, dataset);
parentsSection.setDisplayID(DisplayTypeIDGenerator.DATA_SET_PARENTS_SECTION,
displayIdSuffix);
- container.addPanel(parentsSection, false);
+ container.addPanel(parentsSection);
// children
- final SingleSectionPanel childrenSection = new DataSetChildrenSection(viewContext, dataset);
+ final TabContent childrenSection = new DataSetChildrenSection(viewContext, dataset);
childrenSection.setDisplayID(DisplayTypeIDGenerator.DATA_SET_CHILDREN_SECTION,
displayIdSuffix);
- container.addPanel(childrenSection, false);
+ container.addPanel(childrenSection);
// data
- final SingleSectionPanel dataSection = new DataViewSection(viewContext, dataset);
+ final TabContent dataSection = new DataViewSection(viewContext, dataset);
dataSection.setDisplayID(DisplayTypeIDGenerator.DATA_SET_DATA_SECTION, displayIdSuffix);
container.addPanel(dataSection);
- container.layout();
+ // container.layout();
moduleSectionManager.initialize(container, displayIdSuffix, dataset);
return container;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.java
index 92798426f744d6c5e5f46566c2a5dad0cfff75b2..921cc65aa85dfece2bdc00bde2d932de74e6ea7a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/ExperimentSamplesSection.java
@@ -16,10 +16,10 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.experiment;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleBrowserGrid;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
@@ -27,11 +27,11 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
/**
- * {@link SingleSectionPanel} containing experiment samples.
+ * {@link TabContent} containing experiment samples.
*
* @author Izabela Adamczyk
*/
-public class ExperimentSamplesSection extends DisposableSectionPanel
+public class ExperimentSamplesSection extends DisposableTabContent
{
private static final String PREFIX = "experiment-samples-section_";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
index 719f0d7fcd3d59f1ad83ccd684f55a121a71c306..c6fd45d4aa73823500b1732e807d325150e50c3a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/GenericExperimentViewer.java
@@ -27,7 +27,7 @@ import com.extjs.gxt.ui.client.widget.layout.BorderLayout;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AttachmentVersionsSection;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.CompositeDatabaseModificationObserver;
@@ -74,7 +74,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
private ExperimentPropertiesPanel propertiesPanelOrNull;
- private List<DisposableSectionPanel> rightPanelSectionsOrNull;
+ private List<DisposableTabContent> rightPanelSectionsOrNull;
public static DatabaseModificationAwareComponent create(
final IViewContext<IGenericClientServiceAsync> viewContext,
@@ -235,10 +235,10 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
return GENERIC_EXPERIMENT_VIEWER + "-" + suffix;
}
- private List<DisposableSectionPanel> createRightPanel(final String displayIdSuffix)
+ private List<DisposableTabContent> createRightPanel(final String displayIdSuffix)
{
- List<DisposableSectionPanel> allPanels = new ArrayList<DisposableSectionPanel>();
+ List<DisposableTabContent> allPanels = new ArrayList<DisposableTabContent>();
allPanels.addAll(createAdditionalBrowserSectionPanels(displayIdSuffix));
@@ -248,7 +248,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
displayIdSuffix);
allPanels.add(sampleSection);
- final DisposableSectionPanel dataSection = createExperimentDataSetSection();
+ final DisposableTabContent dataSection = createExperimentDataSetSection();
dataSection.setDisplayID(DisplayTypeIDGenerator.DATA_SET_SECTION, displayIdSuffix);
allPanels.add(dataSection);
@@ -259,9 +259,9 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
return allPanels;
}
- private DisposableSectionPanel createExperimentDataSetSection()
+ private DisposableTabContent createExperimentDataSetSection()
{
- return new DisposableSectionPanel("Data Sets", viewContext)
+ return new DisposableTabContent("Data Sets", viewContext)
{
@Override
protected IDisposableComponent createDisposableContent()
@@ -272,10 +272,10 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
};
}
- private SectionsPanel layoutSections(List<DisposableSectionPanel> allPanels)
+ private SectionsPanel layoutSections(List<DisposableTabContent> allPanels)
{
final SectionsPanel container = new SectionsPanel(viewContext.getCommonViewContext());
- for (DisposableSectionPanel panel : allPanels)
+ for (DisposableTabContent panel : allPanels)
{
container.addPanel(panel);
}
@@ -283,8 +283,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
return container;
}
- protected List<DisposableSectionPanel> createAdditionalBrowserSectionPanels(
- String displyIdSuffix)
+ protected List<DisposableTabContent> createAdditionalBrowserSectionPanels(String displyIdSuffix)
{
return Collections.emptyList();
}
@@ -298,7 +297,7 @@ public class GenericExperimentViewer extends AbstractViewer<Experiment> implemen
CompositeDatabaseModificationObserverWithMainObserver modificationObserver =
new CompositeDatabaseModificationObserverWithMainObserver(propertiesPanelOrNull
.getDatabaseModificationObserver());
- for (DisposableSectionPanel panel : rightPanelSectionsOrNull)
+ for (DisposableTabContent panel : rightPanelSectionsOrNull)
{
modificationObserver.addObserver(panel.tryGetDatabaseModificationObserver());
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java
index 1fcfe74c28709d460d9b15de5e98ffa5e69095c5..4bc63bb088e229830e344365a14fa609c05b5bf8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/material/GenericMaterialViewer.java
@@ -33,7 +33,7 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAs
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.AbstractDatabaseModificationObserverWithCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.CompositeDatabaseModificationObserverWithMainObserver;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
@@ -129,8 +129,8 @@ abstract public class GenericMaterialViewer extends AbstractViewer<Material> imp
displayIdSuffix = getDisplayIdSuffix(material.getMaterialType().getCode());
final SectionsPanel container = new SectionsPanel(viewContext.getCommonViewContext());
- List<SingleSectionPanel> additionalPanels = createAdditionalSectionPanels();
- for (SingleSectionPanel panel : additionalPanels)
+ List<TabContent> additionalPanels = createAdditionalSectionPanels();
+ for (TabContent panel : additionalPanels)
{
container.addPanel(panel);
}
@@ -161,9 +161,9 @@ abstract public class GenericMaterialViewer extends AbstractViewer<Material> imp
* To be subclassed. Creates additional panels of the viewer in the right side section besides
* components, datasets and attachments
*/
- protected List<SingleSectionPanel> createAdditionalSectionPanels()
+ protected List<TabContent> createAdditionalSectionPanels()
{
- return new ArrayList<SingleSectionPanel>();
+ return new ArrayList<TabContent>();
}
private final Component createLeftPanel(final Material material)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.java
index 6a718d2cac3cd8defe067d647aa7487d34c87fb8..46f741328716279252f721ad3bc106bfd6150507 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ContainerSamplesSection.java
@@ -17,21 +17,21 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleBrowserGrid;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
/**
- * {@link SingleSectionPanel} containing samples with specified container sample.
+ * {@link TabContent} containing samples with specified container sample.
*
* @author Piotr Buczek
*/
-public class ContainerSamplesSection extends DisposableSectionPanel
+public class ContainerSamplesSection extends DisposableTabContent
{
private static final String PREFIX = "container-samples-section_";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
index dec4db41f9afe6627f351a1e05d54dba0a029f2c..b0dcb444bacafdd3f61559e2a66a5078c77a304c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/DerivedSamplesSection.java
@@ -17,21 +17,21 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleBrowserGrid;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
/**
- * {@link SingleSectionPanel} containing samples with specified parent sample.
+ * {@link TabContent} containing samples with specified parent sample.
*
* @author Piotr Buczek
*/
-public class DerivedSamplesSection extends DisposableSectionPanel
+public class DerivedSamplesSection extends DisposableTabContent
{
private static final String PREFIX = "derived-samples-section_";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index d095dc737244b3096baa8f750f2fcb6bfad4c835..f9e474ea6536ba671ac15edd8a17888a5c930f65 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
@@ -36,10 +36,10 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AttachmentVersionsSection;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.AbstractDatabaseModificationObserverWithCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.CompositeDatabaseModificationObserver;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.CompositeDatabaseModificationObserverWithMainObserver;
@@ -104,15 +104,15 @@ abstract public class GenericSampleViewer extends AbstractViewer<Sample> impleme
protected final TechId sampleId;
- private DisposableSectionPanel attachmentsSection;
+ private DisposableTabContent attachmentsSection;
- private DisposableSectionPanel containerSamplesSection;
+ private DisposableTabContent containerSamplesSection;
- private DisposableSectionPanel derivedSamplesSection;
+ private DisposableTabContent derivedSamplesSection;
- private DisposableSectionPanel parentSamplesSection;
+ private DisposableTabContent parentSamplesSection;
- private DisposableSectionPanel dataSetBrowser;
+ private DisposableTabContent dataSetBrowser;
private PropertyGrid propertyGrid;
@@ -193,8 +193,8 @@ abstract public class GenericSampleViewer extends AbstractViewer<Sample> impleme
displayIdSuffix = getDisplayIdSuffix(generator.getSampleType().getCode());
final SectionsPanel container = new SectionsPanel(viewContext.getCommonViewContext());
- List<SingleSectionPanel> additionalPanels = createAdditionalSectionPanels();
- for (SingleSectionPanel panel : additionalPanels)
+ List<TabContent> additionalPanels = createAdditionalSectionPanels();
+ for (TabContent panel : additionalPanels)
{
container.addPanel(panel);
}
@@ -202,17 +202,17 @@ abstract public class GenericSampleViewer extends AbstractViewer<Sample> impleme
containerSamplesSection = new ContainerSamplesSection(viewContext, generator);
containerSamplesSection.setDisplayID(DisplayTypeIDGenerator.CONTAINER_SAMPLES_SECTION,
displayIdSuffix);
- container.addPanel(containerSamplesSection, false);
+ container.addPanel(containerSamplesSection);
// Derived samples
derivedSamplesSection = new DerivedSamplesSection(viewContext, generator);
derivedSamplesSection.setDisplayID(DisplayTypeIDGenerator.DERIVED_SAMPLES_SECTION,
displayIdSuffix);
- container.addPanel(derivedSamplesSection, false);
+ container.addPanel(derivedSamplesSection);
// Parent samples
parentSamplesSection = new ParentSamplesSection(viewContext, generator);
parentSamplesSection.setDisplayID(DisplayTypeIDGenerator.PARENT_SAMPLES_SECTION,
displayIdSuffix);
- container.addPanel(parentSamplesSection, false);
+ container.addPanel(parentSamplesSection);
// Data Sets
CheckBox showOnlyDirectlyConnectedCheckBox = createShowOnlyDirectlyConnectedCheckBox();
dataSetBrowser =
@@ -235,9 +235,9 @@ abstract public class GenericSampleViewer extends AbstractViewer<Sample> impleme
* To be subclassed. Creates additional panels of the viewer in the right side section besides
* components, datasets and attachments
*/
- protected List<SingleSectionPanel> createAdditionalSectionPanels()
+ protected List<TabContent> createAdditionalSectionPanels()
{
- return new ArrayList<SingleSectionPanel>();
+ return new ArrayList<TabContent>();
}
private CheckBox createShowOnlyDirectlyConnectedCheckBox()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.java
index 503ce7c013ba9346d8c786567a14cdb40c7e5c8d..0b3c4b6006413f1b7423afccbe75ab04d36ee65c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/ParentSamplesSection.java
@@ -17,21 +17,21 @@
package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sample;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample.SampleBrowserGrid;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
/**
- * {@link SingleSectionPanel} containing samples with specified child sample.
+ * {@link TabContent} containing samples with specified child sample.
*
* @author Piotr Buczek
*/
-public class ParentSamplesSection extends DisposableSectionPanel
+public class ParentSamplesSection extends DisposableTabContent
{
private static final String PREFIX = "parent-samples-section_";
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
index 9cd3a9e55a0289629cb70fa257b22f6dfdddec7c..f55f868fdb9812e485164e4c4fd1a60f4ea7a95b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/SampleDataSetsSection.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sa
import com.extjs.gxt.ui.client.widget.form.CheckBox;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.sam
/**
* @author Chandrasekhar Ramakrishnan
*/
-public class SampleDataSetsSection extends DisposableSectionPanel
+public class SampleDataSetsSection extends DisposableTabContent
{
private final CheckBox showOnlyDirectlyConnectedCheckBox;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.java
index 6834e97d85545d1d48fcc31af86f5089796554e9..e827868ecf8ec096558217a09fdd6a909775dfcc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QueryModule.java
@@ -25,7 +25,7 @@ import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.google.gwt.user.client.rpc.AsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.IModule;
@@ -102,7 +102,7 @@ public class QueryModule implements IModule
}
- public Collection<? extends DisposableSectionPanel> getSections(
+ public Collection<? extends DisposableTabContent> getSections(
IEntityInformationHolderWithIdentifier entity)
{
if (databases == 0)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.java
index 98c7a95a5b9c6398febd18cb85ef012efee40ffb..99a8e14f2e917b05bf40950f0886fd7e16a74c19 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/query/client/web/client/application/QuerySectionPanel.java
@@ -21,7 +21,7 @@ import java.util.Set;
import com.extjs.gxt.ui.client.widget.Component;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
@@ -39,7 +39,7 @@ import ch.systemsx.cisd.openbis.plugin.query.client.web.client.application.modul
*
* @author Izabela Adamczyk
*/
-final class QuerySectionPanel extends DisposableSectionPanel
+final class QuerySectionPanel extends DisposableTabContent
{
private static final String PARAMETER_PREFIX = "_";
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetChildrenAndParents.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetChildrenAndParents.java
index d0d8cd1556ea05fde4d52a8529e10abcd4933c38..7b5a070e09375a2c67df48bd1d9277ce750923f7 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetChildrenAndParents.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/ShowDataSetChildrenAndParents.java
@@ -53,7 +53,7 @@ public class ShowDataSetChildrenAndParents extends AbstractDefaultTestCommand
{
Widget widget = GWTTestUtil.getWidgetWithID(GenericConstants.ID_PREFIX
+ idGenerator.createID(GenericDataSetViewer.PREFIX + code)
- + SectionsPanel.POSTFIX_BUTTON_ID);
+ + SectionsPanel.POSTFIX_SECTION_TAB_ID);
if (widget instanceof ToggleButton)
{
ToggleButton button = (ToggleButton) widget;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
index f109ad81097b84692b8fc508f7e4bc4199e02dee..18aa8e1fc4c8205e0fd8bb3d3473fdfbb4ee080e 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ExperimentViewer.java
@@ -19,7 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.applicatio
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
@@ -56,11 +56,11 @@ public class ExperimentViewer extends GenericExperimentViewer
}
@Override
- protected List<DisposableSectionPanel> createAdditionalBrowserSectionPanels(
+ protected List<DisposableTabContent> createAdditionalBrowserSectionPanels(
String displyIdSuffix)
{
- DisposableSectionPanel section =
- new DisposableSectionPanel(specificViewContext.getMessage(Dict.PROTEINS_SECTION),
+ DisposableTabContent section =
+ new DisposableTabContent(specificViewContext.getMessage(Dict.PROTEINS_SECTION),
specificViewContext)
{
@Override
@@ -71,7 +71,7 @@ public class ExperimentViewer extends GenericExperimentViewer
}
};
section.setDisplayID(DisplayTypeIDGenerator.PROTEIN_SECTION, displyIdSuffix);
- return Collections.<DisposableSectionPanel> singletonList(section);
+ return Collections.<DisposableTabContent> singletonList(section);
}
}
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/PhosphoNetXModule.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/PhosphoNetXModule.java
index c464f889b3dc5c68ced7f5726eca3e90b2e5713a..43aa99520904b1c234249523590f7158e3a3264e 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/PhosphoNetXModule.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/PhosphoNetXModule.java
@@ -24,7 +24,7 @@ import java.util.List;
import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
@@ -82,10 +82,10 @@ public class PhosphoNetXModule implements IModule
callback.onSuccess(null);
}
- public Collection<? extends DisposableSectionPanel> getSections(
+ public Collection<? extends DisposableTabContent> getSections(
IEntityInformationHolderWithIdentifier entity)
{
- return new ArrayList<DisposableSectionPanel>();
+ return new ArrayList<DisposableTabContent>();
}
}
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSamplesSection.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSamplesSection.java
index e4e9abe027b195dc12f8178004024c22162e8792..80dfbb5f09aa22ff0415241807baa39dcc89c5fa 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSamplesSection.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSamplesSection.java
@@ -16,21 +16,21 @@
package ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.application;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.plugin.phosphonetx.client.web.client.IPhosphoNetXClientServiceAsync;
/**
- * {@link SingleSectionPanel} containing specified protein samples.
+ * {@link TabContent} containing specified protein samples.
*
* @author Piotr Buczek
*/
-public class ProteinSamplesSection extends DisposableSectionPanel
+public class ProteinSamplesSection extends DisposableTabContent
{
private static final String PREFIX = "protein-samples-section_";
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinViewer.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinViewer.java
index 3fa06465ca352fb1d90e1a1b388120ba60b3b0a9..f4199fcb74dd07f799e9fbb57889424ac89bece3 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinViewer.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinViewer.java
@@ -36,7 +36,7 @@ import com.extjs.gxt.ui.client.widget.layout.RowLayout;
import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.AbstractTabItemFactory;
@@ -230,8 +230,8 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl
BorderLayoutData layoutData = createBorderLayoutData(LayoutRegion.WEST);
layoutData.setSize(400);
add(propertyPanel, layoutData);
- DisposableSectionPanel sequencesSection =
- new DisposableSectionPanel(viewContext.getMessage(Dict.SEQUENCES), viewContext)
+ DisposableTabContent sequencesSection =
+ new DisposableTabContent(viewContext.getMessage(Dict.SEQUENCES), viewContext)
{
@Override
protected IDisposableComponent createDisposableContent()
@@ -241,8 +241,8 @@ public class ProteinViewer extends AbstractViewer<IEntityInformationHolder> impl
}
};
add(sequencesSection, createRightBorderLayoutData());
- DisposableSectionPanel proteinsSection =
- new DisposableSectionPanel(viewContext.getMessage(Dict.DATA_SET_PROTEINS),
+ DisposableTabContent proteinsSection =
+ new DisposableTabContent(viewContext.getMessage(Dict.DATA_SET_PROTEINS),
viewContext)
{
@Override
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningModule.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningModule.java
index cb9d26124beb4959953956050c503a3e142076cc..c91484c673569b84aff06a73947d94cca37feb99 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningModule.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningModule.java
@@ -25,7 +25,7 @@ import com.extjs.gxt.ui.client.widget.menu.MenuItem;
import com.google.gwt.user.client.rpc.AsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.plugin.IModule;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
@@ -64,10 +64,10 @@ public class ScreeningModule implements IModule
callback.onSuccess(null);
}
- public Collection<? extends SingleSectionPanel> getSections(
+ public Collection<? extends TabContent> getSections(
IEntityInformationHolderWithIdentifier entity)
{
- ArrayList<SingleSectionPanel> sections = new ArrayList<SingleSectionPanel>();
+ ArrayList<TabContent> sections = new ArrayList<TabContent>();
if (entity.getEntityKind() == EntityKind.EXPERIMENT)
{
sections.add(new ExperimentPlateLocationsSection(viewContext, entity));
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java
index 8880b03b5efbcaf99d39995837550d94214438ba..492bf1f5bcd630f127fe70a5ea5ef3554be96871 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentPlateLocationsSection.java
@@ -16,7 +16,7 @@ import com.google.gwt.i18n.client.DateTimeFormat;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.AbstractTabItemFactory;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DefaultTabItem;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DispatcherHelper;
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.D
*
* @author Tomasz Pylak
*/
-public class ExperimentPlateLocationsSection extends SingleSectionPanel
+public class ExperimentPlateLocationsSection extends TabContent
{
public static final String ID_SUFFIX = "ExperimentPlateLocationsSection";
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentWellMaterialsSection.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentWellMaterialsSection.java
index 22ac7a32658424973834ebd8d8b88c1094e4fdb7..6c481100b2142f4cb91977d03c454e62878e16ad 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentWellMaterialsSection.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/ExperimentWellMaterialsSection.java
@@ -1,6 +1,6 @@
package ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.detailviewers;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.DisposableTabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.IEntityInformationHolderWithIdentifier;
@@ -13,7 +13,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.D
*
* @author Piotr Buczek
*/
-public class ExperimentWellMaterialsSection extends DisposableSectionPanel
+public class ExperimentWellMaterialsSection extends DisposableTabContent
{
public static final String ID_SUFFIX = "ExperimentWellMaterialsSection";
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateDatasetViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateDatasetViewer.java
index 79cd350eaacfdb3e1b2d736e7b4c46192e97c38a..b007f1a93cde0bfb7666ed3d9941d01f04ca9551 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateDatasetViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateDatasetViewer.java
@@ -21,7 +21,7 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -60,9 +60,9 @@ public final class PlateDatasetViewer extends GenericDataSetViewer
}
@Override
- protected List<SingleSectionPanel> createAdditionalSectionPanels()
+ protected List<TabContent> createAdditionalSectionPanels()
{
- List<SingleSectionPanel> sections = new ArrayList<SingleSectionPanel>();
+ List<TabContent> sections = new ArrayList<TabContent>();
sections.add(new PlateLayoutDatasetSection(screeningViewContext, datasetId));
return sections;
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutDatasetSection.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutDatasetSection.java
index 4fe13bcdb1a8915c7277b22bd1e6e4f62c1904fd..0f69914dc8d5e5adcdb5012fa1f3955983a6a02a 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutDatasetSection.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutDatasetSection.java
@@ -24,7 +24,7 @@ import com.extjs.gxt.ui.client.widget.layout.RowLayout;
import com.google.gwt.user.client.rpc.AsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
@@ -38,7 +38,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateImages;
*
* @author Tomasz Pylak
*/
-public class PlateLayoutDatasetSection extends SingleSectionPanel
+public class PlateLayoutDatasetSection extends TabContent
{
public static final String ID_SUFFIX = "PlateLayoutDatasetSection";
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java
index 58acc82bfacd62eb1430712b7e599f8ff0d22165..e57fcc901cf1ba3538cc49c2fbf969999b522eb5 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLayoutSampleSection.java
@@ -30,7 +30,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Widget;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data.DataSetReportGenerator;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DisplayedOrSelectedDatasetCriteria;
@@ -48,7 +48,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ScreeningConst
*
* @author Tomasz Pylak
*/
-public class PlateLayoutSampleSection extends SingleSectionPanel
+public class PlateLayoutSampleSection extends TabContent
{
public static final String ID_SUFFIX = "PlateLayoutSection";
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialSection.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialSection.java
index 6e874303558164f53feb2878543bd42d70c0b0d6..e2dc5dea4eaefaa39d4fffefd3c92238b74ba24b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialSection.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialSection.java
@@ -1,7 +1,7 @@
package ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.detailviewers;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DisplayTypeIDGenerator;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -15,7 +15,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateMaterials
* @author Tomasz Pylak
* @author Izabela Adamczyk
*/
-class PlateLocationsMaterialSection extends SingleSectionPanel
+class PlateLocationsMaterialSection extends TabContent
{
private static final String ID_SUFFIX = "LocationsSection";
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialViewer.java
index c3cc6f3a301e6ce164b03b20b200f6ba6280ab7c..de98699a2d35527939237675a6a6f3d14286376d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateLocationsMaterialViewer.java
@@ -22,7 +22,7 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.help.HelpPageIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -75,10 +75,10 @@ public class PlateLocationsMaterialViewer extends GenericMaterialViewer
}
@Override
- protected List<SingleSectionPanel> createAdditionalSectionPanels()
+ protected List<TabContent> createAdditionalSectionPanels()
{
- List<SingleSectionPanel> sections = new ArrayList<SingleSectionPanel>();
+ List<TabContent> sections = new ArrayList<TabContent>();
sections.add(new PlateLocationsMaterialSection(screeningViewContext, materialId,
experimentCriteriaOrNull));
return sections;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java
index 858bb606d5401e3034f2ad29691bc468bf197685..2cba3cb5c8c6f713bff2f5b4ca6538085e9469a8 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/PlateSampleViewer.java
@@ -21,7 +21,7 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.SingleSectionPanel;
+import ch.systemsx.cisd.openbis.generic.client.web.client.application.TabContent;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.framework.DatabaseModificationAwareComponent;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
@@ -61,9 +61,9 @@ public final class PlateSampleViewer extends GenericSampleViewer
}
@Override
- protected List<SingleSectionPanel> createAdditionalSectionPanels()
+ protected List<TabContent> createAdditionalSectionPanels()
{
- List<SingleSectionPanel> sections = new ArrayList<SingleSectionPanel>();
+ List<TabContent> sections = new ArrayList<TabContent>();
sections.add(new PlateLayoutSampleSection(screeningViewContext, sampleId));
return sections;
}