From 55a9d5f79c1365a166c9f6b6ad9f46c1532c056f Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 14 Jan 2011 14:53:47 +0000
Subject: [PATCH] [LMS-1949] small dependency reduction
SVN: 19432
---
.../bo/managed_property/ManagedPropertyEvaluator.java | 10 ++++------
.../ManagedPropertyEvaluatorFactory.java | 5 ++---
.../shared/translator/PropertyTranslatorUtils.java | 2 +-
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluator.java
index 196e5ff4cbc..978547149a4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluator.java
@@ -22,7 +22,6 @@ import ch.systemsx.cisd.common.evaluator.Evaluator;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ManagedEntityProperty;
-import ch.systemsx.cisd.openbis.generic.shared.dto.ScriptPE;
import ch.systemsx.cisd.openbis.generic.shared.util.SimpleTableModelBuilder;
/**
@@ -36,7 +35,7 @@ public class ManagedPropertyEvaluator
private static final Logger operationLog = LogFactory.getLogger(LogCategory.OPERATION,
ManagedPropertyEvaluator.class);
- private final ScriptPE scriptPE;
+ private final String scriptExpression;
/**
* The name of the script that expects the property to be there and updates it.
@@ -45,9 +44,9 @@ public class ManagedPropertyEvaluator
private static final String PROPERTY_VARIABLE_NAME = "property";
- public ManagedPropertyEvaluator(ScriptPE scriptPE)
+ public ManagedPropertyEvaluator(String scriptExpression)
{
- this.scriptPE = scriptPE;
+ this.scriptExpression = scriptExpression;
}
public void evalConfigureProperty(ManagedEntityProperty managedProperty)
@@ -58,8 +57,7 @@ public class ManagedPropertyEvaluator
}
Evaluator evaluator =
- new Evaluator(CONFIGURE_OUTPUT_EXPRESSION, ScriptUtilityFactory.class,
- scriptPE.getScript());
+ new Evaluator(CONFIGURE_OUTPUT_EXPRESSION, ScriptUtilityFactory.class, scriptExpression);
evaluator.set(PROPERTY_VARIABLE_NAME, managedProperty);
evaluator.eval();
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluatorFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluatorFactory.java
index 5ae50da4b36..36f590b3c40 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluatorFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/managed_property/ManagedPropertyEvaluatorFactory.java
@@ -16,7 +16,6 @@
package ch.systemsx.cisd.openbis.generic.server.business.bo.managed_property;
-import ch.systemsx.cisd.openbis.generic.shared.dto.ScriptPE;
/**
* Factory for creating managed property evaluators. (Could do some caching or other cleverness.)
@@ -25,8 +24,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.ScriptPE;
*/
public class ManagedPropertyEvaluatorFactory
{
- public static ManagedPropertyEvaluator createManagedPropertyEvaluator(ScriptPE scriptPE)
+ public static ManagedPropertyEvaluator createManagedPropertyEvaluator(String scriptExpression)
{
- return new ManagedPropertyEvaluator(scriptPE);
+ return new ManagedPropertyEvaluator(scriptExpression);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.java
index 6e1f64ae34e..8186cab06d7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/PropertyTranslatorUtils.java
@@ -82,7 +82,7 @@ final class PropertyTranslatorUtils
assert script != null && script.getScriptType() == ScriptType.MANAGED_PROPERTY;
final ManagedEntityProperty result = new ManagedEntityProperty(basicProperty);
ManagedPropertyEvaluator evaluator =
- ManagedPropertyEvaluatorFactory.createManagedPropertyEvaluator(script);
+ ManagedPropertyEvaluatorFactory.createManagedPropertyEvaluator(script.getScript());
evaluator.evalConfigureProperty(result);
return result;
}
--
GitLab