From: <be...@us...> - 2007-07-09 14:50:18
|
Revision: 332 http://flatpack.svn.sourceforge.net/flatpack/?rev=332&view=rev Author: benoitx Date: 2007-07-09 07:50:20 -0700 (Mon, 09 Jul 2007) Log Message: ----------- tidy. Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-17 14:48:09
|
Revision: 376 http://flatpack.svn.sourceforge.net/flatpack/?rev=376&view=rev Author: zepernick Date: 2007-11-17 06:48:09 -0800 (Sat, 17 Nov 2007) Log Message: ----------- fixed some spelling errors in the comments 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 2007-11-06 00:19:56 UTC (rev 375) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2007-11-17 14:48:09 UTC (rev 376) @@ -225,7 +225,7 @@ /** * reads from the specified point in the line and returns how many chars to - * the specified delimter + * the specified delimiter * * @param line * @param start @@ -357,7 +357,7 @@ * @param delimiter * @param qualifier * @param p - * PZParser used to specify additional option when working witht the ColumnMetaData. Can be null + * PZParser used to specify additional option when working with the ColumnMetaData. Can be null * @return ArrayList - ColumnMetaData * @deprecated use the getPZMetaDataFromFile */ @@ -388,7 +388,7 @@ * @param delimiter * @param qualifier * @param p - * PZParser used to specify additional option when working witht the ColumnMetaData. Can be null + * PZParser used to specify additional option when working with the ColumnMetaData. Can be null * @return PZMetaData */ public static MetaData getPZMetaDataFromFile(final String line, final char delimiter, final char qualifier, final Parser p) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2008-02-13 17:35:38
|
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. |
From: <zep...@us...> - 2008-02-13 17:42:17
|
Revision: 395 http://flatpack.svn.sourceforge.net/flatpack/?rev=395&view=rev Author: zepernick Date: 2008-02-13 09:42:21 -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:36:59 UTC (rev 394) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2008-02-13 17:42:21 UTC (rev 395) @@ -402,11 +402,11 @@ for (int i = 0; i < lineData.size(); i++) { final ColumnMetaData cmd = new ColumnMetaData(); cmd.setColName((String) lineData.get(i)); - if (dupCheck.contains(cmd)) { - throw new FPException("Duplicate Column Name In File: " + cmd); + if (dupCheck.contains(cmd.getColName())) { + throw new FPException("Duplicate Column Name In File: " + cmd.getColName()); } results.add(cmd); - dupCheck.add(cmd); + dupCheck.add(cmd.getColName()); } 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. |