- Removed support for notes

4 files changed, 1 insertions, 54 deletions

diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index 87b2d67eb6..0f0a144632 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -481,12 +481,6 @@ public class  Global {
         reporter.warning("warning: " + message);
     }
 
-    /** issue a global note (if in verbose mode)
-     */
-    public void note(String message) {
-        reporter.note("note: " + message);
-    }
-
     /** issue an operation note
      */
     public void operation(String message) {
diff --git a/sources/scalac/Unit.java b/sources/scalac/Unit.java
index 2d78439bc8..5f215b80ec 100644
--- a/sources/scalac/Unit.java
+++ b/sources/scalac/Unit.java
@@ -107,19 +107,6 @@ public class Unit {
         global.reporter.warning(source.getMessage(pos, message), hidden);
     }
 
-    /** issue a note in this compilation unit
-     */
-    public void note(String message) {
-        note(Position.NOPOS, message);
-    }
-
-    /** issue a note in this compilation unit at a specific location
-     */
-    public void note(int pos, String message) {
-        global.reporter.note(source.getMessage(pos, message));
-        notes++;
-    }
-
     /** return a string representation
      */
     public String toString() {
diff --git a/sources/scalac/util/OptionParser.java b/sources/scalac/util/OptionParser.java
index 01eecb2208..4796c96f93 100644
--- a/sources/scalac/util/OptionParser.java
+++ b/sources/scalac/util/OptionParser.java
@@ -112,10 +112,6 @@ public class CommandParser {
     public void warning(String message) {
         reporter.warning(product + ": " + message);
     }
-
-    public void note(String message) {
-        reporter.note(product + ": " + message);
-    }
 }
 
 public abstract class ArgumentParser {
@@ -236,10 +232,6 @@ public abstract class OptionParser extends ArgumentParser {
     public void warning(String message) {
         command.warning("option -" + option + ": " + message);
     }
-
-    public void note(String message) {
-        command.note("option -" + option + ": " + message);
-    }
 }
 /*
 public class OptimizeOptionParser extends OptionParser {
diff --git a/sources/scalac/util/Reporter.java b/sources/scalac/util/Reporter.java
index a1fb832e28..c4a50faf8e 100644
--- a/sources/scalac/util/Reporter.java
+++ b/sources/scalac/util/Reporter.java
@@ -26,8 +26,6 @@ public class Reporter {
     private int errors;
     /** Number of warning issued totally */
     private int warnings;
-    /** Number of notes issued totally */
-    private int notes;
 
     //########################################################################
     // Reporter constructors
@@ -45,7 +43,6 @@ public class Reporter {
         this.nowarn = false;
         this.verbose = false;
         this.errors = 0;
-        this.notes = 0;
     }
 
     //########################################################################
@@ -53,7 +50,7 @@ public class Reporter {
 
     /** Whether warnings should be issued */
     public boolean nowarn;
-    /** Whether notes and information messages should be issued */
+    /** Whether information messages should be issued */
     public boolean verbose;
     /** Whether a prompt should be displayed after errors and warnings */
     public boolean prompt;
@@ -71,11 +68,6 @@ public class Reporter {
         return warnings;
     }
 
-    /** Return the number of notes issued totally */
-    public int notes() {
-        return notes;
-    }
-
     /** Return the number of errors issued totally as a string */
     public String getErrorCountString() {
         return getCountString(errors, "error");
@@ -86,11 +78,6 @@ public class Reporter {
         return getCountString(warnings, "warning");
     }
 
-    /** Return the number of notes issued totally as a string */
-    public String getNoteCountString() {
-        return getCountString(notes, "note");
-    }
-
     public String getCountString(int count, String what) {
         switch (count) {
         case 0: return "no " + what + "s";
@@ -109,7 +96,6 @@ public class Reporter {
     public void resetCounters() {
         errors = 0;
         warnings = 0;
-        notes = 0;
     }
 
     /** Issue a message */
@@ -147,21 +133,9 @@ public class Reporter {
         if (prompt) failOnDemand();
     }
 
-    /** Issue a note */
-    public void note(String message) {
-        note(message, false);
-    }
-
-    /** Issue a note if it is not hidden */
-    public void note(String message, boolean hidden) {
-        if (!hidden) report(message);
-        if (!hidden) notes++;
-    }
-
     public void printSummary() {
         if (errors() > 0) report(getErrorCountString() + " found");
         if (warnings() > 0) report(getWarningCountString() + " found");
-        if (notes() > 0) report(getNoteCountString() + " found");
     }
 
     //########################################################################