Merge branch 'mc' into mc++

[simgrid.git] / src / bindings / java / jmsg_as.h

diff --git a/src/bindings/java/jmsg_as.h b/src/bindings/java/jmsg_as.h
index 6961d4a..ad928b6 100644 (file)
--- a/src/bindings/java/jmsg_as.h
+++ b/src/bindings/java/jmsg_as.h
@@ -1,11 +1,10 @@
 /* Functions related to the java As instances.                            */
 
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2014. 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_JAS_H
 #define MSG_JAS_H
@@ -14,7 +13,7 @@
 
 /* Functions related to the java host instances.                            */
 
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -42,5 +41,10 @@ Java_org_simgrid_msg_As_getSons(JNIEnv * env, jobject jas);
 JNIEXPORT jobject JNICALL
 Java_org_simgrid_msg_As_getProperty(JNIEnv *env, jobject jhost, jobject jname);
 
+JNIEXPORT jobject JNICALL
+Java_org_simgrid_msg_As_getModel(JNIEnv * env, jobject jas);
+
+JNIEXPORT jobjectArray JNICALL
+Java_org_simgrid_msg_As_getHosts(JNIEnv * env, jobject jas);
 
 #endif                          /*!MSG_JAS_H */