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

Timestamp:

01/07/20 16:25:39 (5 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/ValueTypeValueConverter.cs (modified) (1 diff)

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

@@ -8 +8 @@
 
 namespace HeuristicLab.JsonInterface {
-  public class ValueTypeValueConverter<ValueType, T> : BaseConverter
+
+  public class IntValueConverter : ValueTypeValueConverter<IntValue, int> {
+    public override int Priority => 1;
+    public override Type ConvertableType => typeof(IntValue);
+  }
+
+  public class DoubleValueConverter : ValueTypeValueConverter<DoubleValue, double> {
+    public override int Priority => 1;
+    public override Type ConvertableType => typeof(DoubleValue);
+  }
+
+  public class PercentValueConverter : ValueTypeValueConverter<PercentValue, double> {
+    public override int Priority => 2;
+    public override Type ConvertableType => typeof(PercentValue);
+  }
+
+  public class BoolValueConverter : ValueTypeValueConverter<BoolValue, bool> {
+    public override int Priority => 1;
+    public override Type ConvertableType => typeof(BoolValue);
+  }
+
+  public class DateTimeValueConverter : ValueTypeValueConverter<DateTimeValue, DateTime> {
+    public override int Priority => 1;
+    public override Type ConvertableType => typeof(DateTimeValue);
+  }
+
+  public abstract class ValueTypeValueConverter<ValueType, T> : BaseConverter
     where ValueType : ValueTypeValue<T>
     where T : struct {
 
-    public override void InjectData(IItem item, JsonItem data) =>
-      item.Cast<ValueType>().Value = CastValue<T>(data.Value);
+    public override void InjectData(IItem item, JsonItem data, IJsonItemConverter root) =>
+      ((ValueType)item).Value = CastValue<T>(data.Value);
 
-    public override JsonItem ExtractData(IItem value) => 
-      new JsonItem() {
-        Name = "[OverridableParamName]",
-        Value = value.Cast<ValueType>().Value,
-        Range = new object[] { GetMinValue(typeof(T)), GetMaxValue(typeof(T)) }
-      };
+    public override void Populate(IItem value, JsonItem item, IJsonItemConverter root) {
+      item.Name = "[OverridableParamName]";
+      item.Value = ((ValueType)value).Value;
+      item.Range = new object[] { GetMinValue(typeof(T)), GetMaxValue(typeof(T)) };
+    }
   }
 }