contrib/jwrapper: rename JReturnAndParams to JavaMethod
authorAlexis Laferrière <alexis.laf@xymus.net>
Tue, 6 Jan 2015 17:18:32 +0000 (12:18 -0500)
committerAlexis Laferrière <alexis.laf@xymus.net>
Wed, 7 Jan 2015 21:54:05 +0000 (16:54 -0500)
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

contrib/jwrapper/src/types.nit

index 4fb5251..c977e64 100644 (file)
@@ -294,28 +294,28 @@ end
 class JavaClass
        var class_type = new JavaType(new JavaTypeConverter)
        var attributes = new HashMap[String, JavaType]
-       var methods = new HashMap[String, Array[JReturnAndParams]]
+
+       # Methods of this class organized by their name
+       var methods = new HashMap[String, Array[JavaMethod]]
+
        var unknown_types = new HashSet[JavaType]
        var imports = new HashSet[NitModule]
 
        fun add_method(id: String, return_type: JavaType, params: Array[JavaType])
        do
-               var ret_and_params = methods.get_or_default(id, new Array[JReturnAndParams])
-               
-               ret_and_params.add(new JReturnAndParams(return_type, new Array[JavaType].from(params)))
-               methods[id] = ret_and_params
+               var signatures = methods.get_or_default(id, new Array[JavaMethod])
+               signatures.add(new JavaMethod(return_type, new Array[JavaType].from(params)))
+               methods[id] = signatures
        end
 end
 
-class JReturnAndParams
+# A Java method, with its signature
+class JavaMethod
+       # Type returned by the method
        var return_type: JavaType
-       var params: Array[JavaType]
 
-       init(return_type: JavaType, params: Array[JavaType])
-       do
-               self.return_type = return_type
-               self.params = params
-       end
+       # Type of the arguments of the method
+       var params: Array[JavaType]
 end
 
 class NitModule