phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into unit-test-split

Browse Source
This commit is contained in:
Andreas Dangel
2018-10-05 20:39:22 +02:00
parent 6d00e74142 c48ed19397
commit 1f7c827323
140 changed files with 4530 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-xml/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd</artifactId>
<version>6.8.0-SNAPSHOT</version>
<version>6.9.0-SNAPSHOT</version>
</parent>
<build>

4
pmd-xml/src/main/java/net/sourceforge/pmd/lang/xml/XmlParserOptions.java
View File

@@ -6,6 +6,7 @@ package net.sourceforge.pmd.lang.xml;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Objects;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -14,7 +15,6 @@ import org.xml.sax.SAXException;
import net.sourceforge.pmd.Rule;
import net.sourceforge.pmd.lang.ParserOptions;
import net.sourceforge.pmd.properties.BooleanProperty;
import net.sourceforge.pmd.util.StringUtil;
public class XmlParserOptions extends ParserOptions {
@@ -182,7 +182,7 @@ public class XmlParserOptions extends ParserOptions {
return false;
}
final XmlParserOptions that = (XmlParserOptions) obj;
return StringUtil.isSame(this.suppressMarker, that.suppressMarker, false, false, false)
return Objects.equals(this.suppressMarker, that.suppressMarker)
&& this.coalescing == that.coalescing && this.expandEntityReferences == that.expandEntityReferences
&& this.ignoringComments == that.ignoringComments
&& this.ignoringElementContentWhitespace == that.ignoringElementContentWhitespace