From c8690f49d33cd744fab132c811a1959b6ecd7b34 Mon Sep 17 00:00:00 2001 From: hns Date: Mon, 25 Nov 2002 13:18:23 +0000 Subject: [PATCH] Renamed evaluator field to eval to avoid abiguities --- src/helma/scripting/fesi/extensions/ESMail.java | 2 +- src/helma/scripting/fesi/extensions/MailExtension.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/helma/scripting/fesi/extensions/ESMail.java b/src/helma/scripting/fesi/extensions/ESMail.java index 4feb0b7e..c8d1c3ea 100644 --- a/src/helma/scripting/fesi/extensions/ESMail.java +++ b/src/helma/scripting/fesi/extensions/ESMail.java @@ -50,7 +50,7 @@ public class ESMail extends ESObject implements Serializable { public ESMail (MailExtension mailx) { - super (mailx.esMailPrototype, mailx.evaluator); + super (mailx.esMailPrototype, mailx.eval); this.status = OK; this.mailx = mailx; this.mprops = mailx.mprops; diff --git a/src/helma/scripting/fesi/extensions/MailExtension.java b/src/helma/scripting/fesi/extensions/MailExtension.java index 65978766..103e0d4b 100644 --- a/src/helma/scripting/fesi/extensions/MailExtension.java +++ b/src/helma/scripting/fesi/extensions/MailExtension.java @@ -21,7 +21,7 @@ import java.util.*; public class MailExtension extends Extension { - protected Evaluator evaluator = null; + protected Evaluator eval = null; protected ObjectPrototype esMailPrototype = null; protected Properties mprops; @@ -39,7 +39,7 @@ public class MailExtension extends Extension { */ public void initializeExtension(Evaluator evaluator) throws EcmaScriptException { - this.evaluator = evaluator; + this.eval = evaluator; GlobalObject go = evaluator.getGlobalObject(); FunctionPrototype fp = (FunctionPrototype) evaluator.getFunctionPrototype();