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

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

Revision: 90
          http://svn.sourceforge.net/pzfilereader/?rev=90&view=rev
Author:   benoitx
Date:     2006-10-17 14:39:51 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
Reduce the scope of some variables that now can be declared 'final', this in turn helps the JVM to optimize the runtime code, as well as keeping the memory requirement to a minimum.

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/LargeDataSet.java
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/Version.java
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/LargeDataSet.java
===================================================================

--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/LargeDataSet.java	2006-10-17 21:23:38 UTC (rev 89)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/LargeDataSet.java	2006-10-17 21:39:51 UTC (rev 90)
@@ -325,13 +325,9 @@
     // reads the next record and sets it into the row array
     private boolean readNextDelimited() throws Exception {
         String line = null;
-        Row row = null;
-        List columns = null;
         boolean processingMultiLine = false;
         boolean readRecordOk = false;
         String lineData = "";
-        String mdkey = null;
-        List cmds = null;
 
         if (getRows() == null) {
             setRows(new ArrayList());
@@ -437,10 +433,10 @@
             // ********************************************************************
 
             // column values
-            columns = ParserUtils.splitLine(lineData, this.delimiter, this.qualifier);
+            final List columns = ParserUtils.splitLine(lineData, this.delimiter, this.qualifier);
             lineData = "";
-            mdkey = ParserUtils.getCMDKeyForDelimitedFile(getColumnMD(), columns);
-            cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD());
+            final String mdkey = ParserUtils.getCMDKeyForDelimitedFile(getColumnMD(), columns);
+            final List cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD());
             this.columnCount = cmds.size();
             // DEBUG
 
@@ -466,7 +462,7 @@
                 }
             }
 
-            row = new Row();
+            final Row row = new Row();
             row.setCols(columns);
             row.setRowNumber(lineCount);
             // with the LargeDataSet we are never going to store more than 1
@@ -482,12 +478,7 @@
 
     private boolean readNextFixedLen() throws Exception {
         String line = null;
-        Row row = null;
-        int recordLength = 0;
-        final int aLineCount = 0;
-        int recPosition = 0;
-        String mdkey = null;
-        List cmds = null;
+        final int aLineCount = 0; //+++++++++++++++++++++++++++++++++ Paul this does not seem incremented at all...
         boolean readRecordOk = false;
 
         if (getRows() == null) {
@@ -510,9 +501,9 @@
                 continue;
             }
 
-            mdkey = ParserUtils.getCMDKeyForFixedLengthFile(getColumnMD(), line);
-            recordLength = ((Integer) recordLengths.get(mdkey)).intValue();
-            cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD());
+            final String mdkey = ParserUtils.getCMDKeyForFixedLengthFile(getColumnMD(), line);
+            final int recordLength = ((Integer) recordLengths.get(mdkey)).intValue();
+            final List cmds = ParserUtils.getColumnMetaData(mdkey, getColumnMD());
 
             // Incorrect record length on line log the error. Line will not be
             // included in the
@@ -536,8 +527,8 @@
                 }
             }
 
-            recPosition = 1;
-            row = new Row();
+            int recPosition = 1;
+            final Row row = new Row();
             row.setMdkey(mdkey.equals("detail") ? null : mdkey); // try to
                                                                     // limit the
                                                                     // memory

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/Version.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/Version.java	2006-10-17 21:23:38 UTC (rev 89)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/Version.java	2006-10-17 21:39:51 UTC (rev 90)
@@ -19,5 +19,5 @@
  * Static class which stores the version of this pzFileReader
  */
 public class Version {
-    public static final String VERSION = "2.2.2";
+    public static final String VERSION = "2.3.0";
 }

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java	2006-10-17 21:23:38 UTC (rev 89)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java	2006-10-17 21:39:51 UTC (rev 90)
@@ -54,18 +54,11 @@
      * @return int
      */
     public int compare(final Object arg0, final Object arg1) {
-        OrderColumn oc = null;
-        Comparable comp0 = null;
-        Comparable comp1 = null;
-        Row row0 = null;
-        Row row1 = null;
-        int result = 0;
+        final Row row0 = (Row) arg0;
+        final Row row1 = (Row) arg1;
 
-        row0 = (Row) arg0;
-        row1 = (Row) arg1;
-
         for (int i = 0; i < orderbys.size(); i++) {
-            oc = (OrderColumn) orderbys.get(i);
+            final OrderColumn oc = (OrderColumn) orderbys.get(i);
             
             //null indicates "detail" record which is what the parser assigns to <column> 's setup outside of <record> elements
             //shift all non detail records to the bottom of the DataSet
@@ -77,8 +70,8 @@
             
             // convert to one type of case so the comparator does not take case
             // into account when sorting
-            comp0 = row0.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase();
-            comp1 = row1.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase();
+            final Comparable comp0 = row0.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase();
+            final Comparable comp1 = row1.getValue(ParserUtils.findColumn(oc.getColumnName(), columnMD)).toLowerCase();
 
 //+ BX will never be equal to null.            
 //            if (comp0 == null) {
@@ -89,14 +82,13 @@
 //            }
 
             // multiply by the sort indicator to get a ASC or DESC result
-            result = comp0.compareTo(comp1) * oc.getSortIndicator();
+            final int result = comp0.compareTo(comp1) * oc.getSortIndicator();
 
             // if it is = 0 then the primary sort is done, and it can start the
             // secondary sorts
             if (result != 0) {
                 return result;
             }
-
         }
 
         return 0;

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java	2006-10-17 21:23:38 UTC (rev 89)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java	2006-10-17 21:39:51 UTC (rev 90)
@@ -56,11 +56,6 @@
      */
     public void writeExcelFile() throws Exception {
         WritableWorkbook excelWrkBook = null;
-        WritableSheet wrkSheet = null;
-        final WritableFont times10ptBold = new WritableFont(WritableFont.TIMES, 10, WritableFont.BOLD);
-        final WritableFont times10pt = new WritableFont(WritableFont.TIMES, 10, WritableFont.NO_BOLD);
-        WritableCellFormat cellFormat = null;
-        Label xlsTextLbl = null;
         int curDsPointer = 0;
 
         try {
@@ -72,12 +67,14 @@
             ds.goTop();
 
             excelWrkBook = Workbook.createWorkbook(xlsFile);
-            wrkSheet = excelWrkBook.createSheet("results", 0);
+            final WritableSheet wrkSheet = excelWrkBook.createSheet("results", 0);
 
+            final WritableFont times10ptBold = new WritableFont(WritableFont.TIMES, 10, WritableFont.BOLD);
+            final WritableFont times10pt = new WritableFont(WritableFont.TIMES, 10, WritableFont.NO_BOLD);
             // write the column headings in the spreadsheet
-            cellFormat = new WritableCellFormat(times10ptBold);
+            WritableCellFormat cellFormat = new WritableCellFormat(times10ptBold);
             for (int i = 0; i < columnNames.length; i++) {
-                xlsTextLbl = new Label(i, 0, columnNames[i], cellFormat);
+                final Label xlsTextLbl = new Label(i, 0, columnNames[i], cellFormat);
                 wrkSheet.addCell(xlsTextLbl);
             }
 
@@ -85,9 +82,8 @@
             int row = 1;
             while (ds.next()) {
                 for (int i = 0; i < columnNames.length; i++) {
-                    xlsTextLbl = new Label(i, row, ds.getString(columnNames[i]), cellFormat);
+                    final Label xlsTextLbl = new Label(i, row, ds.getString(columnNames[i]), cellFormat);
                     wrkSheet.addCell(xlsTextLbl);
-
                 }
 
                 row++;

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2006-10-17 21:23:38 UTC (rev 89)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java	2006-10-17 21:39:51 UTC (rev 90)
@@ -59,9 +59,8 @@
      * @deprecated
      */
     public static Map parse(final File xmlFile) throws Exception {
-        Map mdIndex = null;
         final InputStream xmlStream = ParserUtils.createInputStream(xmlFile);
-        mdIndex = parse(xmlStream);
+        Map mdIndex = parse(xmlStream);
         if (mdIndex == null) {
             mdIndex = new LinkedHashMap();
         }
@@ -78,32 +77,26 @@
      * @throws Exception
      */
     public static Map parse(final InputStream xmlStream) throws Exception {
-        Document document = null;
-        SAXBuilder builder = null;
-        Element root = null;
-        List columns = null;
-        Element xmlElement = null;
-        final Map mdIndex = new LinkedHashMap(); // retain the same order
-                                                    // specified in the mapping
-
-        builder = new SAXBuilder();
+        SAXBuilder builder = new SAXBuilder();
         builder.setValidation(true);
         // handle the ability to pull DTD from Jar if needed
         builder.setEntityResolver(new ResolveLocalDTD());
-        document = builder.build(xmlStream);
+        Document document = builder.build(xmlStream);
 
-        root = document.getRootElement();
+        Element root = document.getRootElement();
 
         // lets first get all of the columns that are declared directly under
         // the PZMAP
-        columns = getColumnChildren(root);
+        List columns = getColumnChildren(root);
+        final Map mdIndex = new LinkedHashMap(); // retain the same order
+        // specified in the mapping
         mdIndex.put("detail", columns); // always force detail to the top of the
-                                        // map no matter what
+        // map no matter what
 
         // get all of the "record" elements and the columns under them
         final Iterator recordDescriptors = root.getChildren("RECORD").iterator();
         while (recordDescriptors.hasNext()) {
-            xmlElement = (Element) recordDescriptors.next();
+            Element xmlElement = (Element) recordDescriptors.next();
 
             // make sure the id attribute does not have a value of "detail" this
             // is the harcoded
@@ -132,7 +125,6 @@
 
     // helper to convert to integer
     private static int convertAttributeToInt(final Attribute attribute) {
-
         if (attribute == null) {
             return 0;
         }
@@ -143,19 +135,16 @@
         }
 
         return 0;
-
     }
 
     // helper to retrieve the "COLUMN" elements from the given parent
     private static List getColumnChildren(final Element parent) throws Exception {
         final List columnResults = new ArrayList();
         final Iterator xmlChildren = parent.getChildren("COLUMN").iterator();
-        Element xmlColumn = null;
-        ColumnMetaData cmd = null;
 
         while (xmlChildren.hasNext()) {
-            cmd = new ColumnMetaData();
-            xmlColumn = (Element) xmlChildren.next();
+            ColumnMetaData cmd = new ColumnMetaData();
+            Element xmlColumn = (Element) xmlChildren.next();
 
             // make sure the name attribute is present on the column
             if (xmlColumn.getAttributeValue("name") == null) {
@@ -193,12 +182,12 @@
     }
 
     private static void showDebug(final Map xmlResults) {
-        Iterator columns = null;
         final Iterator mapIt = xmlResults.keySet().iterator();
-        XMLRecordElement xmlrecEle = null;
+//        XMLRecordElement xmlrecEle = null;
         while (mapIt.hasNext()) {
-            xmlrecEle = null;
+            XMLRecordElement xmlrecEle = null;
             final String recordID = (String) mapIt.next();
+            Iterator columns = null;
             if (recordID.equals("detail")) {
                 columns = ((List) xmlResults.get(recordID)).iterator();
             } else {

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java	2006-10-17 21:23:38 UTC (rev 89)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/ResolveLocalDTD.java	2006-10-17 21:39:51 UTC (rev 90)
@@ -37,10 +37,8 @@
     public InputSource resolveEntity(final String publicId, final String systemId) throws SAXException, IOException {
         try {
             if (!systemId.toLowerCase().startsWith("http://")) {
-                URL resource = null;
+                URL resource = getClass().getResource("pzfilereader.dtd");
 
-                resource = getClass().getResource("pzfilereader.dtd");
-
                 if (resource != null) {
                     return new InputSource(resource.openStream());
                 } else {
@@ -52,7 +50,6 @@
         }
 
         // must be pulling from the web, stick with default implementation
-
         return null;
     }
 }


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 15)

flatpack-svn — Subversion commits