Replaced == null()eq null(ne null)

Author: mihaylov

src/library/scala/xml/Elem.scala

@@ -28,7 +28,7 @@ case class Elem(override val prefix: String,
                 override val scope: NamespaceBinding,
                 val child: Node*) extends Node {
 
-  if (prefix != null && 0 == prefix.length())
+  if ((null != prefix) && 0 == prefix.length())
     throw new IllegalArgumentException("prefix of zero length, use null instead");
 
   if (null == scope)

src/library/scala/xml/NamespaceBinding.scala

@@ -59,7 +59,7 @@ class NamespaceBinding(val prefix: String,
   def toString(sb: StringBuilder, stop: NamespaceBinding): Unit = {
     if (this ne stop) { // contains?
       sb.append(" xmlns")
-      if (prefix != null) {
+      if (prefix ne null) {
         sb.append(':').append(prefix)
       }
       sb.append('=')

src/library/scala/xml/Node.scala

@@ -67,7 +67,7 @@ abstract class Node extends NodeSeq {
    * @return    the namespace if <code>scope != null</code> and prefix was
    *            found, else <code>null</code>
    */
-  def getNamespace(pre: String) = if (scope == null) null else scope.getURI(pre)
+  def getNamespace(pre: String) = if (scope eq null) null else scope.getURI(pre)
 
   /**
    * Convenience method, looks up an unprefixed attribute in attributes of this node.

src/library/scala/xml/PrefixedAttribute.scala

@@ -21,7 +21,7 @@ class PrefixedAttribute(val pre: String,
                         val value: Seq[Node],
                         val next: MetaData) extends MetaData {
 
-  if(value == null)
+  if(value eq null)
     throw new UnsupportedOperationException("value is null")
 
   /** same as this(key, Utility.parseAttributeValue(value), next) */
@@ -71,7 +71,7 @@ class PrefixedAttribute(val pre: String,
 
 
   /** appends string representation of only this attribute to stringbuffer */
-  def toString1(sb:StringBuilder): Unit = if(value!=null) {
+  def toString1(sb:StringBuilder): Unit = if(value ne null) {
     sb.append(pre)
     sb.append(':')
     sb.append(key)

src/library/scala/xml/UnprefixedAttribute.scala

@@ -18,11 +18,11 @@ import compat.StringBuilder
  */
 class UnprefixedAttribute(val key: String, val value: Seq[Node], next1: MetaData) extends MetaData {
 
-  val next = if(value != null) next1 else next1.remove(key)
+  val next = if(value ne null) next1 else next1.remove(key)
 
   /** same as this(key, Utility.parseAttributeValue(value), next) */
   def this(key: String, value: String, next: MetaData) =
-    this(key, if(value!=null) Text(value) else {val z:NodeSeq=null;z}, next)
+    this(key, if(value ne null) Text(value) else {val z:NodeSeq=null;z}, next)
 
   /** returns a copy of this unprefixed attribute with the given next field*/
   def copy(next: MetaData) =
@@ -58,13 +58,13 @@ class UnprefixedAttribute(val key: String, val value: Seq[Node], next1: MetaData
   /** returns the hashcode.
    */
   override def hashCode() =
-    key.hashCode() * 7 + { if(value!=null) value.hashCode() * 53 else 0 } + next.hashCode()
+    key.hashCode() * 7 + { if(value ne null) value.hashCode() * 53 else 0 } + next.hashCode()
 
   /** returns false */
   final def isPrefixed = false
 
   /** appends string representation of only this attribute to stringbuffer */
-  def toString1(sb:StringBuilder): Unit = if(value!=null) {
+  def toString1(sb:StringBuilder): Unit = if(value ne null) {
     sb.append(key)
     sb.append('=')
     val sb2 = new StringBuilder()

src/library/scala/xml/Utility.scala

@@ -159,7 +159,7 @@ object Utility extends AnyRef with parsing.TokenTests {
         // print tag with namespace declarations
         sb.append('<')
         x.nameToString(sb)
-        if (x.attributes != null) {
+        if (x.attributes ne null) {
           x.attributes.toString(sb)
         }
         x.scope.toString(sb, pscope)
@@ -215,7 +215,7 @@ object Utility extends AnyRef with parsing.TokenTests {
    * @param children
    */
   def hashCode(pre: String, label: String, attribHashCode: Int, scpeHash: Int, children: Seq[Node]) = {
-    ( if(pre!=null) {41 * pre.hashCode() % 7} else {0})
+    ( if(pre ne null) {41 * pre.hashCode() % 7} else {0})
     + label.hashCode() * 53
     + attribHashCode * 7
     + scpeHash * 31
@@ -337,7 +337,7 @@ object Utility extends AnyRef with parsing.TokenTests {
           return "< not allowed in attribute value";
         case '&' =>
           val n = getName(value, i+1);
-          if (n == null)
+          if (n eq null)
             return "malformed entity reference in attribute value ["+value+"]";
           i = i + n.length() + 1
           if (i >= value.length() || value.charAt(i) != ';')
@@ -372,7 +372,7 @@ object Utility extends AnyRef with parsing.TokenTests {
               sb.append(theChar)
 
             case x =>
-              if (rfb==null) rfb = new StringBuilder()
+              if (rfb eq null) rfb = new StringBuilder()
               rfb.append(x)
               c = it.next
               while (c != ';') {

src/library/scala/xml/XML.scala

@@ -151,7 +151,7 @@ object XML  {
   final def write(w: java.io.Writer, node: Node, enc: String, xmlDecl: Boolean, doctype: dtd.DocType): Unit = {
     /* TODO: optimize by giving writer parameter to toXML*/
     if (xmlDecl) w.write("<?xml version='1.0' encoding='" + enc + "'?>\n")
-    if (doctype != null) w.write( doctype.toString() + "\n")
+    if (doctype ne null) w.write( doctype.toString() + "\n")
     w.write(Utility.toXML(node))
   }
 }

src/library/scala/xml/dtd/ElementValidator.scala

@@ -57,7 +57,7 @@ class ElementValidator() extends Function1[Node,Boolean] {
 
             }
             case _ =>
-              x.namespace == null
+              x.namespace eq null
           }}
           . map { x => ElemName(x.label) }
           . elements;

src/library/scala/xml/dtd/ExternalID.scala

@@ -66,7 +66,7 @@ case class PublicID( publicId:String, systemId:String ) extends ExternalID with
     throw new IllegalArgumentException(
       "publicId must consist of PubidChars"
     )
-  if( systemId != null && !checkSysID( systemId ) )
+  if( (systemId ne null) && !checkSysID( systemId ) )
     throw new IllegalArgumentException(
       "can't use both \" and ' in systemId"
     )
@@ -83,7 +83,7 @@ case class PublicID( publicId:String, systemId:String ) extends ExternalID with
   /** appends "PUBLIC "+publicId+" SYSTEM "+systemId to argument */
   override def toString(sb: StringBuilder): StringBuilder = {
     Utility.publicLiteralToString( sb, publicId ).append(' ')
-    if(systemId!=null)
+    if(systemId ne null)
       Utility.systemLiteralToString( sb, systemId )
     else
       sb

src/library/scala/xml/parsing/ExternalSources.scala

@@ -30,7 +30,7 @@ trait ExternalSources requires (ExternalSources with MarkupParser with MarkupHan
     var inputLine:String = null;
 
     //while (inputLine = in.readLine()) != null) {
-    while ({inputLine = in.readLine(); inputLine} != null) {
+    while ({inputLine = in.readLine(); inputLine} ne null) {
       // Console.println(inputLine); // DEBUG
       str.append(inputLine);
       str.append('\n'); // readable output

src/library/scala/xml/parsing/FactoryAdapter.scala

@@ -188,7 +188,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
     // reverse order to get it right
     var v: List[Node] = Nil
     var child: Node = hStack.pop
-    while (child != null) {
+    while (child ne null) {
       v = child::v
       child = hStack.pop
     }
@@ -209,7 +209,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
     curTag = tagStack.pop
 
     capture =
-      if (curTag != null) nodeContainsText(curTag) // root level
+      if (curTag ne null) nodeContainsText(curTag) // root level
       else false
   } // endElement(String,String,String)
 
@@ -243,7 +243,7 @@ abstract class FactoryAdapter extends DefaultHandler() {
     Console.print("] ")
 
     var systemId = ex.getSystemId()
-    if (systemId != null) {
+    if (systemId ne null) {
       val index = systemId.lastIndexOf('/'.asInstanceOf[Int])
       if (index != -1)
         systemId = systemId.substring(index + 1)

src/library/scala/xml/parsing/MarkupParser.scala

@@ -580,7 +580,7 @@ trait MarkupParser requires (MarkupParser with MarkupHandler) extends AnyRef wit
   def parseDTD(): Unit = { // dirty but fast
     //Console.println("(DEBUG) parseDTD");
     var extID: ExternalID = null
-    if (this.dtd != null)
+    if (this.dtd ne null)
       reportSyntaxError("unexpected character (DOCTYPE already defined");
     xToken("DOCTYPE")
     xSpace
@@ -649,7 +649,7 @@ trait MarkupParser requires (MarkupParser with MarkupHandler) extends AnyRef wit
       /*override val */decls      = handle.decls.reverse
     }
     //this.dtd.initializeEntities();
-    if (doc!=null)
+    if (doc ne null)
       doc.dtd = this.dtd
 
     handle.endDTD(n)

src/library/scala/xml/pull/XMLEventReader.scala

@@ -59,7 +59,7 @@ class XMLEventReader extends Iterator[XMLEvent] {
     notifyAll
   }
   def getAndClearEvent: XMLEvent = synchronized {
-    while(xmlEvent == null) {
+    while(xmlEvent eq null) {
       wait()
     }
     val r = xmlEvent