Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/2994-AutoDiffForIntervals

  • branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views

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

    r16565 r17005  
    2424using System.Collections.Generic;
    2525using System.IO;
    26 using System.IO.Compression;
    2726using System.Linq;
    2827using System.Threading;
     
    3130using HeuristicLab.Common;
    3231using HeuristicLab.MainForm;
    33 using HeuristicLab.Persistence.Default.Xml;
    3432using HeuristicLab.PluginInfrastructure;
    3533
     
    157155      foreach (string filename in items) {
    158156        try {
    159           var ser = new ProtoBufSerializer();
    160           T item = (T)ser.Deserialize(filename);
     157          T item = (T)ContentManager.Load(filename);
    161158          OnItemLoaded(item, progressBar.Maximum / items.Length);
    162         } catch (Exception) {
    163           try {
    164             // try old format if protobuf deserialization fails
    165             T item = XmlParser.Deserialize<T>(filename);
    166             OnItemLoaded(item, progressBar.Maximum / items.Length);
    167           } catch (Exception) { }
     159        } catch(Exception) {
     160          // ignore if loading a clipboad item fails.
    168161        }
    169162      }
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

    r16658 r17005  
    375375      <Private>False</Private>
    376376    </ProjectReference>
    377     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    378       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    379       <Name>HeuristicLab.Persistence-3.3</Name>
    380       <Private>False</Private>
    381     </ProjectReference>
    382377    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    383378      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
  • branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/Plugin.cs.frame

    r16658 r17005  
    3535  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3636  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    37   [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3837  public class HeuristicLabCoreViewsPlugin : PluginBase {
    3938  }
Note: See TracChangeset for help on using the changeset viewer.