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

* added zero-argument constructor for NullNode subclass

Browse source 
* check for user prototype in getNameOrID() - user objects are never anonymous
This commit is contained in:
hns 2001-05-25 14:16:15 +00:00
parent 9369243ec4
commit af75604e00
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,9 +117,13 @@ public class Node implements INode, Serializable {
// transient String nameProp; // the name of the property which defines the name of this node. // 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 transient boolean adoptName = true; // little helper to know if this node is being converted
static final long serialVersionUID = -3740339688506633675L;
/**
* This constructor is only used for instances of the NullNode subclass. Do not use for ordinary Nodes!
*/
public Node () {
created = lastmodified = System.currentTimeMillis ();
}
/** /**
* Constructor used for virtual nodes. * Constructor used for virtual nodes.
@ -418,8 +422,10 @@ public class Node implements INode, Serializable {
public String getNameOrID () { public String getNameOrID () {
// if subnodes are also mounted as properties, try to get the "nice" prop value // if subnodes are also mounted as properties, try to get the "nice" prop value
// instead of the id by turning the anonymous flag off. // instead of the id by turning the anonymous flag off.
// HACK: work around this for user objects to alsways return a URL like /users/username
if (parentmap != null) { if ("user".equalsIgnoreCase (prototype)) {
anonymous = false;
} else if (parentmap != null) {
Relation prel = parentmap.getPropertyRelation(); Relation prel = parentmap.getPropertyRelation();
if (prel != null && prel.subnodesAreProperties && !prel.usesPrimaryKey ()) try { if (prel != null && prel.subnodesAreProperties && !prel.usesPrimaryKey ()) try {
Relation localrel = dbmap.columnNameToProperty (prel.getRemoteField ()); Relation localrel = dbmap.columnNameToProperty (prel.getRemoteField ());