From 980ff412a01822a58b478766c9038aea0b803b55 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 29 Mar 2011 09:57:02 +0000
Subject: [PATCH] forgotten code
SVN: 20530
---
.../client/web/client/application/ExperimentViewer.java | 2 +-
.../phosphonetx/client/web/server/RawDataSampleProvider.java | 2 +-
.../client/web/server/resultset/BiologicalSampleProvider.java | 2 +-
.../client/web/server/resultset/DataSetProteinProvider.java | 2 +-
.../server/resultset/ParentlessMsInjectionSampleProvider.java | 2 +-
.../client/web/server/resultset/ProteinSequenceProvider.java | 2 +-
.../client/web/server/resultset/ProteinSummaryProvider.java | 2 +-
.../web/server/resultset/ProteinSequenceProviderTest.java | 2 +-
.../client/web/server/resultset/ProteinSummaryProviderTest.java | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
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 fcd36620500..bfde97a096b 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
@@ -101,7 +101,7 @@ public class ExperimentViewer extends GenericExperimentViewer
@Override
protected Component tryCreateLowerLeftComponent()
{
- if (viewContext.isSimpleMode())
+ if (viewContext.isSimpleOrEmbeddedMode())
{
return null; // no processing in simple view mode
}
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java
index 25bc49a4740..988402c7401 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/RawDataSampleProvider.java
@@ -48,7 +48,7 @@ class RawDataSampleProvider extends AbstractTableModelProvider<Sample>
}
@Override
- public TypedTableModel<Sample> createTableModel(int maxSize)
+ public TypedTableModel<Sample> createTableModel()
{
List<MsInjectionSample> samples = service.listRawDataSamples(sessionToken);
TypedTableModelBuilder<Sample> builder = new TypedTableModelBuilder<Sample>();
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java
index 9928c97cf7f..5086c140305 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/BiologicalSampleProvider.java
@@ -50,7 +50,7 @@ public class BiologicalSampleProvider extends AbstractCommonTableModelProvider<S
}
@Override
- protected TypedTableModel<Sample> createTableModel(int maxSize)
+ protected TypedTableModel<Sample> createTableModel()
{
DetailedSearchCriteria criteria = new DetailedSearchCriteria();
criteria.setConnection(SearchCriteriaConnection.MATCH_ALL);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java
index 2520b00ae5b..a010b147b0c 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/DataSetProteinProvider.java
@@ -56,7 +56,7 @@ public class DataSetProteinProvider extends AbstractTableModelProvider<DataSetPr
}
@Override
- protected TypedTableModel<DataSetProtein> createTableModel(int maxSize)
+ protected TypedTableModel<DataSetProtein> createTableModel()
{
List<DataSetProtein> proteins =
server.listProteinsByExperimentAndReference(sessionToken, experimentID,
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java
index a4be66e7a87..0d7a9300137 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ParentlessMsInjectionSampleProvider.java
@@ -49,7 +49,7 @@ public class ParentlessMsInjectionSampleProvider extends AbstractCommonTableMode
}
@Override
- protected TypedTableModel<Sample> createTableModel(int maxSize)
+ protected TypedTableModel<Sample> createTableModel()
{
DetailedSearchCriteria criteria = new DetailedSearchCriteria();
criteria.setConnection(SearchCriteriaConnection.MATCH_ALL);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java
index 8ff0de653fc..db3a10c0b53 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProvider.java
@@ -49,7 +49,7 @@ public class ProteinSequenceProvider extends AbstractTableModelProvider<ProteinS
}
@Override
- protected TypedTableModel<ProteinSequence> createTableModel(int maxSize)
+ protected TypedTableModel<ProteinSequence> createTableModel()
{
List<ProteinSequence> sequences =
server.listProteinSequencesByProteinReference(sessionToken, proteinReferenceID);
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java
index fdb42de4def..8ad34751b8b 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProvider.java
@@ -49,7 +49,7 @@ public class ProteinSummaryProvider extends AbstractTableModelProvider<ProteinSu
}
@Override
- protected TypedTableModel<ProteinSummary> createTableModel(int maxSize)
+ protected TypedTableModel<ProteinSummary> createTableModel()
{
List<ProteinSummary> sumaries = server.listProteinSummariesByExperiment(sessionToken, experimentID);
TypedTableModelBuilder<ProteinSummary> builder = new TypedTableModelBuilder<ProteinSummary>();
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java
index 85c89b76957..0ba283891da 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSequenceProviderTest.java
@@ -52,7 +52,7 @@ public class ProteinSequenceProviderTest extends AbstractProviderTest
ProteinSequenceProvider provider =
new ProteinSequenceProvider(phosphonetxServer, SESSION_TOKEN, new TechId(42));
- TypedTableModel<ProteinSequence> model = provider.createTableModel(Integer.MAX_VALUE);
+ TypedTableModel<ProteinSequence> model = provider.createTableModel();
assertEquals("[SEQUENCE_SHORT_NAME, DATABASE_NAME_AND_VERSION, SEQUENCE]", getHeaderIDs(model).toString());
assertEquals("[VARCHAR, VARCHAR, VARCHAR]", getHeaderDataTypes(model).toString());
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java
index e98a8c3b3ea..8d33570902f 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/phosphonetx/client/web/server/resultset/ProteinSummaryProviderTest.java
@@ -51,7 +51,7 @@ public class ProteinSummaryProviderTest extends AbstractProviderTest
ProteinSummaryProvider provider =
new ProteinSummaryProvider(phosphonetxServer, SESSION_TOKEN, new TechId(12));
- TypedTableModel<ProteinSummary> model = provider.createTableModel(Integer.MAX_VALUE);
+ TypedTableModel<ProteinSummary> model = provider.createTableModel();
assertEquals("[FDR, PROTEIN_COUNT, PEPTIDE_COUNT]", getHeaderIDs(model).toString());
assertEquals("[REAL, INTEGER, INTEGER]", getHeaderDataTypes(model).toString());
--
GitLab