X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e37c1e4bba9bb89cd2842f08cde998eb7f941d04..b9625f82f86db0674e911887addce45dca31b57f:/src/bindings/java/jmsg_file.h

diff --git a/src/bindings/java/jmsg_file.h b/src/bindings/java/jmsg_file.h
index 2f554f6ac1..367b8729b1 100644
--- a/src/bindings/java/jmsg_file.h
+++ b/src/bindings/java/jmsg_file.h
@@ -1,50 +1,38 @@
-/* Functions related to the java file API.                            */
-/* Copyright (c) 2012. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Java bindings of the file API.                                           */
+
+/* Copyright (c) 2012-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
-  * under the terms of the license (GNU LGPL) which comes with this package. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #ifndef MSG_JFILE_H
 #define MSG_JFILE_H
+
+#include "simgrid/plugins/file_system.h"
 #include <jni.h>
-#include "msg/msg.h"
+
+SG_BEGIN_DECL
+
+/* Shut up some errors in eclipse online compiler. I wish such a pimple wouldn't be needed */
+#ifndef JNIEXPORT
+#define JNIEXPORT
+#endif
+#ifndef JNICALL
+#define JNICALL
+#endif
+/* end of eclipse-mandated pimple */
 
 jfieldID jfile_field_bind;
 
-void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t stream);
+void jfile_bind(JNIEnv *env, jobject jfile, msg_file_t fd);
 msg_file_t jfile_get_native(JNIEnv *env, jobject jfile);
-/**
- * Class			org_simgrid_msg_File
- * Method			nativeInit
- * Signature	()V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_File_nativeInit(JNIEnv*, jclass);
-/**
- * Class			org_simgrid_msg_File
- * Method			open
- * Signature	(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_File_open(JNIEnv*, jobject, jobject, jobject, jobject);
-/**
- * Class 			org_simgrid_msg_File
- * Method			read
- */
-JNIEXPORT jlong JNICALL
-Java_org_simgrid_msg_File_read(JNIEnv*, jobject, jlong, jlong);
-/**
- * Class			org_simgrid_msg_File
- * Method			write
- */
-JNIEXPORT jlong JNICALL
-Java_org_simgrid_msg_File_write(JNIEnv*, jobject, jlong, jlong);
-/**
- * Class			org_simgrid_msg_File
- * Method			close
- */
-JNIEXPORT void JNICALL
-Java_org_simgrid_msg_File_close(JNIEnv*, jobject);
 
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_nativeInit(JNIEnv *env, jclass cls);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_open(JNIEnv *env, jobject jfile, jobject jpath);
+JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_read(JNIEnv *env, jobject jfile, jlong jsize);
+JNIEXPORT jlong JNICALL Java_org_simgrid_msg_File_write(JNIEnv *env, jobject jfile, jlong jsize);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_seek(JNIEnv *env, jobject jfile, jlong joffset, jlong jorigin);
+JNIEXPORT void JNICALL Java_org_simgrid_msg_File_close(JNIEnv *env, jobject jfile);
+
+SG_END_DECL
 #endif