diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/DataSetProteinGrid.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/DataSetProteinGrid.java index df1170fa4b5f49f17f9161383e90354494646cbe..f5f57c1d444e436d9bc6b5b558c9ee93669d0396 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/DataSetProteinGrid.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/DataSetProteinGrid.java @@ -69,7 +69,8 @@ class DataSetProteinGrid extends AbstractSimpleBrowserGrid<DataSetProtein> { super(viewContext.getCommonViewContext(), BROWSER_ID + createWidgetID(experimentOrNull, proteinReferenceID), GRID_ID - + createWidgetID(experimentOrNull, proteinReferenceID), true); + + createWidgetID(experimentOrNull, proteinReferenceID), true, + PhosphoNetXDisplayTypeIDGenerator.DATA_SET_PROTEIN_BROWSER_GRID); specificViewContext = viewContext; criteria = new ListProteinByExperimentAndReferenceCriteria(); if (experimentOrNull != null) @@ -77,7 +78,6 @@ class DataSetProteinGrid extends AbstractSimpleBrowserGrid<DataSetProtein> criteria.setExperimentID(new TechId(experimentOrNull.getId())); } criteria.setProteinReferenceID(proteinReferenceID); - setDisplayTypeIDGenerator(PhosphoNetXDisplayTypeIDGenerator.DATA_SET_PROTEIN_BROWSER_GRID); } @Override diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java index c11d8ebc18f095410d82444da578675eba5fd977..1ac810f23fc96c94324540ae84631b50525c04bc 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinByExperimentBrowserGrid.java @@ -80,11 +80,11 @@ class ProteinByExperimentBrowserGrid extends AbstractSimpleBrowserGrid<ProteinIn private ProteinByExperimentBrowserGrid( final IViewContext<IPhosphoNetXClientServiceAsync> viewContext) { - super(viewContext.getCommonViewContext(), BROWSER_ID, GRID_ID, false); + super(viewContext.getCommonViewContext(), BROWSER_ID, GRID_ID, false, + PhosphoNetXDisplayTypeIDGenerator.PROTEIN_BY_EXPERIMENT_BROWSER_GRID); specificViewContext = viewContext; toolbar = new ProteinByExperimentBrowerToolBar(viewContext); toolbar.setBrowserGrid(this); - setDisplayTypeIDGenerator(PhosphoNetXDisplayTypeIDGenerator.PROTEIN_BY_EXPERIMENT_BROWSER_GRID); registerLinkClickListenerFor(ProteinColDefKind.ACCESSION_NUMBER.id(), new ICellListener<ProteinInfo>() { @@ -109,7 +109,7 @@ class ProteinByExperimentBrowserGrid extends AbstractSimpleBrowserGrid<ProteinIn abundanceColumnDefinitions = definitions; refresh(null, true); } - + @Override protected IColumnDefinitionKind<ProteinInfo>[] getStaticColumnsDefinition() { @@ -120,7 +120,8 @@ class ProteinByExperimentBrowserGrid extends AbstractSimpleBrowserGrid<ProteinIn protected ColumnDefsAndConfigs<ProteinInfo> createColumnsDefinition() { ColumnDefsAndConfigs<ProteinInfo> definitions = super.createColumnsDefinition(); - List<IColumnDefinitionUI<ProteinInfo>> columns = new ArrayList<IColumnDefinitionUI<ProteinInfo>>(); + List<IColumnDefinitionUI<ProteinInfo>> columns = + new ArrayList<IColumnDefinitionUI<ProteinInfo>>(); for (AbundanceColumnDefinition definition : abundanceColumnDefinitions) { String header = definition.getSampleCode(); diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSequenceGrid.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSequenceGrid.java index 7aeaf22e6be4003b326eeadd3507a64cf0f474e6..d22e11aacdb1a8a8c09073b0347c6c04c909310c 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSequenceGrid.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/ProteinSequenceGrid.java @@ -61,11 +61,11 @@ public class ProteinSequenceGrid extends AbstractSimpleBrowserGrid<ProteinSequen TechId proteinReferenceID) { super(viewContext.getCommonViewContext(), BROWSER_ID + proteinReferenceID, GRID_ID - + proteinReferenceID, true); + + proteinReferenceID, true, + PhosphoNetXDisplayTypeIDGenerator.PROTEIN_SEQUENCE_BROWSER_GRID); specificViewContext = viewContext; criteria = new ListProteinSequenceCriteria(); criteria.setProteinReferenceID(proteinReferenceID); - setDisplayTypeIDGenerator(PhosphoNetXDisplayTypeIDGenerator.PROTEIN_SEQUENCE_BROWSER_GRID); } @Override diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/SampleAbundanceBrowserGrid.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/SampleAbundanceBrowserGrid.java index 83a9df3cd3f43cf86a10463dd575b8dc7059850e..4b5f17e59fc135930fc54d5edaf77eeed7d6a52f 100644 --- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/SampleAbundanceBrowserGrid.java +++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/client/application/SampleAbundanceBrowserGrid.java @@ -103,7 +103,6 @@ public class SampleAbundanceBrowserGrid new SampleAbundanceBrowserGrid(viewContext, criteriaProvider, gridId, false, refreshAutomatically); browserGrid.updateCriteriaProviderAndRefresh(); - browserGrid.setDisplayTypeIDGenerator(DisplayTypeIDGenerator.SAMPLE_DETAILS_GRID); browserGrid.extendBottomToolbar(); return browserGrid.asDisposableWithoutToolbar(); } @@ -180,7 +179,8 @@ public class SampleAbundanceBrowserGrid ISampleAbundanceCriteriaProvider criteriaProvider, String gridId, boolean showHeader, boolean refreshAutomatically) { - super(viewContext.getCommonViewContext(), gridId, showHeader, refreshAutomatically); + super(viewContext.getCommonViewContext(), gridId, showHeader, refreshAutomatically, + DisplayTypeIDGenerator.SAMPLE_DETAILS_GRID); this.phosphoViewContext = viewContext; this.propertyTypesAndCriteriaProvider = criteriaProvider; this.previousPropertyTypes = null;