Changeset 3370 for trunk/sources

Timestamp:

04/16/10 13:14:56 (15 years ago)

Author:

swagner

Message:

Worked on ReadOnlyView property (#969).

Location:

trunk/sources

Files:

• HeuristicLab.Collections/3.3/ObservableArray.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ObservableCollection.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ObservableDictionary.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ObservableKeyedCollection.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ObservableList.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ObservableSet.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ReadOnlyObservableArray.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ReadOnlyObservableCollection.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ReadOnlyObservableDictionary.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ReadOnlyObservableKeyedCollection.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ReadOnlyObservableList.cs (modified) (1 diff)
• HeuristicLab.Collections/3.3/ReadOnlyObservableSet.cs (modified) (1 diff)
• HeuristicLab.Common/3.2/IContent.cs (modified) (1 diff)
• HeuristicLab.Core/3.3/Item.cs (modified) (1 diff)
• HeuristicLab.Data/3.3/IStringConvertibleArray.cs (modified) (2 diffs)
• HeuristicLab.Data/3.3/IStringConvertibleMatrix.cs (modified) (3 diffs)
• HeuristicLab.Data/3.3/IStringConvertibleValue.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Collections/3.3/ObservableArray.cs

@@ -37 +37 @@
     [Storable]
     private bool readOnlyView;
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return readOnlyView; }
       set {
-        if (readOnlyView != value) {
+        if ((readOnlyView != value) && !array.IsReadOnly) {
           readOnlyView = value;
           OnReadOnlyViewChanged();

trunk/sources/HeuristicLab.Collections/3.3/ObservableCollection.cs

@@ -36 +36 @@
     [Storable]
     private bool readOnlyView;
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return readOnlyView; }
       set {
-        if (readOnlyView != value) {
+        if ((readOnlyView != value) && !((ICollection<T>)list).IsReadOnly) {
           readOnlyView = value;
           OnReadOnlyViewChanged();

trunk/sources/HeuristicLab.Collections/3.3/ObservableDictionary.cs

@@ -37 +37 @@
     [Storable]
     private bool readOnlyView;
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return readOnlyView; }
       set {
-        if (readOnlyView != value) {
+        if ((readOnlyView != value) && !((ICollection<KeyValuePair<TKey, TValue>>)dict).IsReadOnly) {
           readOnlyView = value;
           OnReadOnlyViewChanged();

trunk/sources/HeuristicLab.Collections/3.3/ObservableKeyedCollection.cs

@@ -37 +37 @@
     [Storable]
     private bool readOnlyView;
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return readOnlyView; }
       set {
-        if (readOnlyView != value) {
+        if ((readOnlyView != value) && !((ICollection<KeyValuePair<TKey, TItem>>)dict).IsReadOnly) {
           readOnlyView = value;
           OnReadOnlyViewChanged();

trunk/sources/HeuristicLab.Collections/3.3/ObservableList.cs

@@ -36 +36 @@
     [Storable]
     private bool readOnlyView;
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return readOnlyView; }
       set {
-        if (readOnlyView != value) {
+        if ((readOnlyView != value) && !((ICollection<T>)list).IsReadOnly) {
           readOnlyView = value;
           OnReadOnlyViewChanged();

trunk/sources/HeuristicLab.Collections/3.3/ObservableSet.cs

@@ -37 +37 @@
     [Storable]
     private bool readOnlyView;
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return readOnlyView; }
       set {
-        if (readOnlyView != value) {
+        if ((readOnlyView != value) && !((ICollection<T>)set).IsReadOnly) {
           readOnlyView = value;
           OnReadOnlyViewChanged();

trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableArray.cs

@@ -37 +37 @@
     public bool ReadOnlyView {
       get { return true; }
-      set { throw new NotSupportedException(); }
+      set { }
     }
 

trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableCollection.cs

@@ -37 +37 @@
     public bool ReadOnlyView {
       get { return true; }
-      set { throw new NotSupportedException(); }
+      set { }
     }
 

trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableDictionary.cs

@@ -37 +37 @@
     public bool ReadOnlyView {
       get { return true; }
-      set { throw new NotSupportedException(); }
+      set { }
     }
 

trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableKeyedCollection.cs

@@ -35 +35 @@
 
     #region Properties
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return true; }
       set { throw new NotSupportedException(); }

trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableList.cs

@@ -37 +37 @@
     public bool ReadOnlyView {
       get { return true; }
-      set { throw new NotSupportedException(); }
+      set { }
     }
 

trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableSet.cs

@@ -37 +37 @@
     public bool ReadOnlyView {
       get { return true; }
-      set { throw new NotSupportedException(); }
+      set { }
     }
 

trunk/sources/HeuristicLab.Common/3.2/IContent.cs

@@ -28 +28 @@
   public interface IContent {
     bool ReadOnlyView { get; set; }
+
     event EventHandler ReadOnlyViewChanged;
   }

trunk/sources/HeuristicLab.Core/3.3/Item.cs

@@ -43 +43 @@
     [Storable]
     private bool readOnlyView;
-    public bool ReadOnlyView {
+    public virtual bool ReadOnlyView {
       get { return readOnlyView; }
       set {

trunk/sources/HeuristicLab.Data/3.3/IStringConvertibleArray.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Data {
-  public interface IStringConvertibleArray {
-    bool ReadOnlyView { get; set; }
+  public interface IStringConvertibleArray : IContent {
     int Length { get; set; }
 
@@ -32 +31 @@
     bool SetValue(string value, int index);
 
-    event EventHandler ReadOnlyViewChanged;
     event EventHandler<EventArgs<int>> ItemChanged;
     event EventHandler Reset;

trunk/sources/HeuristicLab.Data/3.3/IStringConvertibleMatrix.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Data {
-  public interface IStringConvertibleMatrix {
+  public interface IStringConvertibleMatrix : IContent {
     int Rows { get; set; }
     int Columns { get; set; }
@@ -31 +31 @@
     IEnumerable<string> RowNames { get; set; }
 
-    bool ReadOnlyView { get; set; }
     bool SortableView { get; set; }
 
@@ -40 +39 @@
     event EventHandler ColumnNamesChanged;
     event EventHandler RowNamesChanged;
-    event EventHandler ReadOnlyViewChanged;
     event EventHandler SortableViewChanged;
     event EventHandler<EventArgs<int, int>> ItemChanged;

trunk/sources/HeuristicLab.Data/3.3/IStringConvertibleValue.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 
 namespace HeuristicLab.Data {
-  public interface IStringConvertibleValue {
-    bool ReadOnlyView { get; set; }
-
+  public interface IStringConvertibleValue : IContent {
     bool Validate(string value, out string errorMessage);
     string GetValue();
     bool SetValue(string value);
 
-    event EventHandler ReadOnlyViewChanged;
     event EventHandler ValueChanged;
   }