[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-serv19338/core

Modified Files:
        MMObjectBuilder.java 
Log Message:
removed a bunch of silly date-realted functions which depend on long deprecated 
'date strings' and which can easily be replicated by java.util.DateFormat, 
mm:time or so


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.428
retrieving revision 1.429
diff -u -b -r1.428 -r1.429
--- MMObjectBuilder.java        18 Jul 2008 04:46:44 -0000      1.428
+++ MMObjectBuilder.java        2 Aug 2008 15:35:46 -0000       1.429
@@ -62,7 +62,7 @@
  * @author Rob van Maris
  * @author Michiel Meeuwissen
  * @author Ernst Bunders
- * @version $Id: MMObjectBuilder.java,v 1.428 2008/07/18 04:46:44 michiel Exp $
+ * @version $Id: MMObjectBuilder.java,v 1.429 2008/08/02 15:35:46 michiel Exp $
  */
 public class MMObjectBuilder extends MMTable implements NodeEventListener, 
RelationEventListener {
 
@@ -1831,46 +1831,7 @@
             }
         }
 
-        // time functions
-        if(function.equals("date")) {                    // date
-            int v = node.getIntValue(field);
-            return DateSupport.date2string(v);
-        } else if (function.equals("time")) {            // time hh:mm
-            int v = node.getIntValue(field);
-            return DateSupport.getTime(v);
-        } else if (function.equals("timesec")) {        // timesec hh:mm:ss
-            int v = node.getIntValue(field);
-            return DateSupport.getTimeSec(v);
-        } else if (function.equals("longmonth")) {        // longmonth 
September
-            int v = node.getIntValue(field);
-            return 
DateStrings.ENGLISH_DATESTRINGS.getMonth(DateSupport.getMonthInt(v));
-        } else if (function.equals("monthnumber")) {
-            int v = node.getIntValue(field);
-            return "" + (DateSupport.getMonthInt(v)+1);
-        } else if (function.equals("month")) {            // month Sep
-            int v = node.getIntValue(field);
-            return 
DateStrings.DUTCH_DATESTRINGS.getShortMonth(DateSupport.getMonthInt(v));
-        } else if (function.equals("weekday")) {        // weekday Sunday
-            int v = node.getIntValue(field);
-            return 
DateStrings.DUTCH_DATESTRINGS.getDay(DateSupport.getWeekDayInt(v));
-        } else if (function.equals("shortday")) {        // shortday Sun
-            int v = node.getIntValue(field);
-            return 
DateStrings.DUTCH_DATESTRINGS.getShortDay(DateSupport.getWeekDayInt(v));
-        } else if (function.equals("day")) {            // day 4
-            int v = node.getIntValue(field);
-            return ""+DateSupport.getDayInt(v);
-        } else if (function.equals("shortyear")) {            // year 01
-            int v = node.getIntValue(field);
-            return (DateSupport.getYear(v)).substring(2);
-        } else if (function.equals("year")) {            // year 2001
-            int v = node.getIntValue(field);
-            return DateSupport.getYear(v);
-        } else if (function.equals("thisdaycurtime")) {            //
-            int curtime=node.getIntValue(field);
-            // gives us the next full day based on time (00:00)
-            int days = curtime/(3600*24);
-            return "" + ((days*(3600*24))-3600);
-        } else if (function.equals("age")) {
+        if (function.equals("age")) {
             Integer val = Integer.valueOf(node.getAge());
             return val.toString();
         } else if (function.equals("wap")) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs