Skip to content

Commit a351742

Browse files
committed
Migrate syntax to allow for cross compilation using Scala 3
1 parent 8fe93df commit a351742

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

src/main/scala/java/util/logging/Formatter.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ abstract class Formatter protected () {
1111
def getTail(h: Handler): String = ""
1212

1313
def formatMessage(record: LogRecord): String = {
14-
val msg = record.getMessage
15-
val params = record.getParameters
14+
val msg = record.getMessage()
15+
val params = record.getParameters()
1616

1717
if (params != null && params.length > 0) {
1818
// The Java spec uses java.text formatting not available in Scala Native

src/main/scala/java/util/logging/Handler.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ abstract class Handler protected () {
4848
def getLevel(): Level = level
4949

5050
def isLoggable(record:LogRecord): Boolean = {
51-
level.intValue() <= record.getLevel.intValue() &&
51+
level.intValue() <= record.getLevel().intValue() &&
5252
(filter == null || filter.isLoggable(record))
5353
}
5454
}

src/main/scala/java/util/logging/Level.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ object Level {
1212
val FINEST: Level = new Level("FINEST", 300)
1313
val ALL: Level = new Level("ALL", Int.MinValue)
1414

15-
private lazy val knownLevels = Map[String, Level](OFF.getName -> OFF,
16-
SEVERE.getName -> SEVERE, WARNING.getName -> WARNING,
17-
INFO.getName -> INFO, CONFIG.getName -> CONFIG, FINE.getName -> FINE,
18-
FINER.getName -> FINER, FINEST.getName -> FINEST, ALL.getName -> ALL)
15+
private lazy val knownLevels = Map[String, Level](OFF.getName() -> OFF,
16+
SEVERE.getName() -> SEVERE, WARNING.getName() -> WARNING,
17+
INFO.getName() -> INFO, CONFIG.getName() -> CONFIG, FINE.getName() -> FINE,
18+
FINER.getName() -> FINER, FINEST.getName() -> FINEST, ALL.getName() -> ALL)
1919

2020
def parse(name: String): Level =
2121
if (name == null) throw new NullPointerException("Name cannot be null")

src/main/scala/java/util/logging/Logger.scala

+7-7
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ object Logger {
4444
}
4545

4646
private def updateChildLoggerParent(newParent: Logger): Unit ={
47-
val prefix = s"${newParent.getName}."
47+
val prefix = s"${newParent.getName()}."
4848
// Traverse all child loggers of the new parent
4949
for ((name, childLogger) <- loggers if name.startsWith(prefix)) {
50-
val currentParent = childLogger.getParent
50+
val currentParent = childLogger.getParent()
5151
// For example, when a new parent a.b is added:
5252
// - if child is a.b.c.d (parent = null) => needs to be a.b.c.d (parent = a.b)
5353
// - if child is a.b.c.e (parent = a.b.c) => no update is required.
54-
if (currentParent == null || !currentParent.getName.startsWith(prefix)) {
54+
if (currentParent == null || !currentParent.getName().startsWith(prefix)) {
5555
childLogger.setParent(newParent)
5656
}
5757
}
@@ -100,9 +100,9 @@ class Logger(name: String, resourceBundle: String) {
100100
private def levelR: Level = {
101101
@tailrec
102102
def go(logger: Logger): Level = {
103-
if (logger.getLevel != null) logger.getLevel
104-
else if (logger.getParent == null) null
105-
else go(logger.getParent)
103+
if (logger.getLevel() != null) logger.getLevel()
104+
else if (logger.getParent() == null) null
105+
else go(logger.getParent())
106106
}
107107

108108
go(this)
@@ -128,7 +128,7 @@ class Logger(name: String, resourceBundle: String) {
128128
}
129129

130130
def log(record: LogRecord): Unit = {
131-
if (isLoggable(record.getLevel)) {
131+
if (isLoggable(record.getLevel())) {
132132
publish(record)
133133
}
134134
}

src/main/scala/java/util/logging/SimpleFormatter.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ class SimpleFormatter extends Formatter {
1111
val fmt =
1212
System.getProperty("java.util.logging.SimpleFormatter.format", defaultFmt)
1313

14-
String.format(fmt, new Date(record.getMillis),
15-
Option(record.getSourceClassName).getOrElse(""),
16-
Option(record.getLoggerName).getOrElse(""),
17-
record.getLevel,
14+
String.format(fmt, new Date(record.getMillis()),
15+
Option(record.getSourceClassName()).getOrElse(""),
16+
Option(record.getLoggerName()).getOrElse(""),
17+
record.getLevel(),
1818
formatMessage(record),
19-
record.getThrown)
19+
record.getThrown())
2020
}
2121
}

src/main/scala/java/util/logging/StreamHandler.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class StreamHandler(private[this] var out: OutputStream,
1919
private[this] var headWritten: Boolean = false
2020

2121
private def encodingOrDefault: Charset =
22-
if (getEncoding == null) Charset.defaultCharset()
23-
else Charset.forName(getEncoding)
22+
if (getEncoding() == null) Charset.defaultCharset()
23+
else Charset.forName(getEncoding())
2424

2525
protected def setOutputStream(out: OutputStream): Unit = {
2626
// Required by javadocs

0 commit comments

Comments
 (0)