From fd1a784657f48aeec5feda372ee2246dad84a153 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Thu, 10 Feb 2011 09:49:13 +0000
Subject: [PATCH] minor: rename "experiment" to "experimentOrNull"
SVN: 19863
---
.../ExperimentPlateLocationsSection.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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 582d35a2556..395f1cd9691 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
@@ -42,7 +42,7 @@ public class ExperimentPlateLocationsSection extends TabContent
private final IViewContext<IScreeningClientServiceAsync> screeningViewContext;
- private final IEntityInformationHolderWithIdentifier experiment;
+ private final IEntityInformationHolderWithIdentifier experimentOrNull;
private final MultilineItemsField materialListField;
@@ -80,7 +80,7 @@ public class ExperimentPlateLocationsSection extends TabContent
super(getTabTitle(screeningViewContext),
screeningViewContext, experimentOrNull);
this.screeningViewContext = screeningViewContext;
- this.experiment = experimentOrNull;
+ this.experimentOrNull = experimentOrNull;
this.materialListField = createMaterialListArea();
this.exactMatchOnly =
new CheckBoxField(screeningViewContext.getMessage(Dict.EXACT_MATCH_ONLY), false);
@@ -143,7 +143,7 @@ public class ExperimentPlateLocationsSection extends TabContent
{
return null;
}
- String experimentPermId = (experiment != null) ? experiment.getPermId() : null;
+ String experimentPermId = (experimentOrNull != null) ? experimentOrNull.getPermId() : null;
return ScreeningLinkExtractor.createWellsSearchLink(experimentPermId,
materialCriteria);
}
@@ -165,12 +165,12 @@ public class ExperimentPlateLocationsSection extends TabContent
private ExperimentSearchCriteria getExperimentSearchCriteria()
{
- if (experiment == null)
+ if (experimentOrNull == null)
{
return ExperimentSearchCriteria.createAllExperiments();
}
- return ExperimentSearchCriteria.createExperiment(experiment.getId(),
- experiment.getPermId(), experiment.getIdentifier());
+ return ExperimentSearchCriteria.createExperiment(experimentOrNull.getId(),
+ experimentOrNull.getPermId(), experimentOrNull.getIdentifier());
}
private MaterialSearchCodesCriteria tryGetMaterialSearchCriteria()
--
GitLab