From 16c409063a82d6ad3c256988b0bb8eccc375fa03 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Tue, 26 Oct 2010 12:31:01 +0000
Subject: [PATCH] [LMS-1845] missing commit
SVN: 18445
---
.../java/ch/systemsx/cisd/common/evaluator/Evaluator.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java b/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java
index dbf7ab3e13e..f64c121c2f5 100644
--- a/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java
+++ b/common/source/java/ch/systemsx/cisd/common/evaluator/Evaluator.java
@@ -95,7 +95,7 @@ public final class Evaluator
public Evaluator(String expression, Class<?> supportFunctionsOrNull, String initialScriptOrNull)
throws EvaluatorException
{
- if (expression.indexOf('\n') >= 0)
+ if (isMultiline(expression))
{
throw new EvaluatorException("Expression '" + expression + "' contains line breaks");
}
@@ -316,4 +316,9 @@ public final class Evaluator
"Error evaluating '" + expression + "': " + description[description.length - 1];
return new EvaluatorException(msg);
}
+
+ public static boolean isMultiline(String expression)
+ {
+ return expression.indexOf('\n') >= 0;
+ }
}
--
GitLab