summaryrefslogtreecommitdiffstats
path: root/theme-compiler
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-02-04 16:27:08 +0000
committerArtur Signell <artur@vaadin.com>2014-02-04 16:27:08 +0000
commit36266a0a450aa6ed59ed30286c8c5cb67876e5d0 (patch)
treecbc5ed28ef756f0b9759fe820e4b5bec8db1410a /theme-compiler
parenta52b0ba902781e5daeffa4f9bc2e48f35eea2c35 (diff)
downloadvaadin-framework-36266a0a450aa6ed59ed30286c8c5cb67876e5d0.tar.gz
vaadin-framework-36266a0a450aa6ed59ed30286c8c5cb67876e5d0.zip
Revert "Use Logger instead of System.out and System.err (#10328)."
This reverts commit a52b0ba902781e5daeffa4f9bc2e48f35eea2c35. Change-Id: I646c6067cd988f7593996642b22db3818f732d25
Diffstat (limited to 'theme-compiler')
-rw-r--r--theme-compiler/build.xml3
-rw-r--r--theme-compiler/src/com/vaadin/sass/CustomConsoleHandler.java52
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java17
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java33
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java36
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/LocatorImpl.java29
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java8
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj6
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java2
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java13
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java5
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java5
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java5
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java6
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java12
-rw-r--r--theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java8
-rw-r--r--theme-compiler/src/logging.properties2
17 files changed, 57 insertions, 185 deletions
diff --git a/theme-compiler/build.xml b/theme-compiler/build.xml
index 324934bd10..03d0531a68 100644
--- a/theme-compiler/build.xml
+++ b/theme-compiler/build.xml
@@ -20,7 +20,8 @@
</path>
<path id="classpath.test.custom" />
- <property name="classes.exclude" value="**/*.properties"/>
+ <!--<property name="classes.exclude" value="com/vaadin/buildhelpers/**"
+ /> -->
<target name="parser">
<!-- Copy javacc-5.0.jar to ${result.dir}/javacc/javacc.jar as the
diff --git a/theme-compiler/src/com/vaadin/sass/CustomConsoleHandler.java b/theme-compiler/src/com/vaadin/sass/CustomConsoleHandler.java
deleted file mode 100644
index 44c9e345db..0000000000
--- a/theme-compiler/src/com/vaadin/sass/CustomConsoleHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2000-2013 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.sass;
-
-import java.io.PrintStream;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-
-/**
- *
- * @since
- * @author Vaadin Ltd
- */
-public class CustomConsoleHandler extends ConsoleHandler {
-
- private ConsoleHandler stdoutHandler;
-
- public CustomConsoleHandler() {
- PrintStream err = System.err;
- /*
- * ConsoleHandler uses System.err to output all messages. Replace
- * System.err temporary to construct ConsoleHandler and set it back
- * after construction.
- */
- System.setErr(System.out);
- stdoutHandler = new ConsoleHandler();
- System.setErr(err);
- }
-
- @Override
- public void publish(LogRecord record) {
- if (!Level.SEVERE.equals(record.getLevel())) {
- stdoutHandler.publish(record);
- } else {
- super.publish(record);
- }
- }
-}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
index 63f59cdfab..ed6b98f5ac 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/ScssStylesheet.java
@@ -24,13 +24,11 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.logging.LogManager;
import java.util.logging.Logger;
import org.w3c.css.sac.CSSException;
import org.w3c.css.sac.InputSource;
-import com.vaadin.buildhelpers.CompileTheme;
import com.vaadin.sass.internal.handler.SCSSDocumentHandler;
import com.vaadin.sass.internal.handler.SCSSDocumentHandlerImpl;
import com.vaadin.sass.internal.handler.SCSSErrorHandler;
@@ -459,19 +457,4 @@ public class ScssStylesheet extends Node {
public void setCharset(String charset) {
this.charset = charset;
}
-
- static {
- String logFile = System.getProperty("java.util.logging.config.file");
- if (logFile == null) {
- try {
- LogManager.getLogManager().readConfiguration(
- CompileTheme.class
- .getResourceAsStream("/logging.properties"));
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
index aa6d39fd77..99f00e3889 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSDocumentHandlerImpl.java
@@ -20,8 +20,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Stack;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.css.sac.CSSException;
import org.w3c.css.sac.InputSource;
@@ -100,7 +98,7 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
public ForNode forDirective(String var, String from, String to,
boolean exclusive, String body) {
ForNode node = new ForNode(var, from, to, exclusive, body);
- log(node);
+ System.out.println(node);
return node;
}
@@ -128,7 +126,7 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
@Override
public WhileNode whileDirective(String condition, String body) {
WhileNode node = new WhileNode(condition, body);
- log(node);
+ System.out.println(node);
return node;
}
@@ -140,14 +138,14 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
@Override
public void ignorableAtRule(String atRule) throws CSSException {
- log("ignorableAtRule(String atRule): " + atRule);
+ System.out.println("ignorableAtRule(String atRule): " + atRule);
}
@Override
public void namespaceDeclaration(String prefix, String uri)
throws CSSException {
- log("namespaceDeclaration(String prefix, String uri): " + prefix + ", "
- + uri);
+ System.out.println("namespaceDeclaration(String prefix, String uri): "
+ + prefix + ", " + uri);
}
@Override
@@ -169,14 +167,14 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
@Override
public void startPage(String name, String pseudo_page) throws CSSException {
- log("startPage(String name, String pseudo_page): " + name + ", "
- + pseudo_page);
+ System.out.println("startPage(String name, String pseudo_page): "
+ + name + ", " + pseudo_page);
}
@Override
public void endPage(String name, String pseudo_page) throws CSSException {
- log("endPage(String name, String pseudo_page): " + name + ", "
- + pseudo_page);
+ System.out.println("endPage(String name, String pseudo_page): " + name
+ + ", " + pseudo_page);
}
@Override
@@ -388,17 +386,4 @@ public class SCSSDocumentHandlerImpl implements SCSSDocumentHandler {
public void endIncludeContentBlock() {
nodeStack.pop();
}
-
- private void log(Object object) {
- if (object != null) {
- log(object.toString());
- } else {
- log(null);
- }
- }
-
- private void log(String msg) {
- Logger.getLogger(SCSSDocumentHandlerImpl.class.getName()).log(
- Level.INFO, msg);
- }
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
index a7c65073ee..0d48da34e4 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/handler/SCSSErrorHandler.java
@@ -15,8 +15,7 @@
*/
package com.vaadin.sass.internal.handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.io.PrintStream;
import org.w3c.css.sac.CSSException;
import org.w3c.css.sac.CSSParseException;
@@ -24,33 +23,38 @@ import org.w3c.css.sac.ErrorHandler;
public class SCSSErrorHandler implements ErrorHandler {
+ private PrintStream errorStream;
+
+ public SCSSErrorHandler(PrintStream errorStream) {
+ this.errorStream = errorStream;
+ }
+
public SCSSErrorHandler() {
+ this(System.out);
}
@Override
public void error(CSSParseException arg0) throws CSSException {
- log("Error when parsing file \n" + arg0.getURI() + " on line "
- + arg0.getLineNumber() + ", column " + arg0.getColumnNumber());
- log(arg0.getMessage() + "\n");
+ errorStream.println("Error when parsing file \n" + arg0.getURI()
+ + " on line " + arg0.getLineNumber() + ", column "
+ + arg0.getColumnNumber());
+ errorStream.println(arg0.getMessage() + "\n");
}
@Override
public void fatalError(CSSParseException arg0) throws CSSException {
- log("FATAL Error when parsing file \n" + arg0.getURI() + " on line "
- + arg0.getLineNumber() + ", column " + arg0.getColumnNumber());
- log(arg0.getMessage() + "\n");
+ errorStream.println("FATAL Error when parsing file \n" + arg0.getURI()
+ + " on line " + arg0.getLineNumber() + ", column "
+ + arg0.getColumnNumber());
+ errorStream.println(arg0.getMessage() + "\n");
}
@Override
public void warning(CSSParseException arg0) throws CSSException {
- log("Warning when parsing file \n" + arg0.getURI() + " on line "
- + arg0.getLineNumber() + ", column " + arg0.getColumnNumber());
- log(arg0.getMessage() + "\n");
- }
-
- private void log(String msg) {
- Logger.getLogger(SCSSDocumentHandlerImpl.class.getName()).log(
- Level.SEVERE, msg);
+ errorStream.println("Warning when parsing file \n" + arg0.getURI()
+ + " on line " + arg0.getLineNumber() + ", column "
+ + arg0.getColumnNumber());
+ errorStream.println(arg0.getMessage() + "\n");
}
}
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;
diff --git a/theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java b/theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
index c1f26f968e..744b560116 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/selector/SelectorUtil.java
@@ -16,9 +16,6 @@
package com.vaadin.sass.internal.selector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import org.w3c.css.sac.CombinatorCondition;
import org.w3c.css.sac.Condition;
import org.w3c.css.sac.ConditionFactory;
@@ -118,7 +115,7 @@ public class SelectorUtil {
} else if (selector.getSelectorType() == CompositeSelector.SCSS_COMPOSITE_SELECTOR) {
return toString((CompositeSelector) selector);
} else {
- log("SU !Unknown selector type, type: "
+ System.out.println("SU !Unknown selector type, type: "
+ selector.getSelectorType() + ", " + selector.toString());
}
return "";
@@ -165,8 +162,8 @@ public class SelectorUtil {
PseudoClassConditionImpl pseudoClassCondition = (PseudoClassConditionImpl) condition;
return ":" + pseudoClassCondition.getValue();
} else {
- log("CU !condition type not identified, type: " + conditionType
- + ", " + condition.toString());
+ System.out.println("CU !condition type not identified, type: "
+ + conditionType + ", " + condition.toString());
return "";
}
}
@@ -333,8 +330,4 @@ public class SelectorUtil {
throw new Exception("Invalid selector type");
}
}
-
- private static void log(String msg) {
- Logger.getLogger(SelectorUtil.class.getName()).log(Level.INFO, msg);
- }
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
index 8db522ea1a..6ce67a3abd 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/BlockNode.java
@@ -17,8 +17,6 @@
package com.vaadin.sass.internal.tree;
import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import com.vaadin.sass.internal.ScssStylesheet;
import com.vaadin.sass.internal.visitor.BlockNodeHandler;
@@ -111,8 +109,7 @@ public class BlockNode extends Node implements IVariableNode {
BlockNodeHandler.traverse(this);
replaceVariables(ScssStylesheet.getVariables());
} catch (Exception e) {
- Logger.getLogger(BlockNode.class.getName()).log(Level.SEVERE, null,
- e);
+ e.printStackTrace();
}
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
index dcabd2ff01..417849d13b 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/ExtendNode.java
@@ -17,8 +17,6 @@
package com.vaadin.sass.internal.tree;
import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import com.vaadin.sass.internal.visitor.ExtendNodeHandler;
@@ -56,8 +54,7 @@ public class ExtendNode extends Node implements IVariableNode {
ExtendNodeHandler.traverse(this);
getParentNode().removeChild(this);
} catch (Exception e) {
- Logger.getLogger(ExtendNode.class.getName()).log(Level.SEVERE,
- null, e);
+ e.printStackTrace();
}
}
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
index c5ffb6d73d..e702bc8577 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/MixinNode.java
@@ -19,8 +19,6 @@ package com.vaadin.sass.internal.tree;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import com.vaadin.sass.internal.ScssStylesheet;
import com.vaadin.sass.internal.parser.LexicalUnitImpl;
@@ -121,8 +119,7 @@ public class MixinNode extends Node implements IVariableNode {
ScssStylesheet.closeVariableScope(variableScope);
} catch (Exception e) {
- Logger.getLogger(MixinNode.class.getName()).log(Level.SEVERE, null,
- e);
+ e.printStackTrace();
}
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
index 8449a9d891..735d83a898 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/tree/controldirective/IfElseDefNode.java
@@ -15,9 +15,6 @@
*/
package com.vaadin.sass.internal.tree.controldirective;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
import com.vaadin.sass.internal.tree.Node;
import com.vaadin.sass.internal.visitor.IfElseNodeHandler;
@@ -43,8 +40,7 @@ public class IfElseDefNode extends Node {
IfElseNodeHandler.traverse(this);
} catch (Exception e) {
- Logger.getLogger(IfElseDefNode.class.getName()).log(Level.SEVERE,
- null, e);
+ e.printStackTrace();
}
}
diff --git a/theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java b/theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
index af66eb9a74..bc30ffdd6c 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/util/DeepCopy.java
@@ -22,15 +22,13 @@ import java.io.ObjectOutputStream;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
* Utility for making deep copies (vs. clone()'s shallow copies) of objects.
* Objects are first serialized and then deserialized. Error checking is fairly
* minimal in this implementation. If an object is encountered that cannot be
* serialized (or that references an object that cannot be serialized) an error
- * is printed to the logger and null is returned. Depending on your specific
+ * is printed to System.err and null is returned. Depending on your specific
* application, it might make more sense to have copy(...) re-throw the
* exception.
*/
@@ -58,9 +56,9 @@ public class DeepCopy {
obj = in.readObject();
in.close();
} catch (IOException e) {
- log(e);
+ e.printStackTrace();
} catch (ClassNotFoundException cnfe) {
- log(cnfe);
+ cnfe.printStackTrace();
}
return obj;
} else {
@@ -82,8 +80,4 @@ public class DeepCopy {
}
return copies;
}
-
- private static void log(Throwable e) {
- Logger.getLogger(DeepCopy.class.getName()).log(Level.SEVERE, null, e);
- }
} \ No newline at end of file
diff --git a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
index daf01a3eab..e52767bb5a 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
@@ -19,8 +19,6 @@ package com.vaadin.sass.internal.visitor;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.w3c.css.sac.CSSException;
import org.w3c.css.sac.LexicalUnit;
@@ -80,11 +78,9 @@ public class ImportNodeHandler {
importNode);
node.removeChild(importNode);
} catch (CSSException e) {
- Logger.getLogger(ImportNodeHandler.class.getName())
- .log(Level.SEVERE, null, e);
+ e.printStackTrace();
} catch (IOException e) {
- Logger.getLogger(ImportNodeHandler.class.getName())
- .log(Level.SEVERE, null, e);
+ e.printStackTrace();
}
} else {
if (styleSheet != node) {
diff --git a/theme-compiler/src/logging.properties b/theme-compiler/src/logging.properties
deleted file mode 100644
index b563d4b68e..0000000000
--- a/theme-compiler/src/logging.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-handlers = com.vaadin.sass.CustomConsoleHandler
-.level = ALL \ No newline at end of file