[MMBASE CVS] src/org/mmbase/module/core MMObjectBuilder.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/module/core
In directory james.mmbase.org:/tmp/cvs-serv16442

Modified Files:
        MMObjectBuilder.java 
Log Message:
added some @Override


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.434
retrieving revision 1.435
diff -u -b -r1.434 -r1.435
--- MMObjectBuilder.java        23 Sep 2008 07:23:51 -0000      1.434
+++ MMObjectBuilder.java        9 Oct 2008 13:13:12 -0000       1.435
@@ -62,7 +62,7 @@
  * @author Rob van Maris
  * @author Michiel Meeuwissen
  * @author Ernst Bunders
- * @version $Id: MMObjectBuilder.java,v 1.434 2008/09/23 07:23:51 michiel Exp $
+ * @version $Id: MMObjectBuilder.java,v 1.435 2008/10/09 13:13:12 michiel Exp $
  */
 public class MMObjectBuilder extends MMTable implements NodeEventListener, 
RelationEventListener {
 
@@ -316,10 +316,14 @@
                     return func.getDescription();
                 }
             }
-            public Object getFunctionValue(Node node, Parameters parameters) {
+            @Override public Object getFunctionValue(Node node, Parameters 
parameters) {
+                if (node.getNumber() > 0) {
                 return 
getFunctionValue(MMObjectBuilder.this.getFunctions(getCoreNode(MMObjectBuilder.this,
 node)), parameters);
+                } else {
+                    return 
getFunctionValue(MMObjectBuilder.this.getFunctions(), parameters);
+                }
             }
-            public Object getFunctionValue(Parameters parameters) {
+            @Override public Object getFunctionValue(Parameters parameters) {
                 MMObjectNode node = (MMObjectNode) 
parameters.get(Parameter.CORENODE);
                 if (node == null) {
                     return 
getFunctionValue(MMObjectBuilder.this.getFunctions(), parameters);
@@ -1139,7 +1143,7 @@
      */
     public boolean checkAddTmpField(String field) {
         if (getDBState(field) == Field.STATE_UNKNOWN) { // means that field is 
not yet defined.
-            CoreField fd = Fields.createField(field, Field.TYPE_STRING, 
Field.TYPE_UNKNOWN, Field.STATE_VIRTUAL, null);
+            CoreField fd = Fields.createField(field, Field.TYPE_STRING, 
Field.STATE_VIRTUAL, null);
             if (! fd.isTemporary()) {
                 fd.setStoragePosition(1000);
                 log.service("Added a virtual field '" + field + "' to builder 
'" + getTableName() + "' because it was not defined in the builder's XML, but 
the implementation requires it to exist.");
@@ -2260,8 +2264,8 @@
     public boolean    sendFieldChangeSignal(MMObjectNode node,String 
fieldName) {
         // we need to find out what the DBState is of this field so we know
         // who to notify of this change
-        int state=getDBState(fieldName);
-        log.debug("Changed field="+fieldName+" dbstate="+state);
+        int state = getDBState(fieldName);
+        log.debug("Changed field=" + fieldName + " dbstate=" + state);
 
         // still a large hack need to figure out remote changes
         if (state==0) {}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs