From 7235ddb3ec27f02c99ed7d5bee9583abfc44b49c Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 19 Oct 2010 12:58:51 +0000
Subject: [PATCH] [LMS-1818] fixed dependencies
SVN: 18354
---
.../DefaultDynamicPropertyEvaluator.java | 6 +++---
.../DynamicPropertyEvaluationOperation.java | 17 +++++++++++++++++
.../calculator}/AbstractEntityAdaptor.java | 2 +-
.../calculator}/BasicPropertyAdaptor.java | 2 +-
.../calculator/DynamicPropertyCalculator.java | 4 ++--
.../calculator}/EntityAdaptorFactory.java | 2 +-
.../calculator}/ExperimentAdaptor.java | 2 +-
.../calculator}/ExternalDataAdaptor.java | 2 +-
.../calculator}/IEntityAdaptor.java | 2 +-
.../calculator}/IEntityPropertyAdaptor.java | 2 +-
.../calculator}/MaterialAdaptor.java | 2 +-
.../calculator}/SampleAdaptor.java | 2 +-
.../DynamicPropertyCalculatorTest.java | 7 +++++--
13 files changed, 36 insertions(+), 16 deletions(-)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/AbstractEntityAdaptor.java (96%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/BasicPropertyAdaptor.java (94%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server => server/dataaccess/db/dynamic_property}/calculator/DynamicPropertyCalculator.java (90%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/EntityAdaptorFactory.java (95%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/ExperimentAdaptor.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/ExternalDataAdaptor.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/IEntityAdaptor.java (93%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/IEntityPropertyAdaptor.java (90%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/MaterialAdaptor.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/SampleAdaptor.java (92%)
rename openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/{client/web/server/calculator/property => server/dataaccess/db/dynamic_property/calculator}/DynamicPropertyCalculatorTest.java (85%)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultDynamicPropertyEvaluator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultDynamicPropertyEvaluator.java
index d49457c2eab..cb7299baaba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultDynamicPropertyEvaluator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DefaultDynamicPropertyEvaluator.java
@@ -29,11 +29,11 @@ import org.springframework.dao.DataAccessException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
-import ch.systemsx.cisd.openbis.generic.client.web.server.calculator.DynamicPropertyCalculator;
-import ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property.EntityAdaptorFactory;
-import ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property.IEntityAdaptor;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPropertyValueValidator;
import ch.systemsx.cisd.openbis.generic.server.dataaccess.PropertyValidator;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator.DynamicPropertyCalculator;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator.EntityAdaptorFactory;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator.IEntityAdaptor;
import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityTypePropertyTypePE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationOperation.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationOperation.java
index f6a9dd8dcb2..e91cbcf9db9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationOperation.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/DynamicPropertyEvaluationOperation.java
@@ -20,6 +20,7 @@ import java.io.Serializable;
import java.util.List;
import ch.systemsx.cisd.common.collections.CollectionUtils;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Code;
import ch.systemsx.cisd.openbis.generic.shared.dto.IEntityInformationWithPropertiesHolder;
/**
@@ -72,4 +73,20 @@ public class DynamicPropertyEvaluationOperation implements Serializable
return className + ": " + (ids == null ? "all" : CollectionUtils.abbreviate(ids, 10));
}
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof Code<?> == false)
+ {
+ return false;
+ }
+ final DynamicPropertyEvaluationOperation that = (DynamicPropertyEvaluationOperation) obj;
+ return this.getClassName().equals(that.getClassName());
+ // TODO
+ }
+
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/AbstractEntityAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/AbstractEntityAdaptor.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/AbstractEntityAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/AbstractEntityAdaptor.java
index 827d6a500f9..28392e985a0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/AbstractEntityAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/AbstractEntityAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import java.util.Collection;
import java.util.HashMap;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/BasicPropertyAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/BasicPropertyAdaptor.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/BasicPropertyAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/BasicPropertyAdaptor.java
index 11dbb9451b8..9f3b24fe1df 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/BasicPropertyAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/BasicPropertyAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import ch.systemsx.cisd.openbis.generic.shared.dto.EntityPropertyPE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/DynamicPropertyCalculator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/DynamicPropertyCalculator.java
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/DynamicPropertyCalculator.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/DynamicPropertyCalculator.java
index cce5c5f9d5f..c9b19288b3a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/DynamicPropertyCalculator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/DynamicPropertyCalculator.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import ch.systemsx.cisd.common.evaluator.Evaluator;
-import ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property.IEntityAdaptor;
+import ch.systemsx.cisd.openbis.generic.client.web.server.calculator.AbstractCalculator;
/**
* @author Piotr Buczek
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/EntityAdaptorFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/EntityAdaptorFactory.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/EntityAdaptorFactory.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/EntityAdaptorFactory.java
index 0c64d9935dd..48eaf2b70a4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/EntityAdaptorFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/EntityAdaptorFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/ExperimentAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/ExperimentAdaptor.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/ExperimentAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/ExperimentAdaptor.java
index 2e39019591e..741b73f60ef 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/ExperimentAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/ExperimentAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/ExternalDataAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/ExternalDataAdaptor.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/ExternalDataAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/ExternalDataAdaptor.java
index 136315769d6..ba7f56ccc11 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/ExternalDataAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/ExternalDataAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import ch.systemsx.cisd.openbis.generic.shared.dto.ExternalDataPE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/IEntityAdaptor.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/IEntityAdaptor.java
index 314646f339f..aa5f2ad5262 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/IEntityAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import java.util.Collection;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityPropertyAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/IEntityPropertyAdaptor.java
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityPropertyAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/IEntityPropertyAdaptor.java
index 3d2202c30bc..3d72e0ea6e0 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/IEntityPropertyAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/IEntityPropertyAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
/**
* Interface implemented by all entity properties
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/MaterialAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/MaterialAdaptor.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/MaterialAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/MaterialAdaptor.java
index 2bc0ea95a27..6af8b6d3660 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/MaterialAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/MaterialAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import ch.systemsx.cisd.openbis.generic.shared.dto.MaterialPE;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/SampleAdaptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/SampleAdaptor.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/SampleAdaptor.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/SampleAdaptor.java
index e98da322ac3..0a37b93cea2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/SampleAdaptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/SampleAdaptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import ch.systemsx.cisd.openbis.generic.shared.dto.SamplePE;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/DynamicPropertyCalculatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
similarity index 85%
rename from openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/DynamicPropertyCalculatorTest.java
rename to openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
index b3fd8a565be..6943617f60e 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/calculator/property/DynamicPropertyCalculatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/dynamic_property/calculator/DynamicPropertyCalculatorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.generic.client.web.server.calculator.property;
+package ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator;
import java.util.Arrays;
import java.util.Collection;
@@ -22,7 +22,10 @@ import java.util.Collection;
import org.testng.AssertJUnit;
import org.testng.annotations.Test;
-import ch.systemsx.cisd.openbis.generic.client.web.server.calculator.DynamicPropertyCalculator;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator.AbstractEntityAdaptor;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator.DynamicPropertyCalculator;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator.IEntityAdaptor;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.dynamic_property.calculator.IEntityPropertyAdaptor;
/**
* @author Piotr Buczek
--
GitLab