BIS-173 allow evaluation of script on other datasets than external

SVN: 26617

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:

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();
     }