From 396f6fdcfbf7b4701d8828cf1654a4855ef1415e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 18 Oct 2012 10:36:12 +0000
Subject: [PATCH] SP-340, BIS-210: script function showRawValue renamed to
 showRawValueInForms

SVN: 27231
---
 .../ManagedPropertyEvaluator.java             | 15 +++++++-------
 ...tractEntityTypePropertyTypeTranslator.java |  2 +-
 .../ManagedPropertyEvaluatorTest.java         | 20 +++++++++----------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluator.java
index 748b6cf295c..a0d0e90eb28 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluator.java
@@ -90,9 +90,10 @@ public class ManagedPropertyEvaluator
     private static final String INPUT_WIDGETS_FUNCTION = "inputWidgets";
 
     /**
-     * The name of the function that returns <code>true</code> if the raw value should be shown.
+     * The name of the function that returns <code>true</code> if the raw value should be shown in
+     * forms.
      */
-    private static final String SHOW_RAW_VALUE_FUNCTION = "showRawValue";
+    private static final String SHOW_RAW_VALUE_FUNCTION = "showRawValueInForms";
 
     /**
      * The name of the function that expects a map of bindings.
@@ -111,7 +112,7 @@ public class ManagedPropertyEvaluator
 
     private final boolean updateFromBatchFunctionDefined;
 
-    private final Boolean showRawValue;
+    private final Boolean showRawValueInForms;
 
     private List<IManagedInputWidgetDescription> inputWidgetDescriptions;
 
@@ -122,7 +123,7 @@ public class ManagedPropertyEvaluator
         boolean batchColumnNamesFunctionDefined =
                 evaluator.hasFunction(BATCH_COLUMN_NAMES_FUNCTION);
         boolean inputWidgetsFunctionDefined = evaluator.hasFunction(INPUT_WIDGETS_FUNCTION);
-        showRawValue = evalFunctionShowRawValue();
+        showRawValueInForms = evalFunctionShowRawValue();
         checkCombinationsOfDefinedFunctions(batchColumnNamesFunctionDefined,
                 inputWidgetsFunctionDefined);
         columnNames = new ArrayList<String>();
@@ -185,7 +186,7 @@ public class ManagedPropertyEvaluator
 
     private boolean inputWidgetsAllowed()
     {
-        return showRawValue == null || showRawValue == false;
+        return showRawValueInForms == null || showRawValueInForms == false;
     }
 
     private void checkCombinationsOfDefinedFunctions(boolean batchColumnNamesFunctionDefined,
@@ -263,9 +264,9 @@ public class ManagedPropertyEvaluator
         evaluator.evalFunction(UPDATE_FROM_UI_FUNCTION, action);
     }
 
-    public Boolean getShowRawValue()
+    public Boolean getShowRawValueInForms()
     {
-        return showRawValue;
+        return showRawValueInForms;
     }
 
     public List<String> getBatchColumnNames()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.java
index e7b4d18c694..5dc552f8ec4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/translator/AbstractEntityTypePropertyTypeTranslator.java
@@ -102,7 +102,7 @@ abstract public class AbstractEntityTypePropertyTypeTranslator<ET extends Entity
         if (script != null && managed && shownInEditView)
         {
             ManagedPropertyEvaluator evaluator = new ManagedPropertyEvaluator(script.getScript());
-            result.setShowRawValue(evaluator.getShowRawValue());
+            result.setShowRawValue(evaluator.getShowRawValueInForms());
         }
         result.setScript(script);
         return result;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorTest.java
index 666aa968d7c..6dda73919e2 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/managed_property/ManagedPropertyEvaluatorTest.java
@@ -424,43 +424,43 @@ public class ManagedPropertyEvaluatorTest extends AssertJUnit
     }
 
     @Test
-    public void testGetShowRawValueForUndefinedShowRawValueFunction()
+    public void testGetShowRawValueInFormsForUndefinedShowRawValueFunction()
     {
         ManagedPropertyEvaluator evaluator = new ManagedPropertyEvaluator("");
 
-        assertEquals(null, evaluator.getShowRawValue());
+        assertEquals(null, evaluator.getShowRawValueInForms());
     }
 
     @Test
     public void testGetShowRawValueForDefinedShowRawValueFunctionWhichReturnsTrue()
     {
         ManagedPropertyEvaluator evaluator =
-                new ManagedPropertyEvaluator("def showRawValue():\n return True");
+                new ManagedPropertyEvaluator("def showRawValueInForms():\n return True");
 
-        assertEquals(Boolean.TRUE, evaluator.getShowRawValue());
+        assertEquals(Boolean.TRUE, evaluator.getShowRawValueInForms());
     }
 
     @Test
     public void testGetShowRawValueForDefinedShowRawValueFunctionWhichReturnsFalse()
     {
         ManagedPropertyEvaluator evaluator =
-                new ManagedPropertyEvaluator("def showRawValue():\n return False");
+                new ManagedPropertyEvaluator("def showRawValueInForms():\n return False");
 
-        assertEquals(Boolean.FALSE, evaluator.getShowRawValue());
+        assertEquals(Boolean.FALSE, evaluator.getShowRawValueInForms());
     }
 
-    @Test(expectedExceptionsMessageRegExp = "Function 'showRawValue' doesn't return "
+    @Test(expectedExceptionsMessageRegExp = "Function 'showRawValueInForms' doesn't return "
             + "a boolean values but an object of type 'java.lang.Integer'.", expectedExceptions = EvaluatorException.class)
     public void testShowRawValueFunctionWhichReturnsWrongTypeOfData()
     {
-        new ManagedPropertyEvaluator("def showRawValue():\n return 42");
+        new ManagedPropertyEvaluator("def showRawValueInForms():\n return 42");
     }
 
     @Test
     public void testEmptyInputWidgetsIfRawValueShouldBeShownButBatchColumnNamesDefined()
     {
         ManagedPropertyEvaluator evaluator =
-                new ManagedPropertyEvaluator("def showRawValue():\n return True\n"
+                new ManagedPropertyEvaluator("def showRawValueInForms():\n return True\n"
                         + "def batchColumnNames():\n return ['A']\n"
                         + "def updateFromBatchInput():\n  None");
 
@@ -473,7 +473,7 @@ public class ManagedPropertyEvaluatorTest extends AssertJUnit
     {
         ManagedPropertyEvaluator evaluator =
                 new ManagedPropertyEvaluator(
-                        "def showRawValue():\n return True\n"
+                        "def showRawValueInForms():\n return True\n"
                                 + "def inputWidgets():\n return [inputWidgetFactory().createTextInputField('A')]\n"
                                 + "def updateFromBatchInput():\n  None");
 
-- 
GitLab