java plugin: Implemented oconfig types in Java.

The CollectdAPI class has been moved to the `org.collectd.api'
namespace, too, so that this stuff is together..

diff --git a/bindings/java/org/collectd/api/CollectdAPI.java b/bindings/java/org/collectd/api/CollectdAPI.java
new file mode 100644 (file)
index 0000000..bd8d950
--- /dev/null
+++ b/bindings/java/org/collectd/api/CollectdAPI.java
@@ -0,0 +1,31 @@
+/*
+ * collectd/java - org/collectd/api/CollectdAPI.java
+ * Copyright (C) 2009  Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ *   Florian octo Forster <octo at verplant.org>
+ */
+
+package org.collectd.api;
+
+import org.collectd.protocol.ValueList;
+
+public class CollectdAPI
+{
+  native public static int DispatchValues (ValueList vl);
+} /* class CollectdAPI */
+
+/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/bindings/java/org/collectd/api/OConfigItem.java b/bindings/java/org/collectd/api/OConfigItem.java
new file mode 100644 (file)
index 0000000..781af09
--- /dev/null
+++ b/bindings/java/org/collectd/api/OConfigItem.java
@@ -0,0 +1,86 @@
+/*
+ * collectd/java - org/collectd/api/OConfigItem.java
+ * Copyright (C) 2009  Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ *   Florian octo Forster <octo at verplant.org>
+ */
+
+package org.collectd.api;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class OConfigItem
+{
+  private String _key = null;
+  private List<OConfigValue> _values   = new ArrayList<OConfigValue> ();
+  private List<OConfigItem>  _children = new ArrayList<OConfigItem> ();
+
+  public OConfigItem (String key)
+  {
+    _key = key;
+  } /* OConfigItem (String key) */
+
+  public String getKey ()
+  {
+    return (_key);
+  } /* String getKey () */
+
+  public void addValue (OConfigValue cv)
+  {
+    _values.add (cv);
+  } /* void addValue (OConfigValue cv) */
+
+  public void addValue (String s)
+  {
+    _values.add (new OConfigValue (s));
+  } /* void addValue (String s) */
+
+  public void addValue (Number n)
+  {
+    _values.add (new OConfigValue (n));
+  } /* void addValue (String s) */
+
+  public void addValue (boolean b)
+  {
+    _values.add (new OConfigValue (b));
+  } /* void addValue (String s) */
+
+  public List<OConfigValue> getValues ()
+  {
+    return (_values);
+  } /* List<OConfigValue> getValues () */
+
+  public void addChild (OConfigItem ci)
+  {
+    _children.add (ci);
+  } /* void addChild (OConfigItem ci) */
+
+  public List<OConfigItem> getChildren ()
+  {
+    return (_children);
+  } /* List<OConfigItem> getChildren () */
+
+  public String toString ()
+  {
+    return (new String ("{ key: " + _key + "; "
+          + "values: " + _values.toString () + "; "
+          + "children: " + _children.toString () + "; }"));
+  } /* String toString () */
+} /* class OConfigItem */
+
+/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/bindings/java/org/collectd/api/OConfigValue.java b/bindings/java/org/collectd/api/OConfigValue.java
new file mode 100644 (file)
index 0000000..5b40e66
--- /dev/null
+++ b/bindings/java/org/collectd/api/OConfigValue.java
@@ -0,0 +1,91 @@
+/*
+ * collectd/java - org/collectd/api/OConfigValue.java
+ * Copyright (C) 2009  Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ * Authors:
+ *   Florian octo Forster <octo at verplant.org>
+ */
+
+package org.collectd.api;
+
+public class OConfigValue
+{
+  public static final int OCONFIG_TYPE_STRING  = 0;
+  public static final int OCONFIG_TYPE_NUMBER  = 1;
+  public static final int OCONFIG_TYPE_BOOLEAN = 2;
+
+  private int     _type;
+  private String  _value_string;
+  private Number  _value_number;
+  private boolean _value_boolean;
+
+  public OConfigValue (String s)
+  {
+    _type = OCONFIG_TYPE_STRING;
+    _value_string  = s;
+    _value_number  = null;
+    _value_boolean = false;
+  } /* OConfigValue (String s) */
+
+  public OConfigValue (Number n)
+  {
+    _type = OCONFIG_TYPE_NUMBER;
+    _value_string  = null;
+    _value_number  = n;
+    _value_boolean = false;
+  } /* OConfigValue (String s) */
+
+  public OConfigValue (boolean b)
+  {
+    _type = OCONFIG_TYPE_BOOLEAN;
+    _value_string  = null;
+    _value_number  = null;
+    _value_boolean = b;
+  } /* OConfigValue (String s) */
+
+  public int getType ()
+  {
+    return (_type);
+  } /* int getType */
+
+  public String getString ()
+  {
+    return (_value_string);
+  } /* String getString */
+
+  public Number getNumber ()
+  {
+    return (_value_number);
+  } /* String getString */
+
+  public boolean getBoolean ()
+  {
+    return (_value_boolean);
+  } /* String getString */
+
+  public String toString ()
+  {
+    if (_type == OCONFIG_TYPE_STRING)
+      return (_value_string);
+    else if (_type == OCONFIG_TYPE_NUMBER)
+      return (_value_number.toString ());
+    else if (_type == OCONFIG_TYPE_BOOLEAN)
+      return (Boolean.toString (_value_boolean));
+    return (null);
+  } /* String toString () */
+} /* class OConfigValue */
+
+/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/bindings/java/org/collectd/java/CollectdAPI.java b/bindings/java/org/collectd/java/CollectdAPI.java
deleted file mode 100644 (file)
index c6ecca0..0000000
--- a/bindings/java/org/collectd/java/CollectdAPI.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * collectd - src/java.c
- * Copyright (C) 2009  Florian octo Forster
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; only version 2 of the License is applicable.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- * Authors:
- *   Florian octo Forster <octo at verplant.org>
- */
-
-package org.collectd.java;
-
-import org.collectd.protocol.ValueList;
-
-public class CollectdAPI
-{
-  native public static int DispatchValues (ValueList vl);
-} /* class CollectdAPI */
-
-/* vim: set sw=2 sts=2 et fdm=marker : */

diff --git a/src/java.c b/src/java.c
index 83fec35c556ec3ddbdaefe1afaf1fae3ef838d43..f6ce46785ed990cde2f1b8ad9f881dd6c6bd842e 100644 (file)
--- a/src/java.c
+++ b/src/java.c
@@ -1120,10 +1120,10 @@ static int cjni_init_native (JNIEnv *jvm_env) /* {{{ */
   jclass api_class_ptr;
   int status;
 
-  api_class_ptr = (*jvm_env)->FindClass (jvm_env, "org.collectd.java.CollectdAPI");
+  api_class_ptr = (*jvm_env)->FindClass (jvm_env, "org.collectd.api.CollectdAPI");
   if (api_class_ptr == NULL)
   {
-    ERROR ("cjni_init_native: Cannot find API class `org.collectd.java.CollectdAPI'.");
+    ERROR ("cjni_init_native: Cannot find API class `org.collectd.api.CollectdAPI'.");
     return (-1);
   }