Fix { } formatting.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1460251 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2013-03-24 01:56:44 +00:00
parent 3567ad0acc
commit 68f4892138
1 changed files with 21 additions and 46 deletions

View File

@ -412,84 +412,59 @@ public class CSVFormat implements Serializable {
} }
@Override @Override
public boolean equals(final Object obj) public boolean equals(final Object obj) {
{ if (this == obj) {
if (this == obj)
{
return true; return true;
} }
if (obj == null) if (obj == null) {
{
return false; return false;
} }
if (getClass() != obj.getClass()) if (getClass() != obj.getClass()) {
{
return false; return false;
} }
final CSVFormat other = (CSVFormat) obj; final CSVFormat other = (CSVFormat) obj;
if (delimiter != other.delimiter) if (delimiter != other.delimiter) {
{
return false; return false;
} }
if (quotePolicy != other.quotePolicy) if (quotePolicy != other.quotePolicy) {
{
return false; return false;
} }
if (quoteChar == null) if (quoteChar == null) {
{ if (other.quoteChar != null) {
if (other.quoteChar != null)
{
return false; return false;
} }
} } else if (!quoteChar.equals(other.quoteChar)) {
else if (!quoteChar.equals(other.quoteChar))
{
return false; return false;
} }
if (commentStart == null) if (commentStart == null) {
{ if (other.commentStart != null) {
if (other.commentStart != null)
{
return false; return false;
} }
} } else if (!commentStart.equals(other.commentStart)) {
else if (!commentStart.equals(other.commentStart))
{
return false; return false;
} }
if (escape == null) if (escape == null) {
{ if (other.escape != null) {
if (other.escape != null)
{
return false; return false;
} }
} } else if (!escape.equals(other.escape)) {
else if (!escape.equals(other.escape))
{
return false; return false;
} }
if (!Arrays.equals(header, other.header)) if (!Arrays.equals(header, other.header)) {
{
return false; return false;
} }
if (ignoreSurroundingSpaces != other.ignoreSurroundingSpaces) if (ignoreSurroundingSpaces != other.ignoreSurroundingSpaces) {
{
return false; return false;
} }
if (ignoreEmptyLines != other.ignoreEmptyLines) if (ignoreEmptyLines != other.ignoreEmptyLines) {
{
return false; return false;
} }
if (recordSeparator == null) if (recordSeparator == null) {
{ if (other.recordSeparator != null) {
if (other.recordSeparator != null)
{
return false; return false;
} }
} } else if (!recordSeparator.equals(other.recordSeparator)) {
else if (!recordSeparator.equals(other.recordSeparator))
{
return false; return false;
} }
return true; return true;