flatpack-svn Mailing List for FlatPack Java API For Flat Files (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 343
          http://flatpack.svn.sourceforge.net/flatpack/?rev=343&view=rev
Author:   benoitx
Date:     2007-08-30 03:39:40 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Tidy up (Checkstyle & co)

Modified Paths:
--------------
    trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java
    trunk/flatpack/src/main/java/net/sf/flatpack/ParserFactory.java
    trunk/flatpack/src/main/java/net/sf/flatpack/util/FPStringUtils.java

Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java
===================================================================

--- trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java	2007-08-20 21:49:18 UTC (rev 342)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java	2007-08-30 10:39:40 UTC (rev 343)
@@ -259,24 +259,20 @@
      * @see net.sf.flatpack.IDataSet#getString(java.lang.String)
      */
     public String getString(final String column) {
-        final String s = getStringValue(column);
+        String s = getStringValue(column);
 
         if (parser.isNullEmptyStrings() && FPStringUtils.isBlank(s)) {
-            return null;
-        }
-
-        if (upperCase) {
+            s = null;
+        } else if (upperCase) {
             // convert data to uppercase before returning
             // return row.getValue(ParserUtils.findColumn(column,
             // cmds)).toUpperCase(Locale.getDefault());
-            return s.toUpperCase(Locale.getDefault());
-        }
-
-        if (lowerCase) {
+            s = s.toUpperCase(Locale.getDefault());
+        }else if (lowerCase) {
             // convert data to lowercase before returning
             // return row.getValue(ParserUtils.findColumn(column,
             // cmds)).toLowerCase(Locale.getDefault());
-            return s.toLowerCase(Locale.getDefault());
+            s = s.toLowerCase(Locale.getDefault());
         }
 
         // return value as how it is in the file
@@ -450,19 +446,18 @@
         this.pointer = pointer;
     }
 
-
     public void clearRows() {
         pointer = -1; //set the pointer back to -1 directly just in case this instance is a BuffReaderDataSet.
         rows.clear();
     }
-    
+
     public void clearAll() {
         clearRows();
         clearErrors();
     }
-    
+
     public void clearErrors() {
-       errors.clear();        
+        errors.clear();
     }
 
     public MetaData getMetaData() {
@@ -482,21 +477,21 @@
         buf.append("MetaData:").append(metaData).append(System.getProperty("line.separator"));
         return buf.toString();
     }
-    
+
     public boolean contains(String column) {
         if (pointer == -1) {
             throw new IndexOutOfBoundsException("dataset on invalid row. need to call next()");
-        }     
-        
-        final Iterator cmds = ParserUtils.getColumnMetaData(((Row) rows.get(pointer)).getMdkey(), metaData).iterator();        
+        }
+
+        final Iterator cmds = ParserUtils.getColumnMetaData(((Row) rows.get(pointer)).getMdkey(), metaData).iterator();
         while (cmds.hasNext()) {
-            final ColumnMetaData cmd = (ColumnMetaData)cmds.next();
+            final ColumnMetaData cmd = (ColumnMetaData) cmds.next();
             if (cmd.getColName().equalsIgnoreCase(column)) {
                 return true;
             }
         }
-        
+
         return false;
-        
+
     }
 }

Modified: trunk/flatpack/src/main/java/net/sf/flatpack/ParserFactory.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/ParserFactory.java	2007-08-20 21:49:18 UTC (rev 342)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/ParserFactory.java	2007-08-30 10:39:40 UTC (rev 343)
@@ -218,8 +218,8 @@
      *            skips the first line that contains data in the file
      * @return PZParser
      */
-    Parser newDelimitedParser(final Connection con, final Reader dataSource, final String dataDefinition, final char delimiter, final char qualifier,
-            final boolean ignoreFirstRecord);
+    Parser newDelimitedParser(final Connection con, final Reader dataSource, final String dataDefinition, final char delimiter, 
+            final char qualifier, final boolean ignoreFirstRecord);
 
     /**
      * Constructs a new DataSet using the PZMAP XML file layout method. This is
@@ -244,7 +244,7 @@
      *            The File can be wrapped in a "new FileReader(File)"
      * @return PZParser
      */
-    Parser newDelimitedParser(final File pzmapXML, final File dataSource, final char delimiter, final char qualifier, 
+    Parser newDelimitedParser(final File pzmapXML, final File dataSource, final char delimiter, final char qualifier,
             final boolean ignoreFirstRecord);
 
     /**

Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/FPStringUtils.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/FPStringUtils.java	2007-08-20 21:49:18 UTC (rev 342)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/FPStringUtils.java	2007-08-30 10:39:40 UTC (rev 343)
@@ -7,9 +7,8 @@
  */
 public final class FPStringUtils {
     private FPStringUtils() {
-        
     }
-    
+
     /**
      * <p>Checks if a String is whitespace, empty ("") or null.</p>
      *


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




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (112)	Nov (44)	Dec (49)
2007	Jan (14)	Feb (12)	Mar (12)	Apr (12)	May (6)	Jun (11)	Jul (10)	Aug (6)	Sep (17)	Oct (3)	Nov (22)	Dec
2008	Jan (3)	Feb (7)	Mar (2)	Apr	May	Jun	Jul	Aug (3)	Sep (6)	Oct	Nov	Dec
2009	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb (1)	Mar (9)	Apr	May	Jun	Jul	Aug	Sep	Oct (4)	Nov (2)	Dec
2011	Jan	Feb	Mar (1)	Apr	May	Jun (3)	Jul	Aug (1)	Sep	Oct	Nov	Dec (1)
2012	Jan (3)	Feb	Mar (2)	Apr (8)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

flatpack-svn Mailing List for FlatPack Java API For Flat Files (Page 5)

flatpack-svn — Subversion commits