summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2006-11-13 14:59:18 +0000
committermihaylov <mihaylov@epfl.ch>2006-11-13 14:59:18 +0000
commitf3047df95f007d48d0049ff78448d27045b20445 (patch)
tree47e848f238fad00e117a4244ec69c229945301df /src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
parentac255eaf858397ee14b8ffafd8066b100d5e6be4 (diff)
downloadscala-f3047df95f007d48d0049ff78448d27045b20445.tar.gz
scala-f3047df95f007d48d0049ff78448d27045b20445.tar.bz2
scala-f3047df95f007d48d0049ff78448d27045b20445.zip
Replaced == null()eq null(ne null)
Diffstat (limited to 'src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala')
-rw-r--r--src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
index 8c59c21f19..f020e0c6af 100644
--- a/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
+++ b/src/compiler/scala/tools/nsc/reporters/ConsoleReporter.scala
@@ -34,7 +34,7 @@ class ConsoleReporter(reader : BufferedReader, writer : PrintWriter) extends Abs
}
def clabel(severity : Severity) = {
val label0 = label(severity)
- if (label0 == null) "" else label0 + ": "
+ if (label0 eq null) "" else label0 + ": "
}
@@ -69,7 +69,7 @@ class ConsoleReporter(reader : BufferedReader, writer : PrintWriter) extends Abs
/** Prints the message with the given position indication. */
def printMessage(posIn : Position, msg : String) : Unit = {
- if (posIn != null) {
+ if (posIn ne null) {
val pos = posIn.inUltimateSource
val buf = new StringBuilder(msg)
buf.insert(0, " ")
@@ -89,12 +89,12 @@ class ConsoleReporter(reader : BufferedReader, writer : PrintWriter) extends Abs
def print(pos : Position, msg : String, severity : Severity) = printMessage(pos, clabel(severity) + msg)
- def printSourceLine(pos : Position) = if (pos != null && pos.offset != Position.NOPOS) {
+ def printSourceLine(pos : Position) = if ((pos ne null) && pos.offset != Position.NOPOS) {
printMessage(pos.lineContent.stripLineEnd)
printColumnMarker(pos)
}
/** Prints the column marker of the given position. */
- def printColumnMarker(pos : Position) = if (pos != null) {
+ def printColumnMarker(pos : Position) = if (pos ne null) {
val buffer = new StringBuilder(pos.column)
var i = 1
while (i < pos.column) {
@@ -123,7 +123,7 @@ class ConsoleReporter(reader : BufferedReader, writer : PrintWriter) extends Abs
writer.print("r)esume, a)bort: ")
writer.flush()
var line = reader.readLine()
- if (line != null) {
+ if (line ne null) {
line = line.toLowerCase()
if ("abort".startsWith(line))
throw new Error("user abort")