Changeset 6618 for branches/GP.Grammar.Editor/HeuristicLab.Common

Timestamp:

08/01/11 17:48:53 (13 years ago)

Author:

mkommend

Message:

#1479: Integrated trunk changes.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Common/3.3

Files:

• HeuristicLabCommonPlugin.cs.frame (modified) (1 diff)
• ObjectExtensions.cs (modified) (3 diffs)
• Properties/AssemblyInfo.frame (modified) (1 diff)

branches/GP.Grammar.Editor/HeuristicLab.Common/3.3/HeuristicLabCommonPlugin.cs.frame

@@ -29 +29 @@
   /// Plugin class for HeuristicLab.Common plugin.
   /// </summary>
-  [Plugin("HeuristicLab.Common", "3.3.4.$WCREV$")]
+  [Plugin("HeuristicLab.Common", "3.3.5.$WCREV$")]
   [PluginFile("HeuristicLab.Common-3.3.dll", PluginFileType.Assembly)]
   public class HeuristicLabCommonPlugin : PluginBase {

branches/GP.Grammar.Editor/HeuristicLab.Common/3.3/ObjectExtensions.cs

@@ -26 +26 @@
 using System.Linq;
 using System.Reflection;
+using System.Threading;
 
 namespace HeuristicLab.Common {
@@ -38 +39 @@
       while (stack.Count > 0) {
         object current = stack.Pop();
-        Type type = obj.GetType();
         objects.Add(current);
 
@@ -71 +71 @@
       Type type = obj.GetType();
 
-      if (type.IsSubclassOfRawGeneric(typeof(Dictionary<,>)) ||
-         type.IsSubclassOfRawGeneric(typeof(SortedDictionary<,>)) ||
-         type.IsSubclassOfRawGeneric(typeof(SortedList<,>)) ||
-         obj is SortedList ||
-         obj is OrderedDictionary ||
-         obj is ListDictionary ||
-         obj is Hashtable) {
+      if (type.IsSubclassOfRawGeneric(typeof(ThreadLocal<>))) {
+        PropertyInfo info = type.GetProperty("Value");
+        object value = info.GetValue(obj, null);
+        if (value != null) yield return value;
+      } else if (type.IsSubclassOfRawGeneric(typeof(Dictionary<,>)) ||
+           type.IsSubclassOfRawGeneric(typeof(SortedDictionary<,>)) ||
+           type.IsSubclassOfRawGeneric(typeof(SortedList<,>)) ||
+           obj is SortedList ||
+           obj is OrderedDictionary ||
+           obj is ListDictionary ||
+           obj is Hashtable) {
         var dictionary = obj as IDictionary;
         foreach (object value in dictionary.Keys)

branches/GP.Grammar.Editor/HeuristicLab.Common/3.3/Properties/AssemblyInfo.frame

@@ -54 +54 @@
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.4.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.5.$WCREV$")]