Changeset 9714 for trunk/sources/HeuristicLab.Data

Timestamp:

07/17/13 13:35:44 (11 years ago)

Author:

mkommend

Message:

#2081: Integrated new HL path data types from the branch.

Location:

trunk/sources/HeuristicLab.Data/3.3

Files:

• . (modified) (1 prop)
• HeuristicLab.Data-3.3.csproj (modified) (3 diffs)
• Path Types (copied) (copied from branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3/Path Types)
• Path Types/TextFile.cs (deleted)
• Path Types/TextFileValue.cs (copied) (copied from branches/HeuristicLab.Data Path DataTypes/HeuristicLab.Data/3.3/Path Types/TextFile.cs) (1 diff)

trunk/sources/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

@@ -117 +117 @@
     <Compile Include="Comparison.cs" />
     <Compile Include="ComparisonType.cs" />
+    <Compile Include="Path Types\DirectoryValue.cs" />
+    <Compile Include="Path Types\FileValue.cs" />
+    <Compile Include="Path Types\PathValue.cs" />
+    <Compile Include="Path Types\TextFileValue.cs" />
     <Compile Include="PercentMatrix.cs" />
     <Compile Include="PercentArray.cs" />
@@ -212 +216 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -219 +223 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

trunk/sources/HeuristicLab.Data/3.3/Path Types/TextFileValue.cs

@@ -27 +27 @@
   [Item("TextFile", "Represents the content and path to a text file.")]
   [StorableClass]
-  public class TextFile : FileValue {
+  public class TextFileValue : FileValue {
     [StorableConstructor]
-    protected TextFile(bool deserializing) : base(deserializing) { }
-    protected TextFile(TextFile original, Cloner cloner)
+    protected TextFileValue(bool deserializing) : base(deserializing) { }
+    protected TextFileValue(TextFileValue original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new TextFile(this, cloner);
+      return new TextFileValue(this, cloner);
     }
 
-    public TextFile()
+    public TextFileValue()
       : base() {
     }