##// END OF EJS Templates
implab » ImplabNet
RSS
Fixed component container
cin -
r216:1e082fb67a46 v2
parent child
Show More
Show file before | Show file after | Hide comments
@@ -8,7 +8,8 namespace Implab.Components {
8 /// </summary>
8 /// </summary>
9 /// <remarks>Instanses of this class are thread safe.</remarks>
9 /// <remarks>Instanses of this class are thread safe.</remarks>
10 public class ComponentContainer<T> : Disposable, ICollection<T> {
10 public class ComponentContainer<T> : Disposable, ICollection<T> {
11 readonly HashSet<T> m_components = new HashSet<T>();
11 List<T> m_components = new List<T>();
12 readonly object m_lock = new object();
12
13
13 /// <summary>
14 /// <summary>
14 /// Removes currently stored compoenents from the container and disposes them if possible.
15 /// Removes currently stored compoenents from the container and disposes them if possible.
@@ -17,12 +18,11 namespace Implab.Components {
17 /// A new components may be added before this method completes.
18 /// A new components may be added before this method completes.
18 /// </remarks>
19 /// </remarks>
19 public void Clear() {
20 public void Clear() {
20 T[] removed;
21 List<T> removed;
21
22
22 lock (m_components) {
23 lock (m_lock) {
23 removed = new T[m_components.Count];
24 removed = m_components;
24 m_components.CopyTo(removed);
25 m_components = new List<T>();
25 m_components.Clear();
26 }
26 }
27
27
28 foreach (var item in removed.OfType<IDisposable>())
28 foreach (var item in removed.OfType<IDisposable>())
@@ -34,7 +34,7 namespace Implab.Components {
34 /// </summary>
34 /// </summary>
35 /// <param name="item">The item to check.</param>
35 /// <param name="item">The item to check.</param>
36 public bool Contains(T item) {
36 public bool Contains(T item) {
37 lock (m_components)
37 lock (m_lock)
38 return m_components.Contains(item);
38 return m_components.Contains(item);
39 }
39 }
40
40
@@ -44,7 +44,7 namespace Implab.Components {
44 /// <param name="array">A destination array for components.</param>
44 /// <param name="array">A destination array for components.</param>
45 /// <param name="arrayIndex">A starting index in the destination array.</param>
45 /// <param name="arrayIndex">A starting index in the destination array.</param>
46 public void CopyTo(T[] array, int arrayIndex) {
46 public void CopyTo(T[] array, int arrayIndex) {
47 lock (m_components)
47 lock (m_lock)
48 m_components.CopyTo(array, arrayIndex);
48 m_components.CopyTo(array, arrayIndex);
49 }
49 }
50
50
@@ -53,7 +53,7 namespace Implab.Components {
53 /// </summary>
53 /// </summary>
54 /// <param name="item">The item to remove.</param>
54 /// <param name="item">The item to remove.</param>
55 public bool Remove(T item) {
55 public bool Remove(T item) {
56 lock (m_components)
56 lock (m_lock)
57 return m_components.Remove(item);
57 return m_components.Remove(item);
58 }
58 }
59
59
@@ -62,7 +62,7 namespace Implab.Components {
62 /// </summary>
62 /// </summary>
63 public int Count {
63 public int Count {
64 get {
64 get {
65 lock (m_components)
65 lock (m_lock)
66 return m_components.Count;
66 return m_components.Count;
67 }
67 }
68 }
68 }
@@ -84,13 +84,12 namespace Implab.Components {
84 /// </summary>
84 /// </summary>
85 /// <returns>The enumerator.</returns>
85 /// <returns>The enumerator.</returns>
86 public IEnumerator<T> GetEnumerator() {
86 public IEnumerator<T> GetEnumerator() {
87 T[] items;
87 T[] items = new T[m_components.Count];
88 lock (m_components) {
88 lock (m_lock) {
89 items = new T[m_components.Count];
90 m_components.CopyTo(items);
89 m_components.CopyTo(items);
90 }
91 return (IEnumerator<T>)items.GetEnumerator();
91 return (IEnumerator<T>)items.GetEnumerator();
92 }
92 }
93 }
94
93
95 System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
94 System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() {
96 return GetEnumerator();
95 return GetEnumerator();
@@ -105,13 +104,15 namespace Implab.Components {
105 /// </remarks>
104 /// </remarks>
106 public void Add(T item) {
105 public void Add(T item) {
107 Safe.ArgumentNotNull(item, "item");
106 Safe.ArgumentNotNull(item, "item");
108
107 bool dispose = false;
109 lock (m_components) {
108 lock (m_lock) {
110 if (IsDisposed)
109 if (IsDisposed)
111 Safe.Dispose(item);
110 dispose = true;
112 else
111 else
113 m_components.Add(item);
112 m_components.Add(item);
114 }
113 }
114 if (dispose)
115 Safe.Dispose(item);
115 }
116 }
116
117
117 /// <summary>
118 /// <summary>
@@ -119,8 +120,10 namespace Implab.Components {
119 /// </summary>
120 /// </summary>
120 /// <param name="disposing">If set to <c>true</c> the collection is disposing.</param>
121 /// <param name="disposing">If set to <c>true</c> the collection is disposing.</param>
121 protected override void Dispose(bool disposing) {
122 protected override void Dispose(bool disposing) {
123 if (disposing)
124 Clear();
125
122 base.Dispose(disposing);
126 base.Dispose(disposing);
123 Clear();
124 }
127 }
125 }
128 }
126 }
129 }
General Comments 3
Under Review
sergey
author
Comment #7
Edit
Delete
|

Auto status change to "Under Review"

Approved
sergey
author
Comment #8
Edit
Delete
|

ok, latest stable version should be in default

You need to be logged in to leave comments. Login now