x1170 (RT#798250) Accept more column headings in block registration

"Humfre number" for Humfre.
"Spatial location number" for spatial location.

src/main/java/uk/ac/sanger/sccp/stan/service/register/filereader/BlockRegisterFileReader.java

@@ -24,10 +24,10 @@ enum Column implements IColumn {
         Life_stage,
         Collection_date(LocalDate.class, Pattern.compile("(if.*)date.*collection.*", Pattern.CASE_INSENSITIVE)),
         Species,
-        HuMFre,
+        HuMFre(Pattern.compile("humfre\\s*(number)?", Pattern.CASE_INSENSITIVE)),
         Tissue_type,
         External_identifier(Pattern.compile("external\\s*id.*", Pattern.CASE_INSENSITIVE)),
-        Spatial_location(Integer.class),
+        Spatial_location(Integer.class, Pattern.compile("spatial\\s*location\\s*(number)?", Pattern.CASE_INSENSITIVE)),
         Replicate_number,
         Last_known_section(Integer.class, Pattern.compile("last.*section.*", Pattern.CASE_INSENSITIVE)),
         Labware_type,
@@ -47,10 +47,6 @@ enum Column implements IColumn {
             this(null, pattern);
         }
 
-        Column(Class<?> dataType) {
-            this(dataType, null);
-        }
-
         Column(Class<?> dataType, Pattern pattern) {
             this.pattern = (pattern!=null ? pattern : Pattern.compile(this.name().replace("_", "\\s*"), Pattern.CASE_INSENSITIVE));
             this.dataType = (dataType!=null ? dataType : String.class);