* intermediate save

eclipse-aaspe · Mar 7, 2025 · 874c0fc · 874c0fc
1 parent fcc66f7
commit 874c0fc
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 43 deletions.
diff --git a/src/AasxCsharpLibrary/AdminShellPackageEnv.cs b/src/AasxCsharpLibrary/AdminShellPackageEnv.cs
@@ -199,51 +199,29 @@ public static AasCore.Aas3_0.Environment DeserializeXmlFromStreamWithCompat(Stre
             // nope!
             return null;
         }
-        // dead-csharp off
-        //public static JsonSerializer BuildDefaultAasxJsonSerializer()
-        //{
-        //    var serializer = new JsonSerializer();
-        //    serializer.Converters.Add(
-        //        new AdminShellConverters.JsonAasxConverter(
-        //            "modelType", "name"));
-        //    return serializer;
-        //}
+
         public static T DeserializeFromJSON<T>(string data) where T : IReferable
         {
-            //using (var tr = new StringReader(data))
-            //{
-            //var serializer = BuildDefaultAasxJsonSerializer();
-            //var rf = (T)serializer.Deserialize(tr, typeof(T));
-
             var node = System.Text.Json.Nodes.JsonNode.Parse(data);
             var rf = Jsonization.Deserialize.IReferableFrom(node);
 
             return (T)rf;
-            //}
         }
 
-        //public static T DeserializeFromJSON<T>(JToken obj) where T : IReferable
-        //{
-        //    if (obj == null)
-        //        return default(T);
-        //    var serializer = BuildDefaultAasxJsonSerializer();
-        //    var rf = obj.ToObject<T>(serializer);
-        //    return rf;
-        //}
-
-        ///// <summary>
-        ///// Use this, if <c>DeserializeFromJSON</c> is too tight.
-        ///// </summary>
-        //public static T DeserializePureObjectFromJSON<T>(string data)
-        //{
-        //    using (var tr = new StringReader(data))
-        //    {
-        //        //var serializer = BuildDefaultAasxJsonSerializer();
-        //        //var rf = (T)serializer.Deserialize(tr, typeof(T));
-        //        return null;
-        //    }
-        //}
-        // dead-csharp on
+        /// <summary>
+        /// Use this to deserialize flexible JSON "coming from the outside"
+        /// </summary>
+        public static T DeserializeAdaptiveFromJSON<T>(string jsonInput) where T : IClass
+        {
+            using (JsonTextReader reader = new JsonTextReader(new StringReader(jsonInput)))
+            {
+                JsonSerializer serializer = new JsonSerializer();
+                serializer.Converters.Add(new AdminShellConverters.AdaptiveAasIClassConverter(
+                AdminShellConverters.AdaptiveAasIClassConverter.ConversionMode.AasCore));
+                var res = serializer.Deserialize<T>(reader);
+                return res;
+            }
+        }
     }
 
     /// <summary>

diff --git a/src/AasxPackageLogic/DispEditHelperMiniModules.cs b/src/AasxPackageLogic/DispEditHelperMiniModules.cs
@@ -48,7 +48,15 @@ private bool PasteQualifierTextIntoExisting(
             string jsonInput,
             Aas.IQualifier qCurr)
         {
-            var qIn = JsonConvert.DeserializeObject<Aas.Qualifier>(jsonInput);
+            // var qIn = JsonConvert.DeserializeObject<Aas.Qualifier>(jsonInput);
+            var qIn = AdminShellSerializationHelper.DeserializeAdaptiveFromJSON<Aas.Qualifier>(jsonInput);
+
+            //JsonTextReader reader = new JsonTextReader(new StringReader(jsonInput));
+            //JsonSerializer serializer = new JsonSerializer();
+            //serializer.Converters.Add(new AdminShellConverters.AdaptiveAasIClassConverter(
+            //    AdminShellConverters.AdaptiveAasIClassConverter.ConversionMode.AasCore));
+            //var qIn = serializer.Deserialize<Aas.Qualifier>(reader);
+
             if (qCurr != null && qIn != null)
             {
                 qCurr.Type = qIn.Type;
@@ -317,8 +325,12 @@ public void QualifierHelper(
                                     }
                                     break;
                                 case 3:
-                                    var jsonStr = JsonConvert.SerializeObject(
-                                        qualifiers[storedI], Formatting.Indented);
+                                    var jsonStr = Aas.Jsonization.Serialize.ToJsonObject(qualifiers[storedI])
+                                            .ToJsonString(new System.Text.Json.JsonSerializerOptions()
+                                            {
+                                                WriteIndented = true
+                                            });
+
                                     this.context?.ClipboardSet(new AnyUiClipboardData(jsonStr));
                                     Log.Singleton.Info("Qualified serialized to clipboard.");
                                     break;
@@ -940,7 +952,7 @@ public void ExtensionHelper(
                             catch (Exception ex)
                             {
                                 Log.Singleton.Error(
-                                    ex, $"While show Qualifier presets ({pfn})");
+                                    ex, $"While show Extension presets ({pfn})");
                             }
                         }
 
@@ -1024,8 +1036,12 @@ public void ExtensionHelper(
                                     }
                                     break;
                                 case 3:
-                                    var jsonStr = JsonConvert.SerializeObject(
-                                        extensions[storedI], Formatting.Indented);
+                                    var jsonStr = Aas.Jsonization.Serialize.ToJsonObject(extensions[storedI])
+                                            .ToJsonString(new System.Text.Json.JsonSerializerOptions()
+                                            {
+                                                WriteIndented = true
+                                            });
+
                                     this.context?.ClipboardSet(new AnyUiClipboardData(jsonStr));
                                     Log.Singleton.Info("Extension serialized to clipboard.");
                                     break;