diff --git a/.classpath b/.classpath
index d4716e9..1eb0ab2 100644
--- a/.classpath
+++ b/.classpath
@@ -1,29 +1,29 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index e2bc076..4feab08 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,6 @@
-#Sat Sep 02 07:10:09 PDT 2006
+#Wed Apr 07 16:39:43 EDT 2010
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
diff --git a/ivy.xml b/ivy.xml
index 8a8ed96..7f54f7f 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -25,9 +25,6 @@
-
-
@@ -40,6 +37,9 @@
+
+
diff --git a/src/org/olap4j/mdx/parser/impl/Scanner.java b/src/org/olap4j/mdx/parser/impl/Scanner.java
index 366bf73..27092cd 100644
--- a/src/org/olap4j/mdx/parser/impl/Scanner.java
+++ b/src/org/olap4j/mdx/parser/impl/Scanner.java
@@ -9,7 +9,6 @@
*/
package org.olap4j.mdx.parser.impl;
-import org.apache.log4j.Logger;
import org.olap4j.mdx.ParseRegion;
import org.olap4j.mdx.parser.MdxParseException;
@@ -31,7 +30,6 @@
* @author jhyde
*/
class Scanner {
- private static final Logger LOGGER = Logger.getLogger(Scanner.class);
/** single lookahead character */
protected int nextChar;
@@ -194,20 +192,6 @@ public void init()
advance();
}
- private Symbol trace(Symbol s) {
- if (debug) {
- String name = null;
- if (s.sym < reservedWords.length) {
- name = reservedWords[s.sym];
- }
-
- LOGGER.error("Scanner returns #" + s.sym +
- (name == null ? "" : ":" + name) +
- (s.value == null ? "" : "(" + s.value.toString() + ")"));
- }
- return s;
- }
-
private void initResword(int id, String s) {
reservedWordIds.put(s, id);
if (id > iMaxResword) {
@@ -302,7 +286,7 @@ private Symbol makeSymbol(int id, Object o) {
int iPrevPrevChar = iPrevChar;
this.iPrevChar = iChar;
this.previousSymbol = id;
- return trace(new Symbol(id, iPrevPrevChar, iChar, o));
+ return new Symbol(id, iPrevPrevChar, iChar, o);
}
/**