Author: adrianc
Date: Fri May 11 11:47:23 2012
New Revision: 1337117
URL:
http://svn.apache.org/viewvc?rev=1337117&view=revLog:
Minor Mini-language <log> element changes.
Modified:
ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java
Modified: ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java?rev=1337117&r1=1337116&r2=1337117&view=diff==============================================================================
--- ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java (original)
+++ ofbiz/trunk/framework/minilang/src/org/ofbiz/minilang/method/otherops/Log.java Fri May 11 11:47:23 2012
@@ -33,11 +33,10 @@ import org.w3c.dom.Element;
public final class Log extends MethodOperation {
public static final String module = Log.class.getName();
- private static final String[] LEVEL_ARRAY = {"always", "verbose", "timing", "info", "important", "warning", "error", "fatal", "notify"};
+ public static final String[] LEVEL_ARRAY = {"always", "verbose", "timing", "info", "important", "warning", "error", "fatal", "notify"};
private final int level;
private final FlexibleStringExpander messageFse;
- private final Object startLine;
public Log(Element element, SimpleMethod simpleMethod) throws MiniLangException {
super(element, simpleMethod);
@@ -60,7 +59,6 @@ public final class Log extends MethodOpe
} else {
this.level = levelInt.intValue();
}
- this.startLine = element.getUserData("startLine");
}
@Override
@@ -76,10 +74,8 @@ public final class Log extends MethodOpe
buf.append(methodLocation);
buf.append("#");
buf.append(this.simpleMethod.getMethodName());
- if (this.startLine != null) {
- buf.append(" line ");
- buf.append(this.startLine);
- }
+ buf.append(" line ");
+ buf.append(getLineNumber());
buf.append("] ");
buf.append(message);
Debug.log(this.level, null, buf.toString(), module);