Changeset 6210

Timestamp:

05/17/11 10:55:02 (14 years ago)

Author:

epitzer

Message:

Small fixes (typos, static analysis suggestions) (#1530)

Location:

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3

Files:

• Auxiliary/TypeLoader.cs (modified) (4 diffs)
• Auxiliary/TypeName.cs (modified) (5 diffs)
• Auxiliary/TypeNameParser.cs (modified) (1 diff)
• Default/CompositeSerializers/HashSetSerializer.cs (modified) (1 diff)
• Tests/UseCases.cs (modified) (1 diff)

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Auxiliary/TypeLoader.cs

@@ -27 +27 @@
 namespace HeuristicLab.Persistence.Auxiliary {
 
-  internal class TypeLoader {
+  internal static class TypeLoader {
 
     public static Type Load(string typeNameString) {
@@ -33 +33 @@
       try {
         type = Type.GetType(typeNameString, true);
-      }
-      catch (Exception) {
+      } catch (Exception) {
         Logger.Warn(String.Format(
           "Cannot load type \"{0}\", falling back to partial name", typeNameString));
@@ -44 +43 @@
 #pragma warning restore 0618
           type = a.GetType(typeName.ToString(false, false), true);
-        }
-        catch (Exception) {
+        } catch (Exception) {
           throw new PersistenceException(String.Format(
             "Could not load type \"{0}\"",
@@ -63 +61 @@
               typeNameString,
               type.AssemblyQualifiedName));
-        }
-        catch (PersistenceException) {
+        } catch (PersistenceException) {
           throw;
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
           Logger.Warn(String.Format(
             "Could not perform version check requested type was {0} while loaded type is {1}:",

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Auxiliary/TypeName.cs

@@ -84 +84 @@
     /// <value>The assembly attribues.</value>
     [Storable]
-    public Dictionary<string, string> AssemblyAttribues { get; internal set; }
+    public Dictionary<string, string> AssemblyAttributes { get; internal set; }
 
     /// <summary>
@@ -108 +108 @@
       GenericArgs = new List<TypeName>();
       MemoryMagic = "";
-      AssemblyAttribues = new Dictionary<string, string>();
+      AssemblyAttributes = new Dictionary<string, string>();
     }
 
@@ -155 +155 @@
         sb.Append(", ").Append(AssemblyName);
         if (full)
-          foreach (var property in AssemblyAttribues)
+          foreach (var property in AssemblyAttributes)
             sb.Append(", ").Append(property.Key).Append('=').Append(property.Value);
       }
@@ -224 +224 @@
           throw new Exception("Cannot compare versions of different types");
         if (CompareVersions(
-          this.AssemblyAttribues["Version"],
-          typeName.AssemblyAttribues["Version"]) > 0)
+          this.AssemblyAttributes["Version"],
+          typeName.AssemblyAttributes["Version"]) > 0)
           return true;
         IEnumerator<TypeName> thisIt = this.GenericArgs.GetEnumerator();
@@ -255 +255 @@
           this.AssemblyName != typeName.AssemblyName)
           throw new Exception("Cannot compare versions of different types");
-        Version thisVersion = new Version(this.AssemblyAttribues["Version"]);
-        Version tVersion = new Version(typeName.AssemblyAttribues["Version"]);
+        Version thisVersion = new Version(this.AssemblyAttributes["Version"]);
+        Version tVersion = new Version(typeName.AssemblyAttributes["Version"]);
         if (this.AssemblyName == "mscorlib" &&
           (thisVersion.Major == 2 || thisVersion.Major == 4) &&

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Auxiliary/TypeNameParser.cs

@@ -246 +246 @@
           KeyValuePair<string, string> property =
             TransformAssemblyProperty();
-          typeName.AssemblyAttribues.Add(property.Key, property.Value);
+          typeName.AssemblyAttributes.Add(property.Key, property.Value);
         }
       }

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/HashSetSerializer.cs

@@ -73 +73 @@
       }
     }
-
-    public object HashSet { get; set; }
   }
 }

branches/PersistenceSpeedUp/HeuristicLab.Persistence/3.3/Tests/UseCases.cs

@@ -863 +863 @@
         Assert.Fail("Exception expected");
       } catch (PersistenceException pe) {
-        Assert.AreEqual(pe.InnerException.Message, "this constructor will always fail");
+        Assert.AreEqual("this constructor will always fail", pe.InnerException.Message);
       }
     }