Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv30509
Modified Files:
TemporaryNodeManager.java
Log Message:
javadoc. Dropped third parameter from getObject. It was always the same as the
second one
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: TemporaryNodeManager.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/TemporaryNodeManager.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- TemporaryNodeManager.java 14 May 2007 14:46:40 -0000 1.52
+++ TemporaryNodeManager.java 7 Jul 2008 11:10:59 -0000 1.53
@@ -20,7 +20,7 @@
* @javadoc
*
* @author Rico Jansen
- * @version $Id: TemporaryNodeManager.java,v 1.52 2007/05/14 14:46:40 michiel
Exp $
+ * @version $Id: TemporaryNodeManager.java,v 1.53 2008/07/07 11:10:59 michiel
Exp $
*/
public class TemporaryNodeManager {
@@ -114,7 +114,9 @@
}
/**
- * @javadoc
+ * Tries to get the node with number 'key'. If there was already a
temporary node with this key,
+ * for the given owner, it will return that node. The node will
<em>not</em> be stored in the
+ * temporory nodes map. For that use [EMAIL PROTECTED] #getObject}.
*/
public MMObjectNode getNode(String owner, String key) {
MMObjectBuilder bul = mmbase.getBuilder("object");
@@ -130,16 +132,18 @@
}
/**
- * @javadoc
+ * Makes sure that the node identify with 'key' is a temporary node for
the given owner. Returns
+ * the key if sucessfull, <code>null</code> otherwise.
+ *
*/
- public String getObject(String owner, String key, String dbkey) {
+ public String getObject(String owner, String key) {
MMObjectNode node = MMObjectBuilder.getTmpNode(getTmpKey(owner, key));
if (node == null) {
log.debug("getObject not tmp node found " + key);
MMObjectBuilder bul = mmbase.getBuilder("object");
- node = bul.getNode(dbkey, false);
+ node = bul.getNode(key, false);
if (node == null) {
- log.warn("Node not found in database " + dbkey);
+ log.warn("Node not found in database " + key);
} else {
MMObjectBuilder.putTmpNode(getTmpKey(owner, key), node);
}
@@ -261,7 +265,8 @@
}
/**
- * @javadoc
+ * Returns the unique key in given the number and owner of a node.
+ * TemporaryNodeManager distinguishes nodes for different users.
*/
private String getTmpKey(String owner, String key) {
return owner + "_" + key;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
