Changeset 10964 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4

Timestamp:

06/11/14 10:40:01 (10 years ago)

Author:

rstoll

Message:

• Refactorings for DataGridContent and FitlerContent

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations

Files:

• DataGridContent.cs (modified) (5 diffs)
• FilterContent.cs (modified) (4 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs

@@ -35 +35 @@
     private readonly IFilterLogic filterLogic;
 
-    public DataGridContent(IDataGridLogic theDataGridLogic, IManipulationLogic theManipulationLogic, IFilterLogic theFilterLogic) {
-      dataGridLogic = theDataGridLogic;
-      manipulationLogic = theManipulationLogic;
-      filterLogic = theFilterLogic;
-    }
-
-    public DataGridContent(DataGridContent dataGridContent, Cloner cloner)
-      : base(dataGridContent, cloner) {
-    }
-
     public IManipulationLogic ManipulationLogic {
       get { return manipulationLogic; }
@@ -63 +53 @@
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Table; }
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DataGridContent(this, cloner);
     }
 
@@ -118 +104 @@
     }
 
-    public bool Validate(string value, out string errorMessage) {
-      errorMessage = string.Empty;
-      return true;
+    public DataGridContent(IDataGridLogic theDataGridLogic, IManipulationLogic theManipulationLogic, IFilterLogic theFilterLogic) {
+      dataGridLogic = theDataGridLogic;
+      manipulationLogic = theManipulationLogic;
+      filterLogic = theFilterLogic;
+    }
+
+    public DataGridContent(DataGridContent dataGridContent, Cloner cloner)
+      : base(dataGridContent, cloner) {
+
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DataGridContent(this, cloner);
     }
 
@@ -129 +125 @@
     public bool SetValue(string value, int rowIndex, int columnIndex) {
       return dataGridLogic.SetValue(value, columnIndex, rowIndex);
+    }
+
+    public event DataPreprocessingChangedEventHandler Changed {
+      add { dataGridLogic.Changed += value; }
+      remove { dataGridLogic.Changed -= value; }
+    }
+
+
+
+    #region unused stuff/not implemented but necessary due to IStringConvertibleMatrix
+
+    // Is not used since DataGridContentView overrides dataGridView_CellValidating and uses 
+    // DataGridLogic#Validate(string value, out string errorMessage, int columnIndex)
+    public bool Validate(string value, out string errorMessage) {
+      errorMessage = string.Empty;
+      return true;
     }
 
@@ -144 +156 @@
 
     public event EventHandler Reset;
+    #endregion
 
-    public event DataPreprocessingChangedEventHandler Changed {
-      add { dataGridLogic.Changed += value; }
-      remove { dataGridLogic.Changed -= value; }
-    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/FilterContent.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using System.Collections.Generic;
 using HeuristicLab.DataPreprocessing.Filter;
 
@@ -40 +39 @@
     public bool isAndCombination = true;
 
-    public FilterContent(IFilterLogic theFilterLogic) {
-      filterLogic = theFilterLogic;
-    }
 
     public IFilterLogic FilterLogic {
@@ -50 +46 @@
     }
 
-    public ICheckedItemCollection<IFilter> Filters
-    {
-      get
-      {
+    public ICheckedItemCollection<IFilter> Filters {
+      get {
         return this.filters;
       }
-      set
-      {
+      set {
         this.filters = value;
       }
     }
 
-    public bool IsAndCombination
-    {
-      get
-      {
+    public bool IsAndCombination {
+      get {
         return this.isAndCombination;
       }
-      set
-      {
+      set {
         this.isAndCombination = value;
       }
     }
 
-    public FilterContent(FilterContent content, Cloner cloner)
+    public FilterContent(IFilterLogic theFilterLogic) {
+      filterLogic = theFilterLogic;
+    }
+
+    protected FilterContent(FilterContent content, Cloner cloner)
       : base(content, cloner) {
-
     }
 
@@ -82 +75 @@
       return new FilterContent(this, cloner);
     }
-
-
-
   }
 }