SI-7469 Remove @deprecated scala.util.logging

9 files changed, 19 insertions, 94 deletions

diff --git a/src/library/scala/util/logging/ConsoleLogger.scala b/src/library/scala/util/logging/ConsoleLogger.scala
deleted file mode 100644
index 5e3d957534..0000000000
--- a/src/library/scala/util/logging/ConsoleLogger.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-
-
-package scala
-package util.logging
-
-/**
- *  The trait `ConsoleLogger` is mixed into a concrete class who
- *  has class `Logged` among its base classes.
- *
- *  @author  Burak Emir
- *  @version 1.0
- */
-@deprecated("This class will be removed.", "2.10.0")
-trait ConsoleLogger extends Logged {
-
-  /** logs argument to Console using [[scala.Console.println]]
-   */
-  override def log(msg: String): Unit = Console.println(msg)
-}
diff --git a/src/library/scala/util/logging/Logged.scala b/src/library/scala/util/logging/Logged.scala
deleted file mode 100644
index 1fc12588db..0000000000
--- a/src/library/scala/util/logging/Logged.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-/*                     __                                               *\
-**     ________ ___   / /  ___     Scala API                            **
-**    / __/ __// _ | / /  / _ |    (c) 2003-2013, LAMP/EPFL             **
-**  __\ \/ /__/ __ |/ /__/ __ |                                         **
-** /____/\___/_/ |_/____/_/ | |                                         **
-**                          |/                                          **
-\*                                                                      */
-
-package scala
-package util.logging
-
-/** Mixing in Logged indicates that a class provides support for logging.
-  *
-  * For instance:
-  * {{{
-  * // The developer of the library writes:
-  * class MyClass extends Logged {
-  *   // do stuff, call log
-  * }
-  *
-  * // The user of the library instantiates:
-  * val x = new MyClass() with ConsoleLogger
-  * }}}
-  * and the logging is sent to the [[scala.util.logging.ConsoleLogger]] object.
-  */
-@deprecated("This class will be removed.", "2.10.0")
-trait Logged {
-  /** This method should log the message given as argument somewhere
-   *  as a side-effect.
-   *
-   *  @param msg  message to be logged
-   */
-  def log(msg: String): Unit = {}
-}
diff --git a/src/library/scala/xml/factory/LoggedNodeFactory.scala b/src/library/scala/xml/factory/LoggedNodeFactory.scala
index 63b4f42150..bc074bfc83 100644
--- a/src/library/scala/xml/factory/LoggedNodeFactory.scala
+++ b/src/library/scala/xml/factory/LoggedNodeFactory.scala
@@ -15,8 +15,9 @@ package factory
 {{{
 object testLogged extends App {
   val x = new scala.xml.parsing.NoBindingFactoryAdapter
-        with scala.xml.factory.LoggedNodeFactory[scala.xml.Elem]
-        with scala.util.logging.ConsoleLogger
+              with scala.xml.factory.LoggedNodeFactory[scala.xml.Elem] {
+            override def log(s: String) = println(s)
+          }
 
   Console.println("Start")
   val doc = x.load(new java.net.URL("http://example.com/file.xml"))
@@ -28,7 +29,8 @@ object testLogged extends App {
  *  @author  Burak Emir
  *  @version 1.0
  */
-trait LoggedNodeFactory[A <: Node] extends NodeFactory[A] with scala.util.logging.Logged {
+@deprecated("This trait will be removed.", "2.11")
+trait LoggedNodeFactory[A <: Node] extends NodeFactory[A] {
   // configuration values
   val logNode      = true
   val logText      = false
@@ -83,4 +85,6 @@ trait LoggedNodeFactory[A <: Node] extends NodeFactory[A] with scala.util.loggin
     super.makeProcInstr(t, s)
   }
 
+  @deprecated("This method and its usages will be removed. Use a debugger to debug code.", "2.11")
+  def log(msg: String): Unit = {}
 }
diff --git a/src/library/scala/xml/parsing/MarkupHandler.scala b/src/library/scala/xml/parsing/MarkupHandler.scala
index 0daabedf1c..1ebffb9c90 100755
--- a/src/library/scala/xml/parsing/MarkupHandler.scala
+++ b/src/library/scala/xml/parsing/MarkupHandler.scala
@@ -14,7 +14,6 @@ package parsing
 
 import scala.collection.mutable
 import scala.io.Source
-import scala.util.logging.Logged
 import scala.xml.dtd._
 
 /** class that handles markup - provides callback methods to MarkupParser.
@@ -26,8 +25,8 @@ import scala.xml.dtd._
  *  @todo can we ignore more entity declarations (i.e. those with extIDs)?
  *  @todo expanding entity references
  */
-abstract class MarkupHandler extends Logged
-{
+abstract class MarkupHandler {
+
   /** returns true is this markup handler is validating */
   val isValidating: Boolean = false
 
@@ -122,4 +121,7 @@ abstract class MarkupHandler extends Logged
   def unparsedEntityDecl(name: String, extID: ExternalID, notat: String): Unit = ()
   def notationDecl(notat: String, extID: ExternalID): Unit = ()
   def reportSyntaxError(pos: Int, str: String): Unit
+
+  @deprecated("This method and its usages will be removed. Use a debugger to debug code.", "2.11")
+  def log(msg: String): Unit = {}
 }
diff --git a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala
index cec6b358ff..1b20901249 100644
--- a/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala
+++ b/src/library/scala/xml/parsing/ValidatingMarkupHandler.scala
@@ -13,9 +13,8 @@ package xml
 package parsing
 
 import scala.xml.dtd._
-import scala.util.logging.Logged
 
-abstract class ValidatingMarkupHandler extends MarkupHandler with Logged {
+abstract class ValidatingMarkupHandler extends MarkupHandler {
 
   var rootLabel:String = _
   var qStack: List[Int] = Nil
@@ -26,20 +25,6 @@ abstract class ValidatingMarkupHandler extends MarkupHandler with Logged {
 
   final override val isValidating = true
 
-  override def log(msg: String) {}
-
-  /*
-  override def checkChildren(pos: Int, pre: String, label:String,ns:NodeSeq): Unit = {
-    Console.println("checkChildren()");
-    val decl = lookupElemDecl(label);
-    // @todo: nice error message
-    val res = decl.contentModel.validate(ns);
-    Console.println("res = "+res);
-    if(!res)
-      //sys.error("invalid!");
-  }
-  */
-
   override def endDTD(n:String) = {
     rootLabel = n
   }
@@ -116,5 +101,4 @@ abstract class ValidatingMarkupHandler extends MarkupHandler with Logged {
 
   /** report a syntax error */
   def reportValidationError(pos: Int, str: String): Unit
-
 }
diff --git a/src/library/scala/xml/persistent/CachedFileStorage.scala b/src/library/scala/xml/persistent/CachedFileStorage.scala
index 347c11651c..57d512a041 100644
--- a/src/library/scala/xml/persistent/CachedFileStorage.scala
+++ b/src/library/scala/xml/persistent/CachedFileStorage.scala
@@ -14,7 +14,7 @@ import java.io.{ File, FileOutputStream }
 import java.nio.ByteBuffer
 import java.nio.channels.Channels
 import java.lang.Thread
-import scala.util.logging.Logged
+
 import scala.collection.Iterator
 
 /** Mutable storage of immutable xml trees. Everything is kept in memory,
@@ -26,7 +26,7 @@ import scala.collection.Iterator
  *
  *  @author Burak Emir
  */
-abstract class CachedFileStorage(private val file1: File) extends Thread with Logged {
+abstract class CachedFileStorage(private val file1: File) extends Thread {
 
   private val file2 = new File(file1.getParent, file1.getName+"$")
 
@@ -123,4 +123,7 @@ abstract class CachedFileStorage(private val file1: File) extends Thread with Lo
     this.dirty = true
     save()
   }
+
+  @deprecated("This method and its usages will be removed. Use a debugger to debug code.", "2.11")
+  def log(msg: String): Unit = {}
 }
diff --git a/test/files/jvm/xml01.scala b/test/files/jvm/xml01.scala
index 2fab650637..75777a5b94 100644
--- a/test/files/jvm/xml01.scala
+++ b/test/files/jvm/xml01.scala
@@ -1,7 +1,6 @@
 import java.io.StringReader
 import org.xml.sax.InputSource
 
-import scala.util.logging._
 import scala.xml._
 
 object Test extends App {
diff --git a/test/files/pos/t1648.scala b/test/files/pos/t1648.scala
deleted file mode 100644
index 6d53ce11ee..0000000000
--- a/test/files/pos/t1648.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test {
-  class MyClass extends scala.util.logging.Logged { }
-  val x = new MyClass with scala.util.logging.ConsoleLogger
-}
diff --git a/test/files/scalacheck/avl.scala b/test/files/scalacheck/avl.scala
index af79ad49e3..02003bd271 100644
--- a/test/files/scalacheck/avl.scala
+++ b/test/files/scalacheck/avl.scala
@@ -2,14 +2,12 @@ import org.scalacheck.Gen
 import org.scalacheck.Prop.forAll
 import org.scalacheck.Properties
 
-import util.logging.ConsoleLogger
-
 package scala.collection.mutable {
 
   /**
    * Property of an AVL Tree : Any node of the tree has a balance value beetween in [-1; 1]
    */
-  abstract class AVLTreeTest(name: String) extends Properties(name) with ConsoleLogger {
+  abstract class AVLTreeTest(name: String) extends Properties(name) {
 
     def `2^`(n: Int) = (1 to n).fold(1)((a, b) => b*2)