change:

- Header tokens uniqueness should be checked outside of the 'HeaderFilePropertyMapper' constructor.
add:
- Add method 'notUnique' in 'TabFileLoader'.

SVN: 2781

common/source/java/ch/systemsx/cisd/common/parser/HeaderFilePropertyMapper.java

@@ -32,7 +32,7 @@ public final class HeaderFilePropertyMapper implements IAliasPropertyMapper
 
     private final Map<String, String> aliases;
 
-    public HeaderFilePropertyMapper(final String[] headerTokens)
+    public HeaderFilePropertyMapper(final String[] headerTokens) throws IllegalArgumentException
     {
         assert headerTokens != null;
         aliases = new HashMap<String, String>();
@@ -47,12 +47,7 @@ public final class HeaderFilePropertyMapper implements IAliasPropertyMapper
             final String token = tokens[i];
             if (token != null)
             {
-                String key = token.toLowerCase();
-                if (map.containsKey(key))
-                {
-                    throw new IllegalArgumentException("Duplicated column name '" + key + "'.");
-                }
-                map.put(key, new MappedProperty(i, token));
+                map.put(token.toLowerCase(), new MappedProperty(i, token));
             }
         }
         return map;

common/source/java/ch/systemsx/cisd/common/parser/TabFileLoader.java

@@ -19,7 +19,9 @@ package ch.systemsx.cisd.common.parser;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
@@ -53,7 +55,7 @@ public class TabFileLoader<T>
      *             names is missing, or a parsing error occurs.
      * @throws EnvironmentFailureException if a IOException occured.
      */
-    public final List<T> load(final File file)
+    public final List<T> load(final File file) throws UserFailureException
     {
         // Just check whether the file exists. Lets <code>FileUtils</code> do the rest.
         if (file.exists() == false)
@@ -68,7 +70,9 @@ public class TabFileLoader<T>
             throw new UserFailureException("No header line found in file '" + file.getAbsolutePath() + "'.");
         }
         final HeaderLineFilter lineFilter = new HeaderLineFilter(headerLine.number);
-        final IAliasPropertyMapper propertyMapper = new HeaderFilePropertyMapper(StringUtils.split(headerLine.text));
+        final String[] tokens = StringUtils.split(headerLine.text, "\t");
+        notUnique(tokens);
+        final IAliasPropertyMapper propertyMapper = new HeaderFilePropertyMapper(tokens);
         parser.setObjectFactory(factory.createFactory(propertyMapper));
         FileReader reader = null;
         try
@@ -88,4 +92,25 @@ public class TabFileLoader<T>
         }
 
     }
+
+    /**
+     * Checks given <var>tokens</var> whether there is no duplicate.
+     * <p>
+     * Note that the search is case-insensitive.
+     * </p>
+     * 
+     * @throws UserFailureException if there is at least one duplicate in the given <var>tokens</var>.
+     */
+    private final static void notUnique(final String[] tokens)
+    {
+        assert tokens != null : "Given tokens can not be null.";
+        final Set<String> unique = new HashSet<String>();
+        for (final String token : tokens)
+        {
+            if (unique.add(token.toLowerCase()) == false)
+            {
+                throw UserFailureException.fromTemplate("Duplicated column name '%s'.", token);
+            }
+        }
+    }
 }