Changeset 17394 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs

Timestamp:

01/07/20 16:25:39 (4 years ago)

Author:

dpiringe

Message:

#3026:

• deleted: ConvertableAttribute, DummyConverter, ObjectExtensions
• renamed: CustomJsonWriter -> SingleLineArrayJsonWriter, JCInstantiator -> JsonTemplateInstantiator
• added: JsonItemConverterFactory, UnsupportedJsonItem
• IJsonItemConverter:
  • added two new properties: Priority and ConvertableType -> because converters are automatically collected by plugin infrastructure now
  • Extract, Inject references a root converter now -> typically an instance of JsonItemConverter -> to prevent cycles
• JsonItemConverter:
  • now implements the interface IJsonItemConverter
  • is now a dynamic class
  • is only instantiable with an factory (JsonItemConverterFactory)
  • still has the old (but now public) static methods Extract and Inject (without ref param IJsonItemConverter root) -> creates instance with factory and calls methods of instance
  • removed register and unregister methods, because the factory collects all converters automatically now (on first call of Create)
  • has cycle detection for Extract and Inject
  • renamed method Get to GetConverter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs

@@ -8 +8 @@
 namespace HeuristicLab.JsonInterface {
   public class ValueLookupParameterConverter : ParameterBaseConverter {
-    public override JsonItem ExtractData(IParameter value) {
-      IValueLookupParameter param = value.Cast<IValueLookupParameter>();
+    public override int Priority => 4;
+    public override Type ConvertableType => typeof(IValueLookupParameter);
+
+    public override void Populate(IParameter value, JsonItem item, IJsonItemConverter root) {
+      IValueLookupParameter param = value as IValueLookupParameter;
+      
+      item.Name = value.Name;
+      item.ActualName = param.ActualName;
+
       object actualValue = null;
       IEnumerable<object> actualRange = null;
       if(param.Value != null) {
-        JsonItem tmp = JsonItemConverter.Extract(param.Value);
+        JsonItem tmp = root.Extract(param.Value, root);
+        tmp.Parent = item;
         actualValue = tmp.Value;
         actualRange = tmp.Range;
@@ -19 +27 @@
         actualRange = new object[] { GetMinValue(param.DataType), GetMaxValue(param.DataType) };
       }
-
-      return new JsonItem() {
-        Name = value.Name,
-        ActualName = param.ActualName,
-        Value = actualValue,
-        Range = actualRange
-      };
+      item.Value = actualValue;
+      item.Range = actualRange;
     }
 
-    public override void InjectData(IParameter parameter, JsonItem data) {
-      IValueLookupParameter param = parameter.Cast<IValueLookupParameter>();
+    public override void InjectData(IParameter parameter, JsonItem data, IJsonItemConverter root) {
+      IValueLookupParameter param = parameter as IValueLookupParameter;
       param.ActualName = CastValue<string>(data.ActualName);
       if (param.Value != null)
-        JsonItemConverter.Inject(param.Value, data);
+        root.Inject(param.Value, data, root);
     }
   }