Changeset 9614 for branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchWithMatchOperationCommandBase.cs

Timestamp:

06/12/13 13:32:34 (11 years ago)

Author:

mkommend

Message:

#1734: Added StorableConstructor to all storable DataImporter classes.

File:

• branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchWithMatchOperationCommandBase.cs (modified) (3 diffs)

branches/HeuristicLab.DataImporter/HeuristicLab.DataImporter.Command/ChangeValues/SearchWithMatchOperationCommandBase.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Drawing;
 using HeuristicLab.DataImporter.Data.CommandBase;
+using HeuristicLab.DataImporter.Data.Model;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.DataImporter.Data.Model;
-using System.Drawing;
 
 namespace HeuristicLab.DataImporter.Command {
@@ -39 +37 @@
   [StorableClass]
   public abstract class SearchWithMatchOperationCommandBase : SearchCommandBase {
-    private SearchWithMatchOperationCommandBase()
-      : base(null, string.Empty, null) {
-    }
-
-    public SearchWithMatchOperationCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
+    [StorableConstructor]
+    protected SearchWithMatchOperationCommandBase(bool deserializing) : base(deserializing) { }
+    protected SearchWithMatchOperationCommandBase(DataSet dataSet, string columnGroupName, int[] affectedColumns) :
       base(dataSet, columnGroupName, affectedColumns) {
     }
@@ -121 +117 @@
           break;
         case MatchOperation.Larger:
-          compareFunction = (left, right) => { 
+          compareFunction = (left, right) => {
             if (left == null && right == null) return false;
             else if (left != null && right == null) return false;
             else if (left == null && right != null) return false;
-            return left.CompareTo(right) < 0; };
+            return left.CompareTo(right) < 0;
+          };
           break;
         default: