Changeset 17005 for branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3

Timestamp:

06/11/19 20:59:44 (5 years ago)

Author:

gkronber

Message:

#2994: merged r16944:16997 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

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

branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -24 +24 @@
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Compression;
 using System.Linq;
 using System.Threading;
@@ -31 +30 @@
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
-using HeuristicLab.Persistence.Default.Xml;
 using HeuristicLab.PluginInfrastructure;
 
@@ -157 +155 @@
       foreach (string filename in items) {
         try {
-          var ser = new ProtoBufSerializer();
-          T item = (T)ser.Deserialize(filename);
+          T item = (T)ContentManager.Load(filename);
           OnItemLoaded(item, progressBar.Maximum / items.Length);
-        } catch (Exception) {
-          try {
-            // try old format if protobuf deserialization fails
-            T item = XmlParser.Deserialize<T>(filename);
-            OnItemLoaded(item, progressBar.Maximum / items.Length);
-          } catch (Exception) { }
+        } catch(Exception) {
+          // ignore if loading a clipboad item fails.
         }
       }

branches/2994-AutoDiffForIntervals/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>

branches/2994-AutoDiffForIntervals/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 {
   }