[flatpack-svn] SF.net SVN: flatpack: [393] trunk/flatpack/src/main/java/net/sf/flatpack/ util/ParserUtils.java

[<zep...@us...>]

Revision: 393
          http://flatpack.svn.sourceforge.net/flatpack/?rev=393&view=rev
Author:   zepernick
Date:     2008-02-13 09:35:41 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
prevent duplicate column names when using column names from file header

Modified Paths:
--------------
    trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java

Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java	2008-02-13 17:30:39 UTC (rev 392)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java	2008-02-13 17:35:41 UTC (rev 393)
@@ -47,6 +47,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -54,6 +55,7 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Properties;
+import java.util.Set;
 import java.util.Map.Entry;
 
 import net.sf.flatpack.Parser;
@@ -394,15 +396,17 @@
     public static MetaData getPZMetaDataFromFile(final String line, final char delimiter, final char qualifier, final Parser p) {
         List lineData = null;
         final List results = new ArrayList();
+        final Set dupCheck = new HashSet();
 
         lineData = splitLine(line, delimiter, qualifier, FPConstants.SPLITLINE_SIZE_INIT);
         for (int i = 0; i < lineData.size(); i++) {
             final ColumnMetaData cmd = new ColumnMetaData();
             cmd.setColName((String) lineData.get(i));
-            if (results.contains(cmd)) {
+            if (dupCheck.contains(cmd)) {
             	throw new FPException("Duplicate Column Name In File: " + cmd);
             }
             results.add(cmd);
+            dupCheck.add(cmd);
         }
 
         return new MetaData(results, buidColumnIndexMap(results, p));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.