From 821837bb8984ab62827978c26c8fbdd8fef67823 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 12 Sep 2012 14:53:51 +0000
Subject: [PATCH] BIS-173 allow evaluation of script on other datasets than
external
SVN: 26617
---
.../calculator/EntityAdaptorFactory.java | 4 ++--
.../dynamic_property/calculator/ExternalDataAdaptor.java | 9 +++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.java
index 31115fa241e..dfffa494409 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/EntityAdaptorFactory.java
@@ -18,8 +18,8 @@ package ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calc
import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.IDynamicPropertyEvaluator;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.api.IEntityAdaptor;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
-import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityInformationWithPropertiesHolder;
import ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
@@ -42,7 +42,7 @@ public class EntityAdaptorFactory
case EXPERIMENT:
return new ExperimentAdaptor((ExperimentPE) entity, evaluator);
case DATA_SET:
- return new ExternalDataAdaptor((ExternalDataPE) entity, evaluator);
+ return new ExternalDataAdaptor((DataPE) entity, evaluator);
case MATERIAL:
return new MaterialAdaptor((MaterialPE) entity, evaluator);
default:
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.java
index 56d3ac38d8f..1e4dc659b3b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/dynamic_property/calculator/ExternalDataAdaptor.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calc
import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.IDynamicPropertyEvaluator;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.dynamic_property.calculator.api.IEntityAdaptor;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
/**
@@ -27,21 +28,21 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
*/
public class ExternalDataAdaptor extends AbstractEntityAdaptor
{
- private final ExternalDataPE externalDataPE;
+ private final DataPE externalDataPE;
- public ExternalDataAdaptor(ExternalDataPE externalDataPE, IDynamicPropertyEvaluator evaluator)
+ public ExternalDataAdaptor(DataPE externalDataPE, IDynamicPropertyEvaluator evaluator)
{
super(externalDataPE.getCode());
initProperties(externalDataPE, evaluator);
this.externalDataPE = externalDataPE;
}
- public ExternalDataPE externalDataPE()
+ public DataPE externalDataPE()
{
return externalDataPE;
}
- public ExternalDataPE entityPE()
+ public DataPE entityPE()
{
return externalDataPE();
}
--
GitLab