X-Git-Url: http://nitlanguage.org

diff --git a/src/ffi/java.nit b/src/ffi/java.nit
index 7827dac..3f2a21e 100644
--- a/src/ffi/java.nit
+++ b/src/ffi/java.nit
@@ -105,7 +105,7 @@ class JavaLanguage
 			jni_signature_alt = mclass_type.jni_signature_alt
 			return_type = mclass_type
 		else
-			params.add "recv"
+			params.add "self"
 			if signature.return_mtype != null then
 				var ret_mtype = signature.return_mtype
 				ret_mtype = ret_mtype.resolve_for(mclass_type, mclass_type, mmodule, true)
@@ -296,7 +296,7 @@ redef class AMethPropdef
 		assert sys_class != null
 		var sys_jni_env_meth = modelbuilder.try_get_mproperty_by_name2(self, mmodule, sys_class.mclass_type, "jni_env")
 		if sys_jni_env_meth == null or not sys_jni_env_meth isa MMethod then
-			toolcontext.error(self.location, "Java FFI error: you must import the `java` module when using the FFI with Java")
+			toolcontext.error(self.location, "Java FFI Error: you must import the `java` module when using the FFI with Java")
 			return
 		end
 
@@ -424,7 +424,7 @@ redef class MExplicitCall
 		var csignature = mproperty.build_c_implementation_signature(recv_mtype, mmodule, "___indirect", long_signature, from_java_call_context)
 		var cf = new CFunction("JNIEXPORT {csignature}")
 		cf.exprs.add "\t{mproperty.build_ccall(recv_mtype, mainmodule, null, long_signature, from_java_call_context, null)}\n"
-		ccu.add_local_function cf
+		ccu.add_non_static_local_function cf
 
 		# In Java, declare the extern method as a private static local method
 		var java_signature = mproperty.build_csignature(recv_mtype, mainmodule, null, short_signature, java_call_context)
@@ -483,6 +483,7 @@ redef class MClassType
 		if mclass.name == "Char" then return "char"
 		if mclass.name == "Int" then return "long"
 		if mclass.name == "Float" then return "double"
+		if mclass.name == "Byte" then return "byte"
 		return super
 	end
 
@@ -494,6 +495,7 @@ redef class MClassType
 		if mclass.name == "Char" then return "jchar"
 		if mclass.name == "Int" then return "jlong"
 		if mclass.name == "Float" then return "jdouble"
+		if mclass.name == "Byte" then return "jbyte"
 		return super
 	end
 
@@ -553,6 +555,7 @@ redef class MClassType
 		if mclass.name == "Char" then return "C"
 		if mclass.name == "Int" then return "J"
 		if mclass.name == "Float" then return "D"
+		if mclass.name == "Byte" then return "B"
 		return super
 	end
 
@@ -565,6 +568,7 @@ redef class MClassType
 		if mclass.name == "Char" then return "Char"
 		if mclass.name == "Int" then return "Long"
 		if mclass.name == "Float" then return "Double"
+		if mclass.name == "Byte" then return "Byte"
 		return super
 	end
 end
@@ -637,7 +641,7 @@ redef class MMethod
 		cparams.add "jclass clazz"
 
 		if not self.is_init then
-			cparams.add "{call_context.name_mtype(recv_mtype)} recv"
+			cparams.add "{call_context.name_mtype(recv_mtype)} self"
 		end
 		for p in signature.mparameters do
 			var param_mtype = p.mtype.resolve_for(recv_mtype, recv_mtype, from_mmodule, true)
@@ -651,3 +655,17 @@ end
 private fun java_call_context: JavaCallContext do return new JavaCallContext
 private fun to_java_call_context: ToJavaCallContext do return new ToJavaCallContext
 private fun from_java_call_context: FromJavaCallContext do return new FromJavaCallContext
+
+redef class CCompilationUnit
+	# Similar to `add_local_function` but not `static`
+	#
+	# Used when the signature contains a visibility attribute.
+	private fun add_non_static_local_function(c_function: CFunction)
+	do
+		body_decl.add c_function.signature
+		body_decl.add ";\n"
+
+		body_impl.add "\n"
+		body_impl.add c_function.to_writer
+	end
+end