Many plugins and files: Convert "interval_g" and "vl->interval" to cdtime_t.

[collectd.git] / bindings / java / org / collectd / api / ValueList.java

diff --git a/bindings/java/org/collectd/api/ValueList.java b/bindings/java/org/collectd/api/ValueList.java
index 61cfdd7..b8d6f40 100644 (file)
--- a/bindings/java/org/collectd/api/ValueList.java
+++ b/bindings/java/org/collectd/api/ValueList.java
@@ -26,10 +26,10 @@ import java.util.List;
  */
 public class ValueList extends PluginData {
 
-    List<Number> _values = new ArrayList<Number>();
-    List<DataSource> _ds = new ArrayList<DataSource>();
+    private List<Number> _values = new ArrayList<Number>();
+    private DataSet _ds;
 
-    long _interval;
+    private long _interval = 0;
 
     public ValueList() {
         
@@ -43,7 +43,7 @@ public class ValueList extends PluginData {
         this((PluginData)vl);
         _interval = vl._interval;
         _values.addAll(vl.getValues());
-        _ds.addAll(vl._ds);
+       _ds = vl._ds;
     }
 
     public List<Number> getValues() {
@@ -63,23 +63,40 @@ public class ValueList extends PluginData {
         _values.clear ();
     }
 
+    /**
+     * @deprecated Use {@link #getDataSet()} instead.
+     */
     public List<DataSource> getDataSource() {
-        if (_ds.size() > 0) {
-            return _ds;
-        }
-        else {
+        if (_ds == null)
             return null;
-        }
+        return _ds.getDataSources ();
+    }
+
+    public DataSet getDataSet () {
+        return _ds;
     }
 
-    public void setDataSource(List<DataSource> ds) {
+    public void setDataSet (DataSet ds) {
         _ds = ds;
     }
 
+    /**
+     * @deprecated Use {@link #setDataSet(DataSet)} instead.
+     */
+    public void setDataSource(List<DataSource> dsrc) {
+        _ds = new DataSet (_type, dsrc);
+    }
+
+    /**
+     * Returns the interval (in milliseconds) of the value list.
+     */
     public long getInterval() {
         return _interval;
     }
 
+    /**
+     * Sets the interval (in milliseconds) of the value list.
+     */
     public void setInterval(long interval) {
         _interval = interval;
     }
@@ -107,3 +124,5 @@ public class ValueList extends PluginData {
         return sb.toString();
     }
 }
+
+/* vim: set sw=4 sts=4 et : */