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

Timestamp:

02/01/21 14:37:18 (3 years ago)

Author:

dpiringe

Message:

#3026

• removed the option to set the value for JsonItems via exporter
  • reworked some base controls
  • added new controls for JsonItem specific properties (e.g. ArrayResizable)
  • deleted a lot of obsolet controls
• removed the Enable checkbox in the detail view of JsonItems
• exporter now clones the IOptimizer object
• added a check + message for unsupported exports
• list of JsonItems now includes unsupported JsonItems (disabled and marked with 'unsupported')
• refactored the converter type check
  • now every converter has to specify its supported type(s)

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (3 diffs)

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

@@ -1 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -66 +67 @@
       IJsonItem rootItem = Objects.First().Value;
 
-      //TODO validate
+      // validation
+      ValidationResult validationResult = rootItem.GetValidator().Validate();
+      if (!validationResult.Success)
+        throw validationResult.GenerateException();
 
       // inject configuration
@@ -105 +109 @@
         if (Objects.TryGetValue(path, out IJsonItem param)) {
           // remove fixed template parameter from config => dont allow to copy them from concrete config
+          // TODO: shift this into JsonItems?
           obj.Property(nameof(IIntervalRestrictedJsonItem<int>.Minimum))?.Remove();
           obj.Property(nameof(IIntervalRestrictedJsonItem<int>.Maximum))?.Remove();
           obj.Property(nameof(IConcreteRestrictedJsonItem<string>.ConcreteRestrictedItems))?.Remove();
+          obj.Property(nameof(IMatrixJsonItem.ColumnsResizable))?.Remove();
+          obj.Property(nameof(IMatrixJsonItem.RowsResizable))?.Remove();
+          obj.Property(nameof(IArrayJsonItem.Resizable))?.Remove();
           // merge
           param.SetJObject(obj);