Changeset 10625

Timestamp:

03/19/14 14:08:53 (11 years ago)

Author:

pfleck

Message:

• replaced ViewShortcutCollection with ItemCollection<IViewShortcut> for readonly compatibility.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.designer.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/ViewShortcutCollectionView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/ViewShortcutCollection.cs (deleted)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.cs

@@ -23 +23 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -53 +54 @@
         var filterLogic = new FilterLogic(data);
 
-        viewShortcutCollectionView.Content = new ViewShortcutCollection {
+        var viewShortcuts = new ItemCollection<IViewShortcut>() {
           new DataGridContent(dataGridLogic, manipulationLogic),
           new StatisticsContent(statisticsLogic),
@@ -61 +62 @@
           new HistogramContent(histogramLogic)
         };
+
+        viewShortcutCollectionView.Content = viewShortcuts.AsReadOnly();
       } else {
         viewShortcutCollectionView.Content = null;

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataPreprocessingView.designer.cs

@@ -96 +96 @@
       this.viewShortcutCollectionView.Location = new System.Drawing.Point(4, 33);
       this.viewShortcutCollectionView.Name = "viewShortcutCollectionView";
-      this.viewShortcutCollectionView.ReadOnly = true;
+      this.viewShortcutCollectionView.ReadOnly = false;
       this.viewShortcutCollectionView.ShowDetails = true;
       this.viewShortcutCollectionView.Size = new System.Drawing.Size(831, 413);

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/ViewShortcutCollectionView.cs

@@ -21 +21 @@
 
 
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
@@ -26 +27 @@
 namespace HeuristicLab.DataPreprocessing.Views {
   [View("ViewShortcutCollection View")]
-  [Content(typeof(ViewShortcutCollection), true)]
+  [Content(typeof(IItemCollection<IViewShortcut>), true)]
   public partial class ViewShortcutCollectionView : ItemCollectionView<IViewShortcut> {
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -78 +78 @@
     <Compile Include="Implementations\ManipulationLogic.cs" />
     <Compile Include="Interfaces\IPreprocessingData.cs" />
-    <Compile Include="Implementations\ViewShortcutCollection.cs" />
     <Compile Include="Interfaces\IDataGridLogic.cs" />
     <Compile Include="Implementations\FilterContent.cs" />

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

@@ -123 +123 @@
     }
 
-    public bool SetValue(string value,int columnIndex,int rowIndex) {
+    public bool SetValue(string value, int columnIndex, int rowIndex) {
       return dataGridLogic.SetValue(value, columnIndex, rowIndex);
     }