Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv25660
Modified Files:
CSVReader.java
Log Message:
debugging, generics and tabs
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: CSVReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/CSVReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CSVReader.java 11 Jan 2009 13:43:25 -0000 1.1
+++ CSVReader.java 12 Jan 2009 11:28:19 -0000 1.2
@@ -30,9 +30,9 @@
private static String delimiter = ",";
private static String charset = "UTF-8";
private static Pattern csv_pattern =
Pattern.compile("\"([^\"]+?)\",?|([^,]+),?|,");
- public List lines = new ArrayList(); // list with rows as strings
- public List header = new ArrayList();
- public Map<Integer, ArrayList> rows = new HashMap(); // contains rows
as arrays
+ public List<String> lines = new ArrayList<String>(); // list with rows
as strings
+ public List<String> header = new ArrayList<String>();
+ public Map<Integer, ArrayList> rows = new HashMap<Integer, ArrayList>();
// contains rows as arrays
/**
* Constructor
@@ -63,6 +63,7 @@
* @param charset by default UTF-8
*/
public void readCSV(String filename, String delimiter, String charset) {
+ if (log.isDebugEnabled())
log.debug("filename: " + filename + ", delimiter: " + delimiter
+ ", charset: " + charset);
try {
java.net.URI fileuri =
ResourceLoader.getWebRoot().getResource(filename).toURI();
@@ -75,16 +76,16 @@
String line;
lines.clear(); // make sure they are empty
while((line = in.readLine()) != null) {
- log.debug("line: " + line);
+ if (log.isDebugEnabled()) log.debug("line: " + line);
lines.add(line);
}
in.close();
if (lines.size() > 0) {
header.clear();
rows.clear();
- header = parse( (String) lines.get(0) );
// first could be header
+ header = parse( lines.get(0) ); // first could be header
for (int i = 0; i < lines.size(); i++) {
- rows.put(i, parse( (String) lines.get(i)) );
+ rows.put(i, parse( lines.get(i)) );
}
}
} catch(java.nio.charset.IllegalCharsetNameException ice) {
@@ -105,8 +106,8 @@
* @return the element as a String.
*/
public String getElement(int r, int c) {
- ArrayList row = (ArrayList) rows.get(r);
- String value = (String) row.get(c);
+ ArrayList<String> row = rows.get(r);
+ String value = row.get(c);
return value;
}
@@ -148,10 +149,8 @@
*/
private ArrayList parse(String line) {
ArrayList list = new ArrayList();
- //Pattern p = Pattern.compile(CSV_PATTERN);
Matcher m = csv_pattern.matcher(line);
while (m.find()) {
- //log.debug("found" + m.groupCount());
String match = m.group();
if (match == null) {
break;
@@ -164,7 +163,7 @@
}
if (match.length() == 0)
match = null;
- log.debug("Found match: " + match);
+ if (log.isDebugEnabled()) log.debug("Found match: " + match);
list.add(match);
}
return list;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
