Changeset 17417 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

Timestamp:

02/03/20 15:13:35 (4 years ago)

Author:

dpiringe

Message:

#3026:

• added initial VM (ArrayValueVM) and control for array values (JsonItemArrayValueControl)
• new types of JsonItems for better type safety:
  • for arrays: DoubleArrayJsonItem, IntArrayJsonItem, BoolArrayJsonItem
  • for matrix: DoubleMatrixJsonItem, IntMatrixJsonItem, BoolMatrixJsonItem
• refactored ValueTypeArrayConverter and ValueTypeMatrixConverter -> better type safety with new JsonItems
• enhanced StringValueVM and implemented JsonItemValidValuesControl with MVVM architecture
• the VM of JsonItemBaseControl is now protected (was private)
• improved JsonItem<V,R> -> now handles JTokens correctly

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

@@ -68 +68 @@
     #region Helper
 
-    private static object GetValueFromJObject(JObject obj) {
-      object val = obj[nameof(IJsonItem.Value)]?.ToObject<object>();
-      if (val is JContainer jContainer) // for resolving array values
-        val = jContainer.ToObject<object[]>();
-
-      return val;
-    }
+    private static object GetValueFromJObject(JObject obj) =>
+      obj[nameof(IJsonItem.Value)]?.ToObject<object>();
 
     private static void CollectParameterizedItems(InstData instData) {