[GNUnet-SVN] r766 - in doodle/src: doodle org/gnunet/doodle

[grothoff]

Author: grothoff
Date: 2005-05-07 13:14:11 -0700 (Sat, 07 May 2005)
New Revision: 766

Added:
   doodle/src/doodle/org_gnunet_doodle_Doodle.h
Removed:
   doodle/src/doodle/org_ovmj_doodle_Doodle.h
Modified:
   doodle/src/doodle/doodle.c
   doodle/src/doodle/tree.c
   doodle/src/org/gnunet/doodle/Doodle.java
Log:
update

Modified: doodle/src/doodle/doodle.c
===================================================================
--- doodle/src/doodle/doodle.c  2005-05-07 20:12:47 UTC (rev 765)
+++ doodle/src/doodle/doodle.c  2005-05-07 20:14:11 UTC (rev 766)
@@ -27,7 +27,7 @@
  * tree.c.  doodle uses GNU getopt and for portability ships with its
  * own version of the getopt code (getopt*).<p>
  *
- * doodle requires libextractor (http://ovmj.org/libextractor/).
+ * doodle requires libextractor (http://gnunet.org/libextractor/).
  */
 
 #include "config.h"

Added: doodle/src/doodle/org_gnunet_doodle_Doodle.h
===================================================================
--- doodle/src/doodle/org_gnunet_doodle_Doodle.h        2005-05-07 20:12:47 UTC 
(rev 765)
+++ doodle/src/doodle/org_gnunet_doodle_Doodle.h        2005-05-07 20:14:11 UTC 
(rev 766)
@@ -0,0 +1,69 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_gnunet_doodle_Doodle */
+
+#ifndef _Included_org_gnunet_doodle_Doodle
+#define _Included_org_gnunet_doodle_Doodle
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_gnunet_doodle_Doodle
+ * Method:    getVersionInternal
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_org_gnunet_doodle_Doodle_getVersionInternal
+  (JNIEnv *, jclass);
+
+/*
+ * Class:     org_gnunet_doodle_Doodle
+ * Method:    open
+ * Signature: (Ljava/lang/String;Lorg/gnunet/doodle/Doodle/Logger;)J
+ */
+JNIEXPORT jlong JNICALL Java_org_gnunet_doodle_Doodle_open
+  (JNIEnv *, jclass, jstring, jobject);
+
+/*
+ * Class:     org_gnunet_doodle_Doodle
+ * Method:    close
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_org_gnunet_doodle_Doodle_close
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     org_gnunet_doodle_Doodle
+ * Method:    truncate
+ * Signature: (JLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_org_gnunet_doodle_Doodle_truncate
+  (JNIEnv *, jclass, jlong, jstring);
+
+/*
+ * Class:     org_gnunet_doodle_Doodle
+ * Method:    expand
+ * Signature: (JLjava/lang/String;Ljava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_org_gnunet_doodle_Doodle_expand
+  (JNIEnv *, jclass, jlong, jstring, jstring);
+
+/*
+ * Class:     org_gnunet_doodle_Doodle
+ * Method:    lastModified
+ * Signature: (JLjava/lang/String;)J
+ */
+JNIEXPORT jlong JNICALL Java_org_gnunet_doodle_Doodle_lastModified
+  (JNIEnv *, jclass, jlong, jstring);
+
+/*
+ * Class:     org_gnunet_doodle_Doodle
+ * Method:    search
+ * Signature: (JLjava/lang/String;IZLjava/util/Vector;)I
+ */
+JNIEXPORT jint JNICALL Java_org_gnunet_doodle_Doodle_search
+  (JNIEnv *, jclass, jlong, jstring, jint, jboolean, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

Deleted: doodle/src/doodle/org_ovmj_doodle_Doodle.h
===================================================================
--- doodle/src/doodle/org_ovmj_doodle_Doodle.h  2005-05-07 20:12:47 UTC (rev 
765)
+++ doodle/src/doodle/org_ovmj_doodle_Doodle.h  2005-05-07 20:14:11 UTC (rev 
766)
@@ -1,71 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_ovmj_doodle_Doodle */
-
-#ifndef _Included_org_ovmj_doodle_Doodle
-#define _Included_org_ovmj_doodle_Doodle
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: warn_ */
-/* Inaccessible static: version_ */
-/*
- * Class:     org_ovmj_doodle_Doodle
- * Method:    getVersionInternal
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_org_ovmj_doodle_Doodle_getVersionInternal
-  (JNIEnv *, jclass);
-
-/*
- * Class:     org_ovmj_doodle_Doodle
- * Method:    open
- * Signature: (Ljava/lang/String;Lorg/ovmj/doodle/Doodle$Logger;)J
- */
-JNIEXPORT jlong JNICALL Java_org_ovmj_doodle_Doodle_open
-  (JNIEnv *, jclass, jstring, jobject);
-
-/*
- * Class:     org_ovmj_doodle_Doodle
- * Method:    close
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_ovmj_doodle_Doodle_close
-  (JNIEnv *, jclass, jlong);
-
-/*
- * Class:     org_ovmj_doodle_Doodle
- * Method:    truncate
- * Signature: (JLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_ovmj_doodle_Doodle_truncate
-  (JNIEnv *, jclass, jlong, jstring);
-
-/*
- * Class:     org_ovmj_doodle_Doodle
- * Method:    expand
- * Signature: (JLjava/lang/String;Ljava/lang/String;)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_ovmj_doodle_Doodle_expand
-  (JNIEnv *, jclass, jlong, jstring, jstring);
-
-/*
- * Class:     org_ovmj_doodle_Doodle
- * Method:    lastModified
- * Signature: (JLjava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_org_ovmj_doodle_Doodle_lastModified
-  (JNIEnv *, jclass, jlong, jstring);
-
-/*
- * Class:     org_ovmj_doodle_Doodle
- * Method:    search
- * Signature: (JLjava/lang/String;IZLjava/util/Vector;)I
- */
-JNIEXPORT jint JNICALL Java_org_ovmj_doodle_Doodle_search
-  (JNIEnv *, jclass, jlong, jstring, jint, jboolean, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

Modified: doodle/src/doodle/tree.c
===================================================================
--- doodle/src/doodle/tree.c    2005-05-07 20:12:47 UTC (rev 765)
+++ doodle/src/doodle/tree.c    2005-05-07 20:14:11 UTC (rev 766)
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  *
  * Note that this file was deliberately written such that all exported
- * symbols have the prefix DOODLE_ (or Java_org_ovmj_doodle_Doodle for
+ * symbols have the prefix DOODLE_ (or Java_org_gnunet_doodle_Doodle for
  * the JNI API).  Furthermore, there are no symbols that are
  * accidentially exported.  When editing, please make sure that this
  * is preserved.
@@ -3348,13 +3348,13 @@
 #define JNICALL
 #endif
 
-#include "org_ovmj_doodle_Doodle.h"
+#include "org_gnunet_doodle_Doodle.h"
 /*
- * Class:     org_ovmj_doodle_Doodle
+ * Class:     org_gnunet_doodle_Doodle
  * Method:    getVersionInternal
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL Java_org_ovmj_doodle_Doodle_getVersionInternal
+JNIEXPORT jint JNICALL Java_org_gnunet_doodle_Doodle_getVersionInternal
 (JNIEnv * env, jclass clz) {
   return DOODLE_VERSION;
 }
@@ -3404,11 +3404,11 @@
 }
 
 /*
- * Class:     org_ovmj_doodle_Doodle
+ * Class:     org_gnunet_doodle_Doodle
  * Method:    open
- * Signature: (Ljava/lang/String;Lorg/ovmj/doodle/Doodle$Logger;)J
+ * Signature: (Ljava/lang/String;Lorg/gnunet/doodle/Doodle$Logger;)J
  */
-JNIEXPORT jlong JNICALL Java_org_ovmj_doodle_Doodle_open
+JNIEXPORT jlong JNICALL Java_org_gnunet_doodle_Doodle_open
 (JNIEnv * env, jclass cl, jstring filename, jobject logger) {
   JNICTX * ret;
   const signed char * database;
@@ -3434,11 +3434,11 @@
 }
 
 /*
- * Class:     org_ovmj_doodle_Doodle
+ * Class:     org_gnunet_doodle_Doodle
  * Method:    close
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_org_ovmj_doodle_Doodle_close
+JNIEXPORT void JNICALL Java_org_gnunet_doodle_Doodle_close
 (JNIEnv * env, jclass cl, jlong handle) {
   JNICTX * ret = (JNICTX*) (long) handle;
 
@@ -3447,11 +3447,11 @@
 }
 
 /*
- * Class:     org_ovmj_doodle_Doodle
+ * Class:     org_gnunet_doodle_Doodle
  * Method:    truncate
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_org_ovmj_doodle_Doodle_truncate
+JNIEXPORT void JNICALL Java_org_gnunet_doodle_Doodle_truncate
 (JNIEnv * env, jclass cl, jlong handle, jstring filename) {
   JNICTX * ret = (JNICTX*) (long) handle;
   const signed char * fn;
@@ -3468,11 +3468,11 @@
 }
 
 /*
- * Class:     org_ovmj_doodle_Doodle
+ * Class:     org_gnunet_doodle_Doodle
  * Method:    expand
  * Signature: (JLjava/lang/String;Ljava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL Java_org_ovmj_doodle_Doodle_expand
+JNIEXPORT jboolean JNICALL Java_org_gnunet_doodle_Doodle_expand
 (JNIEnv * env, jclass cl, jlong handle, jstring key, jstring filename) {
   JNICTX * ret = (JNICTX*) (long) handle;
   int i;
@@ -3499,11 +3499,11 @@
 }
 
 /*
- * Class:     org_ovmj_doodle_Doodle
+ * Class:     org_gnunet_doodle_Doodle
  * Method:    lastModified
  * Signature: (JLjava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL Java_org_ovmj_doodle_Doodle_lastModified
+JNIEXPORT jlong JNICALL Java_org_gnunet_doodle_Doodle_lastModified
 (JNIEnv * env, jclass cl, jlong handle, jstring filename) {
   JNICTX * ret = (JNICTX*) (long) handle;
   int i;
@@ -3548,11 +3548,11 @@
 }
 
 /*
- * Class:     org_ovmj_doodle_Doodle
+ * Class:     org_gnunet_doodle_Doodle
  * Method:    search
  * Signature: (JLjava/lang/String;IZLjava/util/Vector;)I
  */
-JNIEXPORT jint JNICALL Java_org_ovmj_doodle_Doodle_search
+JNIEXPORT jint JNICALL Java_org_gnunet_doodle_Doodle_search
 (JNIEnv * env, jclass cl, jlong handle, jstring key, jint fuzzy, jboolean 
ignCase, jobject vect) {
   JNICTX * ret = (JNICTX*) (long) handle;
   jclass vector;

Modified: doodle/src/org/gnunet/doodle/Doodle.java
===================================================================
--- doodle/src/org/gnunet/doodle/Doodle.java    2005-05-07 20:12:47 UTC (rev 
765)
+++ doodle/src/org/gnunet/doodle/Doodle.java    2005-05-07 20:14:11 UTC (rev 
766)
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
  */
 
-package org.ovmj.doodle;
+package org.gnunet.doodle;
 
 import java.util.Vector;
 import java.util.Iterator;
@@ -31,7 +31,7 @@
  * methods abort with an error code (if possible) or just
  * return without doing anything.  
  *
- * @see org.ovmj.libextractor.Extractor
+ * @see org.gnunet.libextractor.Extractor
  * @author Christian Grothoff
  */ 
 public final class Doodle {