Update of /var/cvs/src/org/mmbase/module/corebuilders
In directory james.mmbase.org:/tmp/cvs-serv3743
Modified Files:
InsRel.java
Log Message:
Added @Override annotation plus some other details
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/corebuilders
Index: InsRel.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/corebuilders/InsRel.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- InsRel.java 14 Aug 2008 11:40:09 -0000 1.60
+++ InsRel.java 27 Apr 2009 12:07:07 -0000 1.61
@@ -29,7 +29,7 @@
*
* @author Daniel Ockeloen
* @author Pierre van Rooden
- * @version $Id: InsRel.java,v 1.60 2008/08/14 11:40:09 michiel Exp $
+ * @version $Id: InsRel.java,v 1.61 2009/04/27 12:07:07 michiel Exp $
*/
public class InsRel extends MMObjectBuilder {
@@ -74,7 +74,7 @@
* @todo Is this cache still used?
*/
- private Cache<Integer, Vector<MMObjectNode>> relatedCache = new
Cache<Integer, Vector<MMObjectNode>>(25) {
+ private final Cache<Integer, Vector<MMObjectNode>> relatedCache = new
Cache<Integer, Vector<MMObjectNode>>(25) {
public String getName() { return "RelatedCache_" +
InsRel.this.getTableName(); }
public String getDescription() { return "Cache for Related Nodes of
builder " + InsRel.this.getTableName(); }
};
@@ -94,6 +94,7 @@
public InsRel() {
}
+ @Override
public void setTableName(String tableName) {
super.setTableName(tableName);
relatedCache.putCache();
@@ -109,6 +110,7 @@
* caught and logged.
* @see #usesdir
*/
+ @Override
public boolean init() {
CoreField dirField = getField(FIELD_DIRECTIONALITY);
boolean hasDirField = dirField != null && dirField.inStorage();
@@ -190,6 +192,7 @@
* @param node Relation node to add
* @return A <code>integer</code> value identifying the newly inserted
relation
*/
+ @Override
public int insert(String owner, MMObjectNode node) {
int result = -1;
int source = node.getIntValue(FIELD_SOURCE);
@@ -228,6 +231,7 @@
* Remove a node from the cloud.
* @param node The node to remove.
*/
+ @Override
public void removeNode(MMObjectNode node) {
int source = node.getIntValue(FIELD_SOURCE);
int destination = node.getIntValue(FIELD_DESTINATION);
@@ -299,9 +303,9 @@
if (nodenr == source) {
nodenr = node.getIntValue(FIELD_DESTINATION);
}
- String tableName = typedef.getValue(getNodeType(nodenr));
- if (tableName != null) {
- MMObjectBuilder nodeBuilder = mmb.getBuilder(tableName);
+ String tn = typedef.getValue(getNodeType(nodenr));
+ if (tn != null) {
+ MMObjectBuilder nodeBuilder = mmb.getBuilder(tn);
if (nodeBuilder != null &&
(nodeBuilder.equals(wantedBuilder) ||
nodeBuilder.isExtensionOf(wantedBuilder))) {
list.add(node);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs