From f6dfe0ac1331f6c515d95b139c2b12df606b8762 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 25 Oct 2012 14:51:23 +0000
Subject: [PATCH] Undefined function showRawValueInForms is equivalent as
 function would return False.

SVN: 27373
---
 .../shared/basic/dto/EntityTypePropertyType.java       |  6 +++---
 .../managed_property/ManagedPropertyEvaluator.java     | 10 +++++-----
 .../application/experiment/PropertiesEditor.java       |  6 +++---
 .../managed_property/ManagedPropertyEvaluatorTest.java |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
index 9245476b39f..ac8164625e2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/EntityTypePropertyType.java
@@ -48,7 +48,7 @@ public abstract class EntityTypePropertyType<T extends EntityType> implements Se
 
     private boolean showInEditView;
 
-    private Boolean showRawValue;
+    private boolean showRawValue;
 
     private Script script;
 
@@ -133,12 +133,12 @@ public abstract class EntityTypePropertyType<T extends EntityType> implements Se
         this.showInEditView = showInEditView;
     }
 
-    public Boolean getShowRawValue()
+    public boolean getShowRawValue()
     {
         return showRawValue;
     }
 
-    public void setShowRawValue(Boolean showRawValue)
+    public void setShowRawValue(boolean showRawValue)
     {
         this.showRawValue = showRawValue;
     }
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 a0d0e90eb28..8853ad218b1 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
@@ -112,7 +112,7 @@ public class ManagedPropertyEvaluator
 
     private final boolean updateFromBatchFunctionDefined;
 
-    private final Boolean showRawValueInForms;
+    private final boolean showRawValueInForms;
 
     private List<IManagedInputWidgetDescription> inputWidgetDescriptions;
 
@@ -186,7 +186,7 @@ public class ManagedPropertyEvaluator
 
     private boolean inputWidgetsAllowed()
     {
-        return showRawValueInForms == null || showRawValueInForms == false;
+        return showRawValueInForms == false;
     }
 
     private void checkCombinationsOfDefinedFunctions(boolean batchColumnNamesFunctionDefined,
@@ -208,12 +208,12 @@ public class ManagedPropertyEvaluator
         }
     }
 
-    private Boolean evalFunctionShowRawValue()
+    private boolean evalFunctionShowRawValue()
     {
         boolean showRawValueFunctionDefined = evaluator.hasFunction(SHOW_RAW_VALUE_FUNCTION);
         if (showRawValueFunctionDefined == false)
         {
-            return null;
+            return false;
         }
         Object result = evaluator.evalFunction(SHOW_RAW_VALUE_FUNCTION);
         if (result instanceof Boolean == false)
@@ -264,7 +264,7 @@ public class ManagedPropertyEvaluator
         evaluator.evalFunction(UPDATE_FROM_UI_FUNCTION, action);
     }
 
-    public Boolean getShowRawValueInForms()
+    public boolean getShowRawValueInForms()
     {
         return showRawValueInForms;
     }
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
index aee95e6fb16..0f6e4afd89e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
@@ -348,12 +348,12 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
         {
             return true;
         }
-        Boolean showRawValue = etpt.getShowRawValue();
+        boolean showRawValue = etpt.getShowRawValue();
         if (editForm)
         {
-            return showRawValue == null || showRawValue;
+            return showRawValue;
         }
-        return showRawValue == null || showRawValue || hasInputWidgets(etpt);
+        return showRawValue || hasInputWidgets(etpt);
     }
 
 }
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 6dda73919e2..7ebf6f83117 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
@@ -428,7 +428,7 @@ public class ManagedPropertyEvaluatorTest extends AssertJUnit
     {
         ManagedPropertyEvaluator evaluator = new ManagedPropertyEvaluator("");
 
-        assertEquals(null, evaluator.getShowRawValueInForms());
+        assertEquals(false, evaluator.getShowRawValueInForms());
     }
 
     @Test
@@ -437,7 +437,7 @@ public class ManagedPropertyEvaluatorTest extends AssertJUnit
         ManagedPropertyEvaluator evaluator =
                 new ManagedPropertyEvaluator("def showRawValueInForms():\n return True");
 
-        assertEquals(Boolean.TRUE, evaluator.getShowRawValueInForms());
+        assertEquals(true, evaluator.getShowRawValueInForms());
     }
 
     @Test
@@ -446,7 +446,7 @@ public class ManagedPropertyEvaluatorTest extends AssertJUnit
         ManagedPropertyEvaluator evaluator =
                 new ManagedPropertyEvaluator("def showRawValueInForms():\n return False");
 
-        assertEquals(Boolean.FALSE, evaluator.getShowRawValueInForms());
+        assertEquals(false, evaluator.getShowRawValueInForms());
     }
 
     @Test(expectedExceptionsMessageRegExp = "Function 'showRawValueInForms' doesn't return "
-- 
GitLab