- Timestamp:
- 06/25/19 23:14:06 (5 years ago)
- Location:
- branches/2435-alglib_3_15
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2435-alglib_3_15
- Property svn:mergeinfo changed
-
branches/2435-alglib_3_15/HeuristicLab.Core.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Core.Views (added) merged: 16992,16997,17007-17009,17015
- Property svn:mergeinfo changed
-
branches/2435-alglib_3_15/HeuristicLab.Core.Views/3.3/Clipboard.cs
r16565 r17034 24 24 using System.Collections.Generic; 25 25 using System.IO; 26 using System.IO.Compression;27 26 using System.Linq; 28 27 using System.Threading; … … 31 30 using HeuristicLab.Common; 32 31 using HeuristicLab.MainForm; 33 using HeuristicLab.Persistence.Default.Xml;34 32 using HeuristicLab.PluginInfrastructure; 35 33 … … 157 155 foreach (string filename in items) { 158 156 try { 159 var ser = new ProtoBufSerializer(); 160 T item = (T)ser.Deserialize(filename); 157 T item = null; 158 if (HeuristicLab.Persistence.Default.Xml.XmlParser.CanOpen(filename)) { 159 item = HeuristicLab.Persistence.Default.Xml.XmlParser.Deserialize<T>(filename); 160 } else { 161 item = (T)new ProtoBufSerializer().Deserialize(filename); 162 } 161 163 OnItemLoaded(item, progressBar.Maximum / items.Length); 162 164 } 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) { } 165 // ignore if loading a clipboad item fails. 168 166 } 169 167 }
Note: See TracChangeset
for help on using the changeset viewer.