Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv3819/core
Modified Files:
MMObjectBuilder.java
Log Message:
details only
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/core
Index: MMObjectBuilder.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/core/MMObjectBuilder.java,v
retrieving revision 1.437
retrieving revision 1.438
diff -u -b -r1.437 -r1.438
--- MMObjectBuilder.java 16 Dec 2008 16:40:23 -0000 1.437
+++ MMObjectBuilder.java 27 Apr 2009 12:07:53 -0000 1.438
@@ -62,7 +62,7 @@
* @author Rob van Maris
* @author Michiel Meeuwissen
* @author Ernst Bunders
- * @version $Id: MMObjectBuilder.java,v 1.437 2008/12/16 16:40:23 michiel Exp $
+ * @version $Id: MMObjectBuilder.java,v 1.438 2009/04/27 12:07:53 michiel Exp $
*/
public class MMObjectBuilder extends MMTable implements NodeEventListener,
RelationEventListener {
@@ -130,8 +130,11 @@
* The cache for all blobs.
* @since 1.8.0
*/
- protected static BlobCache genericBlobCache = new BlobCache(200) {
- public String getName() { return "GenericBlobCache"; }
+ protected static final BlobCache genericBlobCache = new BlobCache(200) {
+ @Override
+ public String getName() {
+ return "GenericBlobCache";
+ }
};
static {
@@ -141,7 +144,7 @@
/**
* The cache that contains the X last requested nodes
*/
- protected static org.mmbase.cache.NodeCache nodeCache =
org.mmbase.cache.NodeCache.getCache();
+ protected static final org.mmbase.cache.NodeCache nodeCache =
org.mmbase.cache.NodeCache.getCache();
/**
* Determines whether the cache is locked.
@@ -186,7 +189,7 @@
* Default value is 31. Can be changed with the <searchage> tag in
the xml builder file.
* @scope protected
*/
- public String searchAge="31";
+ public String searchAge = "31";
/**
* Determines whether changes to this builder need be broadcast to other
known mmbase servers.
@@ -262,7 +265,7 @@
public String getFunctionValue(Node node, Parameters parameters) {
String val =
node.getStringValue(parameters.getString(Parameter.FIELD));
Number wrappos = (Number) parameters.get("length");
- return MMObjectBuilder.this.wrap(val, wrappos.intValue());
+ return MMObjectBuilder.wrap(val, wrappos.intValue());
}
};
{
@@ -461,7 +464,9 @@
node.storeValue("name", tableName);
// This sucks:
- if (description == null) description = "not defined in
this language";
+ if (description == null) {
+ description = "not defined in this language";
+ }
node.storeValue("description", description);
@@ -1961,7 +1966,7 @@
* and makes this function pluggable on all builders. See also MMB-1449.
*
*/
- public String getSmartPath(String documentRoot, String path, String
nodeNumber, String version) {
+ final public String getSmartPath(String documentRoot, String path, String
nodeNumber, String version) {
if (log.isDebugEnabled()) {
log.debug("Getting smartpath for " + documentRoot + " /" + path +
"/" + nodeNumber + "/" + version);
}
@@ -2552,7 +2557,9 @@
def.setNotNull(true);
for (CoreField field : f) {
int pos = field.getStoragePosition();
- if (pos > 1) field.setStoragePosition(pos + 1);
+ if (pos > 1) {
+ field.setStoragePosition(pos + 1);
+ }
}
def.setParent(this);
def.finish();
@@ -2796,7 +2803,7 @@
*
* @since MMBase-1.6.2
*/
-
+ @Override
public String toString() {
return getSingularName();
}
@@ -2929,7 +2936,9 @@
}
protected boolean isNull(String fieldName, MMObjectNode node) {
- if (node.getNumber() < 0) return true; // capture calls from temporary
nodes
+ if (node.getNumber() < 0) {
+ return true; // capture calls from temporary nodes
+ }
try {
return mmb.getStorageManager().isNull(node, getField(fieldName));
} catch (StorageException se) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
