Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv5767
Modified Files:
BasicNode.java
Log Message:
I think 'temporaryNodeId == -1' is another way of asking 'isNew'
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
Index: BasicNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicNode.java,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -b -r1.228 -r1.229
--- BasicNode.java 13 Jun 2008 10:47:22 -0000 1.228
+++ BasicNode.java 7 Jul 2008 15:24:44 -0000 1.229
@@ -31,7 +31,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicNode.java,v 1.228 2008/06/13 10:47:22 michiel Exp $
+ * @version $Id: BasicNode.java,v 1.229 2008/07/07 15:24:44 michiel Exp $
* @see org.mmbase.bridge.Node
* @see org.mmbase.module.core.MMObjectNode
*/
@@ -567,7 +567,7 @@
// remove aliases
deleteAliases(null);
// in transaction:
- if (cloud instanceof BasicTransaction) {
+ if (cloud instanceof BasicTransaction) { // WTF WTF
// let the transaction remove the node (as well as its
temporary counterpart).
// note that the node still exists until the transaction
completes
// a getNode() will still retrieve the node and make edits
possible
@@ -928,7 +928,7 @@
Constraint c =
q.createConstraint(q.getStepField(oalias.getField("destination")),
Integer.valueOf(getNumber()));
if (aliasName != null) {
Constraint c2 =
q.createConstraint(q.getStepField(oalias.getField("name")), aliasName);
- c = q.createConstraint (c,CompositeConstraint.LOGICAL_AND,c2);
+ c = q.createConstraint (c, CompositeConstraint.LOGICAL_AND,
c2);
}
q.setConstraint(c);
NodeList aliases = oalias.getList(q);
@@ -951,7 +951,7 @@
@Override
public void setContext(String context) {
// set the context on the node (run after insert).
- getNode().setContext(cloud.getUser(), context, temporaryNodeId == -1);
+ getNode().setContext(cloud.getUser(), context, isNew());
}
// javadoc inherited (from Node)
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
