From d2a398687b10046435e280bd38c0891c5dcc2eec Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Thu, 10 Sep 2009 19:10:28 +0000
Subject: [PATCH] fix: compile errors due to changed browser grid API
SVN: 12550
---
.../web/client/application/DataSetProteinGrid.java | 4 ++--
.../application/ProteinByExperimentBrowserGrid.java | 9 +++++----
.../web/client/application/ProteinSequenceGrid.java | 4 ++--
.../client/application/SampleAbundanceBrowserGrid.java | 4 ++--
4 files changed, 11 insertions(+), 10 deletions(-)
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 df1170fa4b5..f5f57c1d444 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 c11d8ebc18f..1ac810f23fc 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 7aeaf22e6be..d22e11aacdb 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 83a9df3cd3f..4b5f17e59fc 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;
--
GitLab