Changeset 3393 for trunk/sources/HeuristicLab.Core.Views/3.3

Timestamp:

04/18/10 03:00:00 (14 years ago)

Author:

swagner

Message:

Changed items and views according to the refactoring of HeuristicLab.Collections (#977)

Location:

trunk/sources/HeuristicLab.Core.Views/3.3

Files:

• ItemArrayView.cs (modified) (3 diffs)
• ItemCollectionView.cs (modified) (2 diffs)
• ItemListView.cs (modified) (3 diffs)
• ItemSetView.cs (modified) (2 diffs)
• NamedItemCollectionView.cs (modified) (2 diffs)
• OperatorCollectionView.cs (modified) (2 diffs)
• OperatorListView.cs (modified) (2 diffs)
• OperatorSetView.cs (modified) (2 diffs)
• OperatorTreeView.cs (modified) (5 diffs)
• ParameterCollectionView.cs (modified) (2 diffs)
• ScopeListView.cs (modified) (2 diffs)
• ValueParameterCollectionView.cs (modified) (2 diffs)
• VariableCollectionView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -34 +34 @@
   [View("ItemArray View")]
   [Content(typeof(ItemArray<>), true)]
-  [Content(typeof(IObservableArray<>), false)]
+  [Content(typeof(IItemArray<>), false)]
   public partial class ItemArrayView<T> : AsynchronousContentView where T : class, IItem {
     /// <summary>
@@ -41 +41 @@
     /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
     /// No won data storage present.</remarks>
-    public new IObservableArray<T> Content {
-      get { return (IObservableArray<T>)base.Content; }
+    public new IItemArray<T> Content {
+      get { return (IItemArray<T>)base.Content; }
       set { base.Content = value; }
     }
@@ -57 +57 @@
       Caption = "Item Array";
     }
-    public ItemArrayView(IObservableArray<T> content)
+    public ItemArrayView(IItemArray<T> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -31 +31 @@
   [View("ItemCollection View")]
   [Content(typeof(ItemCollection<>), true)]
-  [Content(typeof(IObservableCollection<>), false)]
+  [Content(typeof(IItemCollection<>), false)]
   public partial class ItemCollectionView<T> : AsynchronousContentView where T : class, IItem {
-    public new IObservableCollection<T> Content {
-      get { return (IObservableCollection<T>)base.Content; }
+    public new IItemCollection<T> Content {
+      get { return (IItemCollection<T>)base.Content; }
       set { base.Content = value; }
     }
@@ -46 +46 @@
       Caption = "Item Collection";
     }
-    public ItemCollectionView(IObservableCollection<T> content)
+    public ItemCollectionView(IItemCollection<T> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -34 +34 @@
   [View("ItemList View")]
   [Content(typeof(ItemList<>), true)]
-  [Content(typeof(IObservableList<>), false)]
+  [Content(typeof(IItemList<>), false)]
   public partial class ItemListView<T> : AsynchronousContentView where T : class, IItem {
     /// <summary>
@@ -41 +41 @@
     /// <remarks>Uses property <see cref="ViewBase.Item"/> of base class <see cref="ViewBase"/>.
     /// No won data storage present.</remarks>
-    public new IObservableList<T> Content {
-      get { return (IObservableList<T>)base.Content; }
+    public new IItemList<T> Content {
+      get { return (IItemList<T>)base.Content; }
       set { base.Content = value; }
     }
@@ -57 +57 @@
       Caption = "Item List";
     }
-    public ItemListView(IObservableList<T> content)
+    public ItemListView(IItemList<T> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/ItemSetView.cs

@@ -28 +28 @@
   [View("ItemSet View")]
   [Content(typeof(ItemSet<>), true)]
-  [Content(typeof(IObservableSet<>), false)]
+  [Content(typeof(IItemSet<>), false)]
   public partial class ItemSetView<T> : ItemCollectionView<T> where T : class, IItem {
-    public new IObservableSet<T> Content {
-      get { return (IObservableSet<T>)base.Content; }
+    public new IItemSet<T> Content {
+      get { return (IItemSet<T>)base.Content; }
       set { base.Content = value; }
     }
@@ -45 +45 @@
       Caption = "Item Set";
     }
-    public ItemSetView(IObservableSet<T> content)
+    public ItemSetView(IItemSet<T> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemCollectionView.cs

@@ -29 +29 @@
   [Content(typeof(NamedItemCollection<>), true)]
   public partial class NamedItemCollectionView<T> : ItemCollectionView<T> where T : class, INamedItem {
-    public new IObservableKeyedCollection<string, T> Content {
-      get { return (IObservableKeyedCollection<string, T>)base.Content; }
+    public new IKeyedItemCollection<string, T> Content {
+      get { return (IKeyedItemCollection<string, T>)base.Content; }
       set { base.Content = value; }
     }
@@ -44 +44 @@
       Caption = "Named Item Collection";
     }
-    public NamedItemCollectionView(IObservableKeyedCollection<string, T> content)
+    public NamedItemCollectionView(IKeyedItemCollection<string, T> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorCollectionView.cs

@@ -6 +6 @@
   [View("OperatorCollection View")]
   [Content(typeof(OperatorCollection), true)]
-  [Content(typeof(IObservableCollection<IOperator>), false)]
+  [Content(typeof(IItemCollection<IOperator>), false)]
   public partial class OperatorCollectionView : ItemCollectionView<IOperator> {
     protected TypeSelectorDialog typeSelectorDialog;
@@ -24 +24 @@
     /// <remarks>Calls <see cref="VariablesScopeView()"/>.</remarks>
     /// <param name="scope">The scope whose variables should be represented visually.</param>
-    public OperatorCollectionView(IObservableCollection<IOperator> content)
+    public OperatorCollectionView(IItemCollection<IOperator> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorListView.cs

@@ -27 +27 @@
   [View("OperatorList View")]
   [Content(typeof(OperatorList), true)]
-  [Content(typeof(IObservableList<IOperator>), false)]
+  [Content(typeof(IItemList<IOperator>), false)]
   public partial class OperatorListView : ItemListView<IOperator> {
     protected TypeSelectorDialog typeSelectorDialog;
@@ -45 +45 @@
     /// <remarks>Calls <see cref="VariablesScopeView()"/>.</remarks>
     /// <param name="scope">The scope whose variables should be represented visually.</param>
-    public OperatorListView(IObservableList<IOperator> content)
+    public OperatorListView(IItemList<IOperator> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorSetView.cs

@@ -6 +6 @@
   [View("OperatorSet View")]
   [Content(typeof(OperatorSet), true)]
-  [Content(typeof(IObservableSet<IOperator>), false)]
+  [Content(typeof(IItemSet<IOperator>), false)]
   public partial class OperatorSetView : ItemSetView<IOperator> {
     protected TypeSelectorDialog typeSelectorDialog;
@@ -24 +24 @@
     /// <remarks>Calls <see cref="VariablesScopeView()"/>.</remarks>
     /// <param name="scope">The scope whose variables should be represented visually.</param>
-    public OperatorSetView(IObservableSet<IOperator> content)
+    public OperatorSetView(IItemSet<IOperator> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/OperatorTreeView.cs

@@ -37 +37 @@
     private Dictionary<IValueParameter<IOperator>, List<TreeNode>> opParamNodeTable;
     private Dictionary<IOperator, List<TreeNode>> operatorNodeTable;
-    private Dictionary<IObservableKeyedCollection<string, IParameter>, IOperator> parametersOperatorTable;
+    private Dictionary<IKeyedItemCollection<string, IParameter>, IOperator> parametersOperatorTable;
 
     /// <summary>
@@ -68 +68 @@
       opParamNodeTable = new Dictionary<IValueParameter<IOperator>, List<TreeNode>>();
       operatorNodeTable = new Dictionary<IOperator, List<TreeNode>>();
-      parametersOperatorTable = new Dictionary<IObservableKeyedCollection<string, IParameter>, IOperator>();
+      parametersOperatorTable = new Dictionary<IKeyedItemCollection<string, IParameter>, IOperator>();
       Caption = "Operator";
     }
@@ -291 +291 @@
         Invoke(new CollectionItemsChangedEventHandler<IParameter>(Parameters_ItemsAdded), sender, e);
       else {
-        IObservableKeyedCollection<string, IParameter> coll = (IObservableKeyedCollection<string, IParameter>)sender;
+        IKeyedItemCollection<string, IParameter> coll = (IKeyedItemCollection<string, IParameter>)sender;
         IOperator op = parametersOperatorTable[coll];
         AddParameterNodes(op, e.Items);
@@ -307 +307 @@
       else {
         RemoveParameterNodes(e.Items);
-        IObservableKeyedCollection<string, IParameter> coll = (IObservableKeyedCollection<string, IParameter>)sender;
+        IKeyedItemCollection<string, IParameter> coll = (IKeyedItemCollection<string, IParameter>)sender;
         IOperator op = parametersOperatorTable[coll];
         AddParameterNodes(op, e.Items);
@@ -317 +317 @@
       else {
         RemoveParameterNodes(e.Items);
-        IObservableKeyedCollection<string, IParameter> coll = (IObservableKeyedCollection<string, IParameter>)sender;
+        IKeyedItemCollection<string, IParameter> coll = (IKeyedItemCollection<string, IParameter>)sender;
         IOperator op = parametersOperatorTable[coll];
         AddParameterNodes(op, e.Items);

trunk/sources/HeuristicLab.Core.Views/3.3/ParameterCollectionView.cs

@@ -28 +28 @@
   [View("ParameterCollection View")]
   [Content(typeof(ParameterCollection), true)]
-  [Content(typeof(IObservableKeyedCollection<string, IParameter>), false)]
+  [Content(typeof(IKeyedItemCollection<string, IParameter>), false)]
   public partial class ParameterCollectionView : NamedItemCollectionView<IParameter> {
     protected CreateParameterDialog createParameterDialog;
@@ -45 +45 @@
     /// <remarks>Calls <see cref="VariablesScopeView()"/>.</remarks>
     /// <param name="scope">The scope whose variables should be represented visually.</param>
-    public ParameterCollectionView(IObservableKeyedCollection<string, IParameter> content)
+    public ParameterCollectionView(IKeyedItemCollection<string, IParameter> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/ScopeListView.cs

@@ -5 +5 @@
   [View("ScopeList View")]
   [Content(typeof(ScopeList), true)]
-  [Content(typeof(IObservableList<IScope>), false)]
+  [Content(typeof(IItemList<IScope>), false)]
   public partial class ScopeListView : ItemListView<IScope> {
     /// <summary>
@@ -21 +21 @@
     /// <remarks>Calls <see cref="VariablesScopeView()"/>.</remarks>
     /// <param name="scope">The scope whose variables should be represented visually.</param>
-    public ScopeListView(IObservableList<IScope> content)
+    public ScopeListView(IItemList<IScope> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/ValueParameterCollectionView.cs

@@ -28 +28 @@
   [View("ValueParameterCollection View")]
   [Content(typeof(ValueParameterCollection), true)]
-  [Content(typeof(IObservableKeyedCollection<string, IValueParameter>), false)]
+  [Content(typeof(IKeyedItemCollection<string, IValueParameter>), false)]
   public partial class ValueParameterCollectionView : NamedItemCollectionView<IValueParameter> {
     protected CreateParameterDialog createParameterDialog;
@@ -45 +45 @@
     /// <remarks>Calls <see cref="VariablesScopeView()"/>.</remarks>
     /// <param name="scope">The scope whose variables should be represented visually.</param>
-    public ValueParameterCollectionView(IObservableKeyedCollection<string, IValueParameter> content)
+    public ValueParameterCollectionView(IKeyedItemCollection<string, IValueParameter> content)
       : this() {
       Content = content;

trunk/sources/HeuristicLab.Core.Views/3.3/VariableCollectionView.cs

@@ -5 +5 @@
   [View("VariableCollection View")]
   [Content(typeof(VariableCollection), true)]
-  [Content(typeof(IObservableKeyedCollection<string, IVariable>), false)]
+  [Content(typeof(IKeyedItemCollection<string, IVariable>), false)]
   public partial class VariableCollectionView : NamedItemCollectionView<IVariable> {
     /// <summary>
@@ -21 +21 @@
     /// <remarks>Calls <see cref="VariablesScopeView()"/>.</remarks>
     /// <param name="scope">The scope whose variables should be represented visually.</param>
-    public VariableCollectionView(IObservableKeyedCollection<string, IVariable> content)
+    public VariableCollectionView(IKeyedItemCollection<string, IVariable> content)
       : this() {
       Content = content;