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 582d35a2556612adcafb7819adb6b7c3a5d5e4d1..395f1cd96911e3dd88406e13a870fac8fe64325b 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()