* copy/ paste seem to work

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

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/src/AasxCsharpLibrary/AdminShellPackageEnv.cs b/src/AasxCsharpLibrary/AdminShellPackageEnv.cs
@@ -209,18 +209,26 @@ public static T DeserializeFromJSON<T>(string data) where T : IReferable
         }
 
         /// <summary>
-        /// Use this to deserialize flexible JSON "coming from the outside"
+        /// Use this (new!) 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)))
+            try
             {
-                JsonSerializer serializer = new JsonSerializer();
-                serializer.Converters.Add(new AdminShellConverters.AdaptiveAasIClassConverter(
-                AdminShellConverters.AdaptiveAasIClassConverter.ConversionMode.AasCore));
-                var res = serializer.Deserialize<T>(reader);
-                return res;
+                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;
+                }
+            }
+            catch (Exception ex)
+            {
+                LogInternally.That.CompletelyIgnoredError(ex);
             }
+            return default(T);
         }
     }
 

diff --git a/src/AasxPackageLogic/DispEditHelperMiniModules.cs b/src/AasxPackageLogic/DispEditHelperMiniModules.cs
@@ -48,15 +48,7 @@ private bool PasteQualifierTextIntoExisting(
             string jsonInput,
             Aas.IQualifier qCurr)
         {
-            // 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;
@@ -832,7 +824,7 @@ private bool PasteExtensionTextIntoExisting(
             string jsonInput,
             Aas.IExtension qCurr)
         {
-            var qIn = JsonConvert.DeserializeObject<Aas.Extension>(jsonInput);
+            var qIn = AdminShellSerializationHelper.DeserializeAdaptiveFromJSON<Aas.Extension>(jsonInput);
             if (qCurr != null && qIn != null)
             {
                 qCurr.Name = qIn.Name;