Changeset 3370 for trunk/sources/HeuristicLab.Collections

Timestamp:

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

Author:

swagner

Message:

Worked on ReadOnlyView property (#969).

Location:

trunk/sources/HeuristicLab.Collections/3.3

Files:

• ObservableArray.cs (modified) (1 diff)
• ObservableCollection.cs (modified) (1 diff)
• ObservableDictionary.cs (modified) (1 diff)
• ObservableKeyedCollection.cs (modified) (1 diff)
• ObservableList.cs (modified) (1 diff)
• ObservableSet.cs (modified) (1 diff)
• ReadOnlyObservableArray.cs (modified) (1 diff)
• ReadOnlyObservableCollection.cs (modified) (1 diff)
• ReadOnlyObservableDictionary.cs (modified) (1 diff)
• ReadOnlyObservableKeyedCollection.cs (modified) (1 diff)
• ReadOnlyObservableList.cs (modified) (1 diff)
• ReadOnlyObservableSet.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 { }
     }