From 821c7c18a829343d9d7378f666a3dde52eb08b96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Vachon?= Date: Sat, 21 Nov 2015 21:42:47 -0500 Subject: [PATCH] Rename JavaClass package_name to full_java_name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric Vachon --- contrib/jwrapper/src/code_generator.nit | 8 ++++---- contrib/jwrapper/src/model.nit | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/jwrapper/src/code_generator.nit b/contrib/jwrapper/src/code_generator.nit index 487da4d..4014c75 100644 --- a/contrib/jwrapper/src/code_generator.nit +++ b/contrib/jwrapper/src/code_generator.nit @@ -200,7 +200,7 @@ class CodeGenerator end if effective_supers == 0 then - if java_class.class_type.package_name == "java.lang.Object" or + if java_class.class_type.java_full_name == "java.lang.Object" or not model.knows_the_object_class then supers.add "super JavaObject" else supers.add "super Java_lang_Object" @@ -267,7 +267,7 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `} # Build the call in Java var java_call if is_static == true then - java_call = java_class.class_type.package_name + java_call = java_class.class_type.java_full_name else java_call = "self" java_call += ".{java_method_id}({java_args.join(", ")})" @@ -305,7 +305,7 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `} var recv if attribute.is_static then - recv = java_class.class_type.package_name + recv = java_class.class_type.java_full_name else recv = "self" # Tabulation @@ -357,7 +357,7 @@ extern class {{{nit_type}}} in "Java" `{ {{{java_type.extern_equivalent}}} `} file_out.write """ # Java constructor: {{{java_class.class_type.extern_equivalent}}} {{{c}}} new {{{name}}}{{{nit_params_s}}} in "Java" `{ -{{{c}}} return new {{{java_class.class_type.package_name}}}({{{java_params_s}}}); +{{{c}}} return new {{{java_class.class_type.java_full_name}}}({{{java_params_s}}}); {{{c}}} `} """ diff --git a/contrib/jwrapper/src/model.nit b/contrib/jwrapper/src/model.nit index 4b7b8a0..9013bff 100644 --- a/contrib/jwrapper/src/model.nit +++ b/contrib/jwrapper/src/model.nit @@ -109,8 +109,8 @@ class JavaType # Short name of the class, mangled to remove `$` (e.g. `Set`) fun id: String do return identifier.last.replace("$", "") - # Full name of this class as used in an importation (e.g. `java.lang.Set`) - fun package_name: String do return identifier.join(".").replace("$", ".") + # Full name of this class as used in java code (e.g. `java.lang.Set`) + fun java_full_name: String do return identifier.join(".").replace("$", ".") # Full name of this class as used by jni (e.g. `android.graphics.BitmapFactory$Options`) fun jni_full_name: String do return identifier.join(".") @@ -120,7 +120,7 @@ class JavaType # Full name of this class with arrays and generic values (e.g. `java.lang.Set[]`) redef fun to_s do - var id = self.package_name + var id = self.java_full_name if self.is_primitive_array then id += "[]" * array_dimension @@ -146,10 +146,10 @@ class JavaType # Comparison based on fully qualified named redef fun ==(other) do return other isa JavaType and - self.package_name == other.package_name and + self.java_full_name == other.java_full_name and self.array_dimension == other.array_dimension - redef fun hash do return self.package_name.hash + redef fun hash do return self.java_full_name.hash end class NitType @@ -296,7 +296,7 @@ class JavaModel # Add a class in `classes` fun add_class(jclass: JavaClass) do - var key = jclass.class_type.package_name + var key = jclass.class_type.java_full_name classes[key] = jclass end @@ -328,7 +328,7 @@ class JavaModel end # Is being wrapped in this pass? - var key = jtype.package_name + var key = jtype.java_full_name if classes.keys.has(key) then if jtype.array_dimension <= opt_arrays.value then var nit_type = new NitType(jtype.extern_name) @@ -393,7 +393,7 @@ class JavaModel # Remove unavailable super classes for super_type in super_classes.reverse_iterator do # Is the super class available? - if not all_classes.keys.has(super_type.package_name) then super_classes.remove(super_type) + if not all_classes.keys.has(super_type.java_full_name) then super_classes.remove(super_type) end # If the is no explicit supers, add `java.lang.Object` (if it is known) @@ -404,9 +404,9 @@ class JavaModel for super_type in super_classes do # Is the super class available? - if not all_classes.keys.has(super_type.package_name) then continue + if not all_classes.keys.has(super_type.java_full_name) then continue - var super_class = all_classes[super_type.package_name] + var super_class = all_classes[super_type.java_full_name] class_hierarchy.add_edge(java_class, super_class) end end -- 1.7.9.5