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

Removed obsolete adoptName field

Browse source
This commit is contained in:
hns 2002-11-01 21:45:03 +00:00
parent a60b7ff548
commit a54344d79a
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/helma/objectmodel/TransientNode.java
View file

@ -44,8 +44,6 @@ public class TransientNode implements INode, Serializable {
transient DbMapping dbmap; transient DbMapping dbmap;
transient boolean adoptName = true; // little helper to know if this node is being converted
private static long idgen = 0; private static long idgen = 0;
public static String generateID () { public static String generateID () {
@ -549,7 +547,7 @@ public class TransientNode implements INode, Serializable {
// or as an anonymous node in a collection // or as an anonymous node in a collection
if (value instanceof TransientNode) { if (value instanceof TransientNode) {
TransientNode n = (TransientNode) value; TransientNode n = (TransientNode) value;
if (n.parent == null && n.adoptName) { if (n.parent == null) {
n.name = propname; n.name = propname;
n.parent = this; n.parent = this;
n.anonymous = false; n.anonymous = false;

6
src/helma/objectmodel/db/Node.java
View file

@ -162,9 +162,6 @@ public final class Node implements INode, Serializable {
transient private volatile Transactor lock; transient private volatile Transactor lock;
transient private int state; transient private int state;
// transient String nameProp; // the name of the property which defines the name of this node.
transient boolean adoptName = true; // little helper to know if this node is being converted
static final long serialVersionUID = -3740339688506633675L; static final long serialVersionUID = -3740339688506633675L;
/** /**
@ -230,7 +227,6 @@ public final class Node implements INode, Serializable {
id = null; id = null;
this.name = n == null ? "" : n; this.name = n == null ? "" : n;
created = lastmodified = System.currentTimeMillis (); created = lastmodified = System.currentTimeMillis ();
adoptName = true;
state = TRANSIENT; state = TRANSIENT;
} }
@ -1698,7 +1694,7 @@ public final class Node implements INode, Serializable {
// check if the main identity of this node is as a named property // check if the main identity of this node is as a named property
// or as an anonymous node in a collection // or as an anonymous node in a collection
if (n.parentHandle == null && n.adoptName && !"root".equalsIgnoreCase (n.getPrototype ())) { if (n.parentHandle == null && !"root".equalsIgnoreCase (n.getPrototype ())) {
n.setParent (this); n.setParent (this);
n.name = propname; n.name = propname;
n.anonymous = false; n.anonymous = false;