Changeset 17015

Timestamp:

06/18/19 16:02:52 (5 years ago)

Author:

abeham

Message:

#2520: fixed bug in the clipboard when it contains objects not of type IStorableContent

Location:

trunk/HeuristicLab.Core.Views/3.3

Files:

• Clipboard.cs (modified) (1 diff)
• HeuristicLab.Core.Views-3.3.csproj (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)

trunk/HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -155 +155 @@
       foreach (string filename in items) {
         try {
-          T item = (T)ContentManager.Load(filename);
+          T item = null;
+          if (HeuristicLab.Persistence.Default.Xml.XmlParser.CanOpen(filename)) {
+            item = HeuristicLab.Persistence.Default.Xml.XmlParser.Deserialize<T>(filename);
+          } else {
+            item = (T)new ProtoBufSerializer().Deserialize(filename);
+          }
           OnItemLoaded(item, progressBar.Maximum / items.Length);
-        } catch(Exception) {
+        } catch (Exception) {
           // ignore if loading a clipboad item fails.
         }

trunk/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -375 +375 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
+      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
+      <Name>HeuristicLab.Persistence-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>

trunk/HeuristicLab.Core.Views/3.3/Plugin.cs.frame

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.MainForm", "3.3")]
   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
+  [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabCoreViewsPlugin : PluginBase {
   }