Changeset 9015

Timestamp:

12/10/12 09:40:03 (11 years ago)

Author:

ascheibe

Message:

#1952 cleaned up Mono code in TypeLoader

File:

• trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeLoader.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Persistence/3.3/Auxiliary/TypeLoader.cs

@@ -74 +74 @@
         // if that fails, try to convert to the corresponding Mono or .NET type
         if (MonoInstalled) {
-          TypeName monoTypeName = GetMonoType(typeName);
-          Logger.Info(String.Format(@"Trying to load Mono type ""{0}"" instead of type ""{1}""",
-                                    monoTypeName, typeNameString));
-          return LoadInternal(monoTypeName);
+          typeName = GetMonoType(typeName);
+          Logger.Info(String.Format(@"Trying to load Mono type ""{0}"" instead of .NET type ""{1}""",
+                                    typeName, typeNameString));
         } else {
-          TypeName dotNetTypeName = GetDotNetType(typeName);
-          Logger.Info(String.Format(@"Trying to load .NET type ""{0}"" instead of type ""{1}""",
-                                    dotNetTypeName, typeNameString));
-          return LoadInternal(dotNetTypeName);
+          typeName = GetDotNetType(typeName);
+          Logger.Info(String.Format(@"Trying to load .NET type ""{0}"" instead of Mono type ""{1}""",
+                                    typeName, typeNameString));
+
         }
+        return LoadInternal(typeName);
+        #endregion
       }
-        #endregion
     }
 
@@ -173 +173 @@
       if (typeName.Namespace == "System" && typeName.ClassName == "MonoType") {
         return cachedWindowsRuntimeType;
-        // maps Mono's string comparer to System.Collections.Generic.ObjectEqualityComparer
+        // maps Mono's string comparer to System.Collections.Generic.ObjectEqualityComparer<string>
       } else if (typeName.Namespace == "System.Collections.Generic" && typeName.ClassName == "InternalStringComparer") {
         TypeName newTypeName = new TypeName(cachedWindowsObjectEqualityComparerType);