From 87efaf5818bb3590fa9d15a466473c694f56eafd Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 11 Jan 2011 21:55:18 +0000
Subject: [PATCH] [LMS-1949] fixed evaluation of dynamic properties
SVN: 19375
---
.../cisd/openbis/generic/shared/basic/dto/ScriptType.java | 6 ------
.../plugin/generic/DynamicPropertiesEvaluationTest.java | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
index ed852a3dcca..d8829cee021 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ScriptType.java
@@ -37,10 +37,4 @@ public enum ScriptType implements ISerializable
return description;
}
- @Override
- // used when displayed in combo box
- public String toString()
- {
- return description;
- }
}
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
index 8812089f514..f26ae8521bc 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/plugin/generic/DynamicPropertiesEvaluationTest.java
@@ -57,7 +57,7 @@ public class DynamicPropertiesEvaluationTest extends GenericSystemTestCase
private static final String NEW_SAMPLE_IDENTIFIER = "/CISD/" + NEW_SAMPLE_CODE;
- private static long SLEEP_TIME = 10000; // 10s
+ private static long SLEEP_TIME = 5000; // 5s
private TechId createdSampleId = null;
--
GitLab