antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

all HopObjects are now instantiated directly with the

Browse source 
persistent capable class, i.e. helma.objectmodel.db.Server.
This commit is contained in:
hns 2001-08-01 00:01:44 +00:00
parent d9b92c75e9
commit 429b647aa5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/helma/framework/core/NodeConstructor.java
View file

@ -3,6 +3,7 @@
package helma.framework.core; package helma.framework.core;
import helma.objectmodel.db.Node;
import FESI.Data.*; import FESI.Data.*;
import FESI.Exceptions.*; import FESI.Exceptions.*;
import FESI.Interpreter.*; import FESI.Interpreter.*;
@ -31,10 +32,12 @@ public class NodeConstructor extends BuiltinFunctionObject {
ESNode node = null; ESNode node = null;
if ("Node".equals (typename) || "hopobject".equalsIgnoreCase (typename)) { if ("Node".equals (typename) || "hopobject".equalsIgnoreCase (typename)) {
if (arguments.length == 0) { if (arguments.length == 0) {
node = new ESNode (reval.esNodePrototype, this.evaluator, null, reval); Node n = new Node ((String) null, (String) null, reval.app.nmgr.safe);
node = new ESNode (reval.esNodePrototype, this.evaluator, n, reval);
reval.objectcache.put (node.getNode (), node); reval.objectcache.put (node.getNode (), node);
} else { } else {
node = new ESNode (reval.esNodePrototype, this.evaluator, arguments[0], reval); Node n = new Node (arguments[0].toString(), (String) null, reval.app.nmgr.safe);
node = new ESNode (reval.esNodePrototype, this.evaluator, n, reval);
reval.objectcache.put (node.getNode (), node); reval.objectcache.put (node.getNode (), node);
} }
} else { } else {
@ -43,7 +46,8 @@ public class NodeConstructor extends BuiltinFunctionObject {
// is that we want to be able to use the specail features like subnode relations even for // is that we want to be able to use the specail features like subnode relations even for
// transient nodes. // transient nodes.
ObjectPrototype op = reval.getPrototype (typename); ObjectPrototype op = reval.getPrototype (typename);
node = new ESNode (op, reval.evaluator, typename, reval); Node n = new Node (typename, typename, reval.app.nmgr.safe);
node = new ESNode (op, reval.evaluator, n, reval);
node.setPrototype (typename); node.setPrototype (typename);
node.getNode ().setDbMapping (reval.app.getDbMapping (typename)); node.getNode ().setDbMapping (reval.app.getDbMapping (typename));
try { try {