You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2011/11/09 15:31:40 UTC
svn commit: r1199772 - in
/commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv:
CSVParser.java CSVStrategy.java
Author: ebourg
Date: Wed Nov 9 14:31:40 2011
New Revision: 1199772
URL: http://svn.apache.org/viewvc?rev=1199772&view=rev
Log:
Removed the deprecated constructors
Modified:
commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVStrategy.java
Modified: commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
URL: http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java?rev=1199772&r1=1199771&r2=1199772&view=diff
==============================================================================
--- commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java (original)
+++ commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java Wed Nov 9 14:31:40 2011
@@ -14,11 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.commons.csv;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
@@ -118,16 +117,6 @@ public class CSVParser {
// ======================================================
/**
- * Default strategy for the parser follows the default {@link CSVStrategy}.
- *
- * @param input an InputStream containing "csv-formatted" stream
- * @deprecated use {@link #CSVParser(Reader)}.
- */
- public CSVParser(InputStream input) {
- this(new InputStreamReader(input));
- }
-
- /**
* CSV parser using the default {@link CSVStrategy}.
*
* @param input a Reader containing "csv-formatted" input
@@ -137,37 +126,6 @@ public class CSVParser {
}
/**
- * Customized value delimiter parser.
- * <p/>
- * The parser follows the default {@link CSVStrategy}
- * except for the delimiter setting.
- *
- * @param input a Reader based on "csv-formatted" input
- * @param delimiter a Char used for value separation
- * @deprecated use {@link #CSVParser(Reader, CSVStrategy)}.
- */
- public CSVParser(Reader input, char delimiter) {
- this(input, delimiter, '"', CSVStrategy.COMMENTS_DISABLED);
- }
-
- /**
- * Customized csv parser.
- * <p/>
- * The parser parses according to the given CSV dialect settings.
- * Leading whitespaces are truncated, unicode escapes are
- * not interpreted and empty lines are ignored.
- *
- * @param input a Reader based on "csv-formatted" input
- * @param delimiter a Char used for value separation
- * @param encapsulator a Char used as value encapsulation marker
- * @param commentStart a Char used for comment identification
- * @deprecated use {@link #CSVParser(Reader, CSVStrategy)}.
- */
- public CSVParser(Reader input, char delimiter, char encapsulator, char commentStart) {
- this(input, new CSVStrategy(delimiter, encapsulator, commentStart));
- }
-
- /**
* Customized CSV parser using the given {@link CSVStrategy}
*
* @param input a Reader containing "csv-formatted" input
Modified: commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVStrategy.java
URL: http://svn.apache.org/viewvc/commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVStrategy.java?rev=1199772&r1=1199771&r2=1199772&view=diff
==============================================================================
--- commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVStrategy.java (original)
+++ commons/sandbox/csv/trunk/src/main/java/org/apache/commons/csv/CSVStrategy.java Wed Nov 9 14:31:40 2011
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.commons.csv;
import java.io.Serializable;
@@ -51,7 +52,7 @@ public class CSVStrategy implements Clon
public CSVStrategy(char delimiter, char encapsulator, char commentStart) {
- this(delimiter, encapsulator, commentStart, true, false, true);
+ this(delimiter, encapsulator, commentStart, ESCAPE_DISABLED, true, true, false, true);
}
/**
@@ -85,20 +86,6 @@ public class CSVStrategy implements Clon
this.ignoreEmptyLines = ignoreEmptyLines;
}
- /**
- * @deprecated
- */
- public CSVStrategy(
- char delimiter,
- char encapsulator,
- char commentStart,
- boolean ignoreLeadingWhitespaces,
- boolean interpretUnicodeEscapes,
- boolean ignoreEmptyLines) {
- this(delimiter, encapsulator, commentStart, CSVStrategy.ESCAPE_DISABLED, ignoreLeadingWhitespaces,
- true, interpretUnicodeEscapes, ignoreEmptyLines);
- }
-
public void setDelimiter(char delimiter) {
this.delimiter = delimiter;
}