Revert "Use Logger instead of System.out and System.err (#10328)."

This reverts commit a52b0ba902781e5daeffa4f9bc2e48f35eea2c35.

Change-Id: I646c6067cd988f7593996642b22db3818f732d25

4 files changed, 14 insertions, 31 deletions

diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java b/theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
index 35589e0a94..ac244a9582 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java
@@ -23,13 +23,8 @@
  */
 package com.vaadin.sass.internal.parser;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import org.w3c.css.sac.Locator;
 
-import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
-
 /**
  * @version $Revision: 1.2 $
  * @author Philippe Le Hegaret
@@ -56,17 +51,14 @@ public class LocatorImpl implements Locator {
     int line;
     int column;
 
-    @Override
     public String getURI() {
         return uri;
     }
 
-    @Override
     public int getLineNumber() {
         return line;
     }
 
-    @Override
     public int getColumnNumber() {
         return column;
     }
@@ -76,7 +68,7 @@ public class LocatorImpl implements Locator {
      */
     public LocatorImpl(Parser p) {
         if (W3CDebug) {
-            log("LocatorImpl::newLocator(" + p + ");");
+            System.err.println("LocatorImpl::newLocator(" + p + ");");
         }
         uri = p.source.getURI();
         line = p.token.beginLine;
@@ -88,7 +80,8 @@ public class LocatorImpl implements Locator {
      */
     public LocatorImpl(Parser p, Token tok) {
         if (W3CDebug) {
-            log("LocatorImpl::newLocator(" + p + ", " + tok + ");");
+            System.err.println("LocatorImpl::newLocator(" + p + ", " + tok
+                    + ");");
         }
         uri = p.source.getURI();
         line = tok.beginLine;
@@ -100,8 +93,8 @@ public class LocatorImpl implements Locator {
      */
     public LocatorImpl(Parser p, int line, int column) {
         if (W3CDebug) {
-            log("LocatorImpl::newLocator(" + p + ", " + line + ", " + column
-                    + ");");
+            System.err.println("LocatorImpl::newLocator(" + p + ", " + line
+                    + ", " + column + ");");
         }
         uri = p.source.getURI();
         this.line = line;
@@ -113,7 +106,7 @@ public class LocatorImpl implements Locator {
      */
     public LocatorImpl reInit(Parser p) {
         if (W3CDebug) {
-            log("LocatorImpl::reInit(" + p + ");");
+            System.err.println("LocatorImpl::reInit(" + p + ");");
         }
         uri = p.source.getURI();
         line = p.token.beginLine;
@@ -126,7 +119,7 @@ public class LocatorImpl implements Locator {
      */
     public LocatorImpl reInit(Parser p, Token tok) {
         if (W3CDebug) {
-            log("LocatorImpl::reInit(" + p + ", " + tok + ");");
+            System.err.println("LocatorImpl::reInit(" + p + ", " + tok + ");");
         }
         uri = p.source.getURI();
         line = tok.beginLine;
@@ -139,16 +132,12 @@ public class LocatorImpl implements Locator {
      */
     public LocatorImpl reInit(Parser p, int line, int column) {
         if (W3CDebug) {
-            log("LocatorImpl::reInit(" + p + ", " + line + ", " + column + ");");
+            System.err.println("LocatorImpl::reInit(" + p + ", " + line + ", "
+                    + column + ");");
         }
         uri = p.source.getURI();
         this.line = line;
         this.column = column;
         return this;
     }
-
-    private void log(String msg) {
-        Logger.getLogger(SCSSDocumentHandlerImpl.class.getName()).log(
-                Level.SEVERE, msg);
-    }
 }
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
index 79dd65e805..2615ef322f 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
@@ -22,8 +22,6 @@ import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.w3c.css.sac.ConditionFactory;
 import org.w3c.css.sac.Condition;
@@ -1205,7 +1203,7 @@ public class Parser implements org.w3c.css.sac.Parser, ParserConstants {
 
     } finally {
      if (start) {
-     documentHandler.endMedia(ml);
+         documentHandler.endMedia(ml);
      }
     }
   }
@@ -4529,7 +4527,7 @@ boolean isPseudoElement = false;
     jj_consume_token(DEBUG_SYM);
     String content = skipStatementUntilSemiColon();
     // TODO should evaluate the content expression, call documentHandler.debugDirective() etc.
-    Logger.getLogger(Parser.class.getName()).log(Level.INFO, content);
+    System.out.println(content);
     label_138:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -4548,7 +4546,7 @@ boolean isPseudoElement = false;
     jj_consume_token(WARN_SYM);
     String content = skipStatementUntilSemiColon();
     // TODO should evaluate the content expression, call documentHandler.warnDirective() etc.
-    Logger.getLogger(Parser.class.getName()).log(Level.SEVERE, content);
+    System.err.println(content);
     label_139:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
index f4752a502a..196e02878a 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
@@ -40,8 +40,6 @@ import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import org.w3c.css.sac.ConditionFactory;
 import org.w3c.css.sac.Condition;
@@ -1939,7 +1937,7 @@ void debugDirective() :
     { 
     String content = skipStatementUntilSemiColon();
     // TODO should evaluate the content expression, call documentHandler.debugDirective() etc.
-    Logger.getLogger(Parser.class.getName()).log(Level.INFO, content);
+    System.out.println(content);
     }
     (<S>)*
 }
@@ -1951,7 +1949,7 @@ void warnDirective() :
     { 
     String content = skipStatementUntilSemiColon();
     // TODO should evaluate the content expression, call documentHandler.warnDirective() etc.
-    Logger.getLogger(Parser.class.getName()).log(Level.SEVERE, content);
+    System.err.println(content);
     }
     (<S>)*
 }
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
index 0db4e4e2f8..d54ab4fa7e 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java
@@ -21,8 +21,6 @@ import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.w3c.css.sac.ConditionFactory;
 import org.w3c.css.sac.Condition;
 import org.w3c.css.sac.SelectorFactory;