Changeset 12689 for branches/HiveStatistics/sources/HeuristicLab.Core.Views

Timestamp:

07/08/15 15:32:12 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/CheckedItemListView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemSetView.cs (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs

@@ -32 +32 @@
   [Content(typeof(ICheckedItemCollection<>), true)]
   [Content(typeof(CheckedItemCollection<>), true)]
+  [Content(typeof(ReadOnlyCheckedItemCollection<>), true)]
   public partial class CheckedItemCollectionView<T> : ItemCollectionView<T> where T : class, IItem {
     public new ICheckedItemCollection<T> Content {

branches/HiveStatistics/sources/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs

@@ -35 +35 @@
   [Content(typeof(CheckedItemList<>), true)]
   [Content(typeof(ICheckedItemList<>), true)]
+  [Content(typeof(ReadOnlyCheckedItemList<>), true)]
   public partial class CheckedItemListView<T> : ItemListView<T> where T : class, IItem {
     public new ICheckedItemList<T> Content {

branches/HiveStatistics/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -28 +28 @@
 using HeuristicLab.Collections;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.PluginInfrastructure;
 
@@ -35 +34 @@
   [Content(typeof(ItemArray<>), true)]
   [Content(typeof(IItemArray<>), false)]
+  [Content(typeof(ReadOnlyItemArray<>), true)]
   public partial class ItemArrayView<T> : ItemView where T : class, IItem {
     protected Dictionary<T, List<ListViewItem>> itemListViewItemMapping;

branches/HiveStatistics/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -29 +29 @@
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.PluginInfrastructure;
 
@@ -36 +35 @@
   [Content(typeof(ItemCollection<>), true)]
   [Content(typeof(IItemCollection<>), false)]
+  [Content(typeof(ReadOnlyItemCollection<>), true)]
   public partial class ItemCollectionView<T> : ItemView where T : class, IItem {
     protected Dictionary<T, List<ListViewItem>> itemListViewItemMapping;

branches/HiveStatistics/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -30 +30 @@
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.PluginInfrastructure;
 
@@ -37 +36 @@
   [Content(typeof(ItemList<>), true)]
   [Content(typeof(IItemList<>), false)]
+  [Content(typeof(ReadOnlyItemList<>), true)]
   public partial class ItemListView<T> : ItemView where T : class, IItem {
     protected Dictionary<T, List<ListViewItem>> itemListViewItemMapping;

branches/HiveStatistics/sources/HeuristicLab.Core.Views/3.3/ItemSetView.cs

@@ -28 +28 @@
   [Content(typeof(ItemSet<>), true)]
   [Content(typeof(IItemSet<>), false)]
+  [Content(typeof(ReadOnlyItemSet<>), true)]
   public partial class ItemSetView<T> : ItemCollectionView<T> where T : class, IItem {
     protected bool draggedItemsAlreadyContained;