Menu
▾
▴
[Pzfilereader-svn] SF.net SVN: pzfilereader: [233] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader
|
From: <zep...@us...> - 2006-12-16 15:15:32
|
Revision: 233
http://svn.sourceforge.net/pzfilereader/?rev=233&view=rev
Author: zepernick
Date: 2006-12-16 07:15:30 -0800 (Sat, 16 Dec 2006)
Log Message:
-----------
cleaned up most of the checkstyle errors.
There are still a couple out there that I am not sure how to
deal with exactly
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-12-16 14:48:21 UTC (rev 232)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-12-16 15:15:30 UTC (rev 233)
@@ -38,10 +38,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.net.URL;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import net.sf.pzfilereader.structure.Row;
import net.sf.pzfilereader.util.FixedWidthParserUtils;
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java 2006-12-16 14:48:21 UTC (rev 232)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataError.java 2006-12-16 15:15:30 UTC (rev 233)
@@ -1,16 +1,34 @@
/*
- Copyright 2006 Paul Zepernick
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software distributed
- under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- CONDITIONS OF ANY KIND, either express or implied. See the License for
- the specific language governing permissions and limitations under the License.
+ * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
package net.sf.pzfilereader;
@@ -21,18 +39,21 @@
* @version 2.0
*/
public class DataError {
+ final private String errorDesc;
- /** Description of error. */
- private String errorDesc;
+ final private int lineNo;
- /** line number in file error occured on. */
- private int lineNo;
+ final private int errorLevel;
/**
- * Severity of the error 1 = Warning 2 = Moderate 3 = Severe.
+ *
+ * @param errorDesc
+ * Text description of the error that occured
+ * @param lineNo
+ * Line number in the data file the error occured on
+ * @param errorLevel
+ * Level of the error (1=warning, 2=moderate, 3=severe)
*/
- private int errorLevel;
-
public DataError(final String errorDesc, final int lineNo, final int errorLevel) {
this.errorDesc = errorDesc;
this.lineNo = lineNo;
@@ -40,13 +61,6 @@
}
/**
- * @deprecated should use the ctor with fields
- *
- */
- public DataError() {
- }
-
- /**
* Returns the errorDesc.
*
* @return String
@@ -72,37 +86,4 @@
public int getLineNo() {
return lineNo;
}
-
- /**
- * Sets the errorDesc.
- *
- * @param errorDesc
- * The errorDesc to set
- * @deprecated the DataError should be immutable (i.e. no Set method)
- */
- public void setErrorDesc(final String errorDesc) {
- this.errorDesc = errorDesc;
- }
-
- /**
- * Sets the errorLevel.
- *
- * @param errorLevel
- * The errorLevel to set
- * @deprecated the DataError should be immutable (i.e. no Set method)
- */
- public void setErrorLevel(final int errorLevel) {
- this.errorLevel = errorLevel;
- }
-
- /**
- * Sets the lineNo.
- *
- * @param lineNo
- * The lineNo to set
- * @deprecated the DataError should be immutable (i.e. no Set method)
- */
- public void setLineNo(final int lineNo) {
- this.lineNo = lineNo;
- }
}
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-16 14:48:21 UTC (rev 232)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-12-16 15:15:30 UTC (rev 233)
@@ -42,8 +42,6 @@
import java.util.Map;
import java.util.Properties;
-import net.sf.pzfilereader.converter.PZConvertException;
-import net.sf.pzfilereader.converter.PZConverter;
import net.sf.pzfilereader.ordering.OrderBy;
import net.sf.pzfilereader.structure.ColumnMetaData;
import net.sf.pzfilereader.structure.Row;
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 14:48:21 UTC (rev 232)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2006-12-16 15:15:30 UTC (rev 233)
@@ -35,28 +35,29 @@
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.TreeMap;
import net.sf.pzfilereader.DefaultDataSet;
import net.sf.pzfilereader.structure.Row;
public class BuffReaderPZDataSet extends DefaultDataSet{
- private BuffReaderDelimPZParser brDelimPzParser;
+ private final BuffReaderDelimPZParser brDelimPzParser;
- private BuffReaderFixedPZParser brFixedPzParser;
+ private final BuffReaderFixedPZParser brFixedPzParser;
public BuffReaderPZDataSet(final Map columnMD2, BuffReaderDelimPZParser brDelimPzParser) {
super(columnMD2);
//register the parser with the dataset so we can fetch rows from
//the bufferedreader as needed
- this.brDelimPzParser = brDelimPzParser;
+ this.brDelimPzParser = brDelimPzParser;
+ this.brFixedPzParser = null;
}
public BuffReaderPZDataSet(final Map columnMD2, BuffReaderFixedPZParser brFixedPzParser) {
super(columnMD2);
//register the parser with the dataset so we can fetch rows from
//the bufferedreader as needed
- this.brFixedPzParser = brFixedPzParser;
+ this.brFixedPzParser = brFixedPzParser;
+ this.brDelimPzParser = null;
}
public boolean next() {
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-12-16 14:48:21 UTC (rev 232)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/ordering/OrderBy.java 2006-12-16 15:15:30 UTC (rev 233)
@@ -57,6 +57,7 @@
public int compare(final Object arg0, final Object arg1) {
final Row row0 = (Row) arg0;
final Row row1 = (Row) arg1;
+ int result = 0;
for (int i = 0; i < orderbys.size(); i++) {
final OrderColumn oc = (OrderColumn) orderbys.get(i);
@@ -70,10 +71,8 @@
// keep headers / trailers in the same order at the bottom of
// the DataSet
return 0;
- } else if (!mdkey0.equals(PZConstants.DETAIL_ID)) {
- return 1;
- } else if (!mdkey1.equals(PZConstants.DETAIL_ID)) {
- return 0;
+ } else if (!mdkey0.equals(PZConstants.DETAIL_ID) || !mdkey1.equals(PZConstants.DETAIL_ID)) {
+ return !mdkey0.equals(PZConstants.DETAIL_ID) ? 1 : 0;
}
// convert to one type of case so the comparator does not take case
@@ -81,25 +80,17 @@
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) {
- // comp0 = new String("");
- // }
- // if (comp1 == null) {
- // comp1 = new String("");
- // }
-
// multiply by the sort indicator to get a ASC or DESC result
- final int result = comp0.compareTo(comp1) * oc.getSortIndicator();
+ 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;
+ break;
}
}
- return 0;
+ return result;
}
/**
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 14:48:21 UTC (rev 232)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2006-12-16 15:15:30 UTC (rev 233)
@@ -102,7 +102,7 @@
* intial capacity of the List size
* @return List
*/
- public static List splitLine(String line, final char delimiter, final char qualifier, int initialSize) {
+ public static List splitLine(final String line, final char delimiter, final char qualifier, int initialSize) {
List list = new ArrayList(initialSize);
if (delimiter == 0) {
@@ -130,7 +130,6 @@
for (int i = 0; i < size; i++) {
final char currentChar = trimmedLine.charAt(i);
- //System.out.println(currentChar);
if (currentChar != delimiter && currentChar != qualifier) {
previousChar = currentChar;
endBlock = i + 1;
@@ -728,17 +727,10 @@
public static int getColumnIndex(final String key, final Map columnMD, final String colName) {
int idx = -1;
if (key != null && !key.equals(PZConstants.DETAIL_ID) && !key.equals(PZConstants.COL_IDX)) {
- // if ("header".equals(key)) {
- // System.out.println("Columsn====header == "+ ((XMLRecordElement)
- // columnMD.get(key)).getColumns());
- // }
idx = ((XMLRecordElement) columnMD.get(key)).getColumnIndex(colName);
} else if (key == null || key.equals(PZConstants.DETAIL_ID)) {
final Map map = (Map) columnMD.get(PZConstants.COL_IDX);
- // System.out.println("Map == " + map);
- // System.out.println("look for == " + colName);
idx = ((Integer) map.get(colName)).intValue();
- // System.out.println("-------------> " + idx);
}
if (idx < 0) {
@@ -770,8 +762,11 @@
*/
public static void closeReader(final Reader reader) {
try {
- reader.close();
- } catch (final Exception ignore) {
+ if (reader != null) {
+ reader.close();
+ }
+ } catch (final IOException ex) {
+ throw new RuntimeException(ex);
}
}
@@ -783,8 +778,11 @@
*/
public static void closeReader(final InputStream reader) {
try {
- reader.close();
- } catch (final Exception ignore) {
+ if (reader != null) {
+ reader.close();
+ }
+ } catch (final IOException ex) {
+ throw new RuntimeException(ex);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
