wasSharp

Subversion Repositories:
Compare Path: Rev
With Path: Rev
?path1? @ 39  →  ?path2? @ 38
/Collections/Specialized/ObservableHashSet.cs
@@ -5,7 +5,6 @@
///////////////////////////////////////////////////////////////////////////
 
using System;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
@@ -22,14 +21,11 @@
/// <typeparam name="T">the object type</typeparam>
public class ObservableHashSet<T> : ICollection<T>, INotifyCollectionChanged, IEnumerable<T>
{
private readonly ReaderWriterLockSlim SyncRoot = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
private readonly HashSet<T> store = new HashSet<T>();
 
public ObservableHashSet(HashSet<T> set)
{
SyncRoot.EnterWriteLock();
UnionWith(set);
SyncRoot.ExitWriteLock();
}
 
public ObservableHashSet()
@@ -38,23 +34,17 @@
 
public ObservableHashSet(T item)
{
SyncRoot.EnterWriteLock();
Add(item);
SyncRoot.ExitWriteLock();
}
 
public ObservableHashSet(ObservableHashSet<T> other)
{
SyncRoot.EnterWriteLock();
UnionWith(other);
SyncRoot.ExitWriteLock();
}
 
public ObservableHashSet(IEnumerable<T> list)
{
SyncRoot.EnterWriteLock();
UnionWith(list);
SyncRoot.ExitWriteLock();
}
 
public bool IsVirgin { get; private set; } = true;
@@ -61,25 +51,17 @@
 
public IEnumerator<T> GetEnumerator()
{
SyncRoot.EnterReadLock();
var enumerator = store.GetEnumerator();
SyncRoot.ExitReadLock();
return enumerator;
return store.GetEnumerator();
}
 
IEnumerator IEnumerable.GetEnumerator()
{
SyncRoot.EnterReadLock();
var enumerator = GetEnumerator();
SyncRoot.ExitReadLock();
return enumerator;
return GetEnumerator();
}
 
public void Add(T item)
{
SyncRoot.EnterWriteLock();
store.Add(item);
SyncRoot.ExitWriteLock();
IsVirgin = false;
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item));
}
@@ -86,9 +68,7 @@
 
public void Clear()
{
SyncRoot.EnterWriteLock();
store.Clear();
SyncRoot.ExitWriteLock();
if (!IsVirgin)
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
IsVirgin = false;
@@ -96,24 +76,17 @@
 
public bool Contains(T item)
{
SyncRoot.EnterReadLock();
var contains = store.Contains(item);
SyncRoot.ExitReadLock();
return contains;
return store.Contains(item);
}
 
public void CopyTo(T[] array, int arrayIndex)
{
SyncRoot.EnterReadLock();
store.CopyTo(array, arrayIndex);
SyncRoot.ExitReadLock();
}
 
public bool Remove(T item)
{
SyncRoot.EnterWriteLock();
var removed = store.Remove(item);
SyncRoot.ExitWriteLock();
IsVirgin = false;
if (removed)
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item));
@@ -129,9 +102,7 @@
public void UnionWith(IEnumerable<T> list)
{
var added = new List<T>(list.Except(store));
SyncRoot.EnterWriteLock();
store.UnionWith(added);
SyncRoot.ExitWriteLock();
if (!IsVirgin && added.Any())
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, added));
IsVirgin = false;
@@ -145,9 +116,7 @@
public void ExceptWith(IEnumerable<T> list)
{
var removed = new List<T>(list.Intersect(store));
SyncRoot.EnterWriteLock();
store.ExceptWith(removed);
SyncRoot.ExitWriteLock();
if (!IsVirgin && removed.Any())
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove,
removed));
@@ -157,9 +126,7 @@
public void RemoveWhere(Func<T, bool> func)
{
var removed = new List<T>(store.Where(func));
SyncRoot.EnterWriteLock();
store.ExceptWith(removed);
SyncRoot.ExitWriteLock();
if (!IsVirgin && removed.Any())
OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove,
removed));
@@ -168,10 +135,7 @@
 
public IEnumerable<T> AsEnumerable()
{
SyncRoot.EnterWriteLock();
var enumerable = store.AsEnumerable();
SyncRoot.ExitWriteLock();
return enumerable;
return store.AsEnumerable();
}
}
}