Validator: move method from incorrect place

Author: alex-kulakov

Orm/Xtensive.Orm/Orm/Building/Validator.cs

@@ -176,6 +176,31 @@ internal void ValidateVersionField(FieldDef field, bool isKeyField)
           Strings.ExUnableToApplyVersionOnFieldXOfTypeY, field.Name, field.ValueType.GetShortName()));
     }
 
+    public void ValidateHierarchyEquality(TypeDef @interface, HierarchyDef first, HierarchyDef second)
+    {
+      // TypeId mode must match
+      if (first.IncludeTypeId != second.IncludeTypeId)
+        throw new DomainBuilderException(string.Format(
+          Strings.ExImplementorsOfXInterfaceBelongToHierarchiesOneOfWhichIncludesTypeIdButAnotherDoesntYZ,
+          @interface.Name, first.Root.Name, second.Root.Name));
+
+      // Number of key fields must match
+      if (first.KeyFields.Count != second.KeyFields.Count)
+        throw new DomainBuilderException(string.Format(
+          Strings.ExImplementorsOfXInterfaceBelongToHierarchiesWithDifferentKeyStructureYZ,
+          @interface.Name, first.Root.Name, second.Root.Name));
+
+      // Type of each key field must match
+      for (int i = 0; i < first.KeyFields.Count; i++) {
+        var masterField = first.Root.Fields[first.KeyFields[i].Name];
+        var candidateField = second.Root.Fields[second.KeyFields[i].Name];
+        if (masterField.ValueType != candidateField.ValueType)
+          throw new DomainBuilderException(string.Format(
+            Strings.ExImplementorsOfXInterfaceBelongToHierarchiesWithDifferentKeyStructureYZ,
+            @interface.Name, first.Root.Name, second.Root.Name));
+      }
+    }
+
     internal void ValidateType(TypeDef typeDef, HierarchyDef hierarchyDef)
     {
     }
@@ -223,30 +248,5 @@ public Validator(IEnumerable<Type> validFieldTypes)
 
       ValidFieldTypes = new HashSet<Type>(validFieldTypes) {typeof (Key)};
     }
-
-    public void ValidateHierarchyEquality(TypeDef @interface, HierarchyDef first, HierarchyDef second)
-    {
-      // TypeId mode must match
-      if (first.IncludeTypeId != second.IncludeTypeId)
-        throw new DomainBuilderException(string.Format(
-          Strings.ExImplementorsOfXInterfaceBelongToHierarchiesOneOfWhichIncludesTypeIdButAnotherDoesntYZ,
-          @interface.Name, first.Root.Name, second.Root.Name));
-
-      // Number of key fields must match
-      if (first.KeyFields.Count != second.KeyFields.Count)
-        throw new DomainBuilderException(string.Format(
-          Strings.ExImplementorsOfXInterfaceBelongToHierarchiesWithDifferentKeyStructureYZ,
-          @interface.Name, first.Root.Name, second.Root.Name));
-
-      // Type of each key field must match
-      for (int i = 0; i < first.KeyFields.Count; i++) {
-        var masterField = first.Root.Fields[first.KeyFields[i].Name];
-        var candidateField = second.Root.Fields[second.KeyFields[i].Name];
-        if (masterField.ValueType != candidateField.ValueType)
-          throw new DomainBuilderException(string.Format(
-            Strings.ExImplementorsOfXInterfaceBelongToHierarchiesWithDifferentKeyStructureYZ,
-            @interface.Name, first.Root.Name, second.Root.Name));
-      }
-    }
   }
 }