- Removed some obsolete references class TextTr...

- Removed some obsolete references class TextTreePrinter and package
printer

12 files changed, 6 insertions, 24 deletions

diff --git a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
index 6dd0bd1ac4..91c38c2184 100644
--- a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
+++ b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
@@ -38,14 +38,7 @@ class TextTreePrinter(global0: scalac_Global, out0: PrintWriter)
   val out: PrintWriter = out0;
 
   //##########################################################################
-  // Public Constructors
-
-  def this(global0: scalac_Global, out0: Writer) =
-    this(global0, new PrintWriter(out0));
-  def this(global0: scalac_Global, stream: OutputStream) =
-    this(global0, new PrintWriter(stream));
-  def this(global0: scalac_Global) =
-    this(global0, System.out);
+  // Protected Fields
 
   protected var indentMargin = 0;
   protected val INDENT_STEP = 2;
diff --git a/sources/scala/tools/scalac/ast/printer/TreeInfo.scala b/sources/scala/tools/scalac/ast/printer/TreeInfo.scala
index 6d233df557..b693ac73b3 100644
--- a/sources/scala/tools/scalac/ast/printer/TreeInfo.scala
+++ b/sources/scala/tools/scalac/ast/printer/TreeInfo.scala
@@ -9,7 +9,6 @@
 import scalac.CompilationUnit;
 import scalac.symtab._;
 import scalac.ast.Tree;
-import scalac.ast.printer._;
 
 import scalac.{Global => scalac_Global, Phase};
 import scalac.CompilationUnit;
diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala
index 9cabf61193..0572c3a448 100644
--- a/sources/scala/tools/scalac/typechecker/Analyzer.scala
+++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala
@@ -18,7 +18,6 @@ import scala.tools.util.Position;
 import scalac._;
 import scalac.util._;
 import scalac.ast._;
-import scalac.ast.printer._;
 import scalac.atree.AConstant;
 import scalac.atree.AConstant$CHAR;
 import scalac.atree.AConstant$INT;
@@ -1731,7 +1730,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
       sym = sym1;
       qual = lastimpcontext.importPrefix().duplicate();
       pre = qual.getType();
-      //new TextTreePrinter().print(name + " => ").print(lastimpcontext.tree).print("." + name).println().end();//DEBUG
+      //System.out.println(name + " => " + lastimpcontext.tree + "." + name);//DEBUG
       tree = make.Select(tree.pos, qual, name);
     }
 
@@ -2104,7 +2103,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer(
     this.pt = pt;
     val tree1: Tree = adapt(transform(tree), mode, pt);
 
-    //new TextTreePrinter().print(tree1).print(": " + tree1.getType()).println().end();//DEBUG
+    //System.out.println(tree1 + ": " + tree1.getType());//DEBUG
 
     this.mode = savedMode;
     this.pt = savedPt;
diff --git a/sources/scala/tools/scalac/typechecker/DeSugarize.scala b/sources/scala/tools/scalac/typechecker/DeSugarize.scala
index 7d8b9d8bde..6b22743e00 100644
--- a/sources/scala/tools/scalac/typechecker/DeSugarize.scala
+++ b/sources/scala/tools/scalac/typechecker/DeSugarize.scala
@@ -16,7 +16,6 @@ import scalac.ast._;
 import scalac.typechecker.Infer;
 import scalac.{Global => scalac_Global, CompilationUnit => scalac_CompilationUnit}
 
-import scala.tools.scalac.ast.printer.TextTreePrinter;
 import scala.tools.scalac.util.NewArray;
 
 package scala.tools.scalac.typechecker {
diff --git a/sources/scala/tools/scalac/typechecker/RefCheck.scala b/sources/scala/tools/scalac/typechecker/RefCheck.scala
index 0137fa3466..dbb7b83d21 100755
--- a/sources/scala/tools/scalac/typechecker/RefCheck.scala
+++ b/sources/scala/tools/scalac/typechecker/RefCheck.scala
@@ -11,7 +11,6 @@ import scala.collection.mutable.HashMap;
 import scalac._;
 import scalac.util._;
 import scalac.ast._;
-import scalac.ast.printer._;
 import scalac.symtab._;
 import Tree._;
 import scalac.{Global => scalac_Global}
diff --git a/sources/scala/tools/scaladoc/ScalaSearch.java b/sources/scala/tools/scaladoc/ScalaSearch.java
index 27575633ae..ec1a8811e4 100644
--- a/sources/scala/tools/scaladoc/ScalaSearch.java
+++ b/sources/scala/tools/scaladoc/ScalaSearch.java
@@ -33,7 +33,6 @@ import scalac.util.Name;
 import scalac.util.NameTransformer;
 
 import java.io.*;
-import scalac.ast.printer.*;
 import scala.tools.scalac.ast.parser.Parser$class;
 import scalac.CompilationUnit;
 
@@ -552,8 +551,7 @@ public class ScalaSearch {
         SourceFile sourceFile = global.getSourceFile("tmp.scala", unitString);
         CompilationUnit tmpUnit = new CompilationUnit(global, sourceFile, false);
         tmpUnit.body = new Parser$class(tmpUnit).parse();
-        //TreePrinter treePrinter = new TextTreePrinter(global, System.out);
-        //treePrinter.print(tmpUnit);
+
         global.PHASE.ANALYZER.phase().apply(new CompilationUnit[]{ tmpUnit });
         if (global.reporter.errors() == errorNumber) {
             Scope tmpScope = tmpUnit.body[0].symbol().members();
diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index dd0de1b26b..bfba148993 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -31,7 +31,7 @@ import scala.tools.util.Reporter;
 
 import scalac.ast.*;
 import scalac.ast.parser.*;
-import scalac.ast.printer.*;
+import scalac.ast.printer.TreePrinter;
 import scalac.atree.ATreePrinter;
 import scalac.backend.Primitives;
 // !!! <<< Interpreter stuff
diff --git a/sources/scalac/Phase.java b/sources/scalac/Phase.java
index 25b046743a..cd3c1a1d5d 100644
--- a/sources/scalac/Phase.java
+++ b/sources/scalac/Phase.java
@@ -8,7 +8,6 @@
 
 package scalac;
 
-import scalac.ast.printer.TreePrinter;
 import scalac.symtab.Symbol;
 import scalac.symtab.Type;
 
diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java
index d6247af62b..169fa67690 100644
--- a/sources/scalac/transformer/LambdaLift.java
+++ b/sources/scalac/transformer/LambdaLift.java
@@ -437,7 +437,7 @@ public class LambdaLift extends OwnerTransformer
               throw new ApplicationError("this should not happen");
               /* // moved this to Uncurry
 	    Tree tree1 = gen.mkNewList(tree.pos, tree.type.typeArgs()[0], transform(args));
-	    //new scalac.ast.printer.TextTreePrinter().print("TUPLE: ").print(tree).print("\n ==> \n").print(tree1).println().end();//DEBUG
+	    //System.out.println("TUPLE: " + tree + "\n ==> \n" + tree1);//DEBUG
 	    return tree1;
               */
 
diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java
index 957d2d3933..28278b8445 100644
--- a/sources/scalac/transformer/matching/AlgebraicMatcher.java
+++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java
@@ -18,7 +18,6 @@ import Tree.*;
 
 import scalac.util.Name ;
 import scalac.util.Names ;
-//import scalac.ast.printer.TextTreePrinter ;
 
 import java.util.Vector ;
 import java.util.Iterator ;
diff --git a/sources/scalac/transformer/matching/NondetWordAutom.java b/sources/scalac/transformer/matching/NondetWordAutom.java
index 143baf22a8..ef10b5366e 100644
--- a/sources/scalac/transformer/matching/NondetWordAutom.java
+++ b/sources/scalac/transformer/matching/NondetWordAutom.java
@@ -7,8 +7,6 @@ import Tree.* ;
 
 import java.util.* ;
 
-//import scala.compiler.printer.TextTreePrinter ;
-
 /** a nondeterministic word automaton.
  *  states are represented (implicitly) as Integer objects.
  */
diff --git a/sources/scalac/transformer/matching/SequenceMatcher.java b/sources/scalac/transformer/matching/SequenceMatcher.java
index 84f85a151a..8b553e3c25 100644
--- a/sources/scalac/transformer/matching/SequenceMatcher.java
+++ b/sources/scalac/transformer/matching/SequenceMatcher.java
@@ -4,7 +4,6 @@ import scalac.*;
 import scalac.ast.Tree;
 import Tree.*;
 
-//import scala.compiler.printer.TextTreePrinter ; // DEBUGGING\
     //import scala.compiler.printer.XMLAutomPrinter ; // DEBUGGING\
 
 import scalac.ast.* ;