Changeset 16565 for trunk/HeuristicLab.Scripting.Views
- Timestamp:
- 01/28/19 13:41:42 (6 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.Designer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/CSharpScriptView.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/ExecutableScriptView.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj
r13080 r16565 10 10 <RootNamespace>HeuristicLab.Scripting.Views</RootNamespace> 11 11 <AssemblyName>HeuristicLab.Scripting.Views-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 <TargetFrameworkProfile /> … … 81 81 </PropertyGroup> 82 82 <ItemGroup> 83 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> 84 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath> 85 </Reference> 86 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 87 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath> 88 </Reference> 83 89 <Reference Include="System" /> 84 90 <Reference Include="System.Core" /> 85 91 <Reference Include="System.Drawing" /> 92 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> 93 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath> 94 </Reference> 86 95 <Reference Include="System.Windows.Forms" /> 87 96 <Reference Include="System.Xml.Linq" /> … … 91 100 </ItemGroup> 92 101 <ItemGroup> 102 <None Include="packages.config" /> 93 103 <None Include="Plugin.cs.frame" /> 94 104 <Compile Include="CSharpScriptView.cs"> -
trunk/HeuristicLab.Scripting.Views/3.3/Plugin.cs.frame
r15589 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/Properties/AssemblyInfo.cs.frame
r15589 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs
r16506 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/ScriptView.cs
r16528 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/VariableStoreView.Designer.cs
r15583 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
trunk/HeuristicLab.Scripting.Views/3.3/VariableStoreView.cs
r16526 r16565 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 32 32 using HeuristicLab.MainForm.WindowsForms; 33 33 using HeuristicLab.Persistence.Core; 34 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;34 using HEAL.Attic; 35 35 using HeuristicLab.Persistence.Default.Xml; 36 36 using HeuristicLab.PluginInfrastructure; 37 using System.IO; 37 38 38 39 namespace HeuristicLab.Scripting.Views { … … 486 487 private bool IsSerializable(KeyValuePair<string, object> variable) { 487 488 Type type = null; 488 bool serializable ;489 bool serializable = false; 489 490 490 491 if (variable.Value != null) { 491 492 type = variable.Value.GetType(); 492 493 if (serializableLookup.TryGetValue(type, out serializable)) return serializable; 493 if (Storable ClassAttribute.IsStorableClass(type)) return serializableLookup[type] = true;494 } 495 496 var ser = new Serializer(variable, ConfigurationService.Instance.GetDefaultConfig(new XmlFormat()), "ROOT", true);494 if (StorableTypeAttribute.IsStorableType(type)) return serializableLookup[type] = true; 495 } 496 497 var ser = new ProtoBufSerializer(); 497 498 try { 498 serializable = ser.Count() > 0; // try to create all serialization tokens 499 using (var memStream = new MemoryStream()) { 500 ser.Serialize(variable.Value, memStream); // try to serialize to memory stream 501 serializable = true; 502 } 499 503 } catch (PersistenceException) { 500 504 serializable = false;
Note: See TracChangeset
for help on using the changeset viewer.