android & benitlux: use NitObject in clients

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/contrib/benitlux/src/client/android.nit b/contrib/benitlux/src/client/android.nit
index ee51327..3495f6c 100644 (file)
--- a/contrib/benitlux/src/client/android.nit
+++ b/contrib/benitlux/src/client/android.nit
@@ -52,7 +52,7 @@ redef class App
 
                android.content.IntentFilter filter = new android.content.IntentFilter();
                filter.addAction(android.net.wifi.WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-               final int final_self = self;
+               final nit.app.NitObject final_self = self;
                App_incr_ref(final_self);
 
                context.registerReceiver(
@@ -197,7 +197,7 @@ redef class BeerView
                final String final_title = title;
                final boolean final_loggedin = loggedin;
 
-               final int final_self = self;
+               final nit.app.NitObject final_self = self;
                BeerView_incr_ref(self); // Nit GC
 
                view.setOnTouchListener(new android.view.View.OnTouchListener() {

diff --git a/lib/android/activities.nit b/lib/android/activities.nit
index a457899..76e3f07 100644 (file)
--- a/lib/android/activities.nit
+++ b/lib/android/activities.nit
@@ -43,7 +43,7 @@ extern class NativeActivity in "Java" `{ android.app.Activity `}
 
        # Execute `task.main` on the UI thread when possible
        fun run_on_ui_thread(task: Task) import Task.main in "Java" `{
-               final int final_task = task;
+               final nit.app.NitObject final_task = task;
                Runnable runnable = new Runnable() {
                        @Override
                        public void run() {

diff --git a/lib/android/assets_and_resources.nit b/lib/android/assets_and_resources.nit
index 930bc17..2ca56d4 100644 (file)
--- a/lib/android/assets_and_resources.nit
+++ b/lib/android/assets_and_resources.nit
@@ -52,7 +52,7 @@ private extern class NativeAssetManager in "Java" `{ android.content.res.AssetMa
 
        # Get the locales that this assets manager contains data for
        fun get_locales: Array[JavaString] import Array[JavaString], Array[JavaString].add in "Java" `{
-               int arr = new_Array_of_JavaString();
+               nit.app.NitObject arr = new_Array_of_JavaString();
                for (String s : self.getLocales()) {
                        Array_of_JavaString_add(arr, s);
                }
@@ -61,7 +61,7 @@ private extern class NativeAssetManager in "Java" `{ android.content.res.AssetMa
 
        # String Array of all the assets at the given path
        fun list(path: JavaString): Array[JavaString] import Array[JavaString], Array[JavaString].add  in "Java" `{
-               int arr = new_Array_of_JavaString();
+               nit.app.NitObject arr = new_Array_of_JavaString();
                try {
                        for (String s : self.list(path)) {
                                Array_of_JavaString_add(arr, s);

diff --git a/lib/android/bundle/bundle.nit b/lib/android/bundle/bundle.nit
index e02702a..521355f 100644 (file)
--- a/lib/android/bundle/bundle.nit
+++ b/lib/android/bundle/bundle.nit
@@ -29,6 +29,7 @@ in "Java" `{
        import android.app.Activity;
        import java.util.ArrayList;
        import java.util.Set;
+       import nit.app.NitObject;
 `}
 
 extern class NativeBundle in "Java" `{ android.os.Bundle `}
@@ -44,10 +45,10 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get(key: JavaString): JavaObject in "Java" `{ return self.get(key); `}
        fun remove(key: JavaString) in "Java" `{ self.remove(key); `}
        fun put_all(bundle: NativeBundle) in "Java" `{ self.putAll(bundle); `}
-       fun key_set: HashSet[JavaString] import HashSet[JavaString], 
-         HashSet[JavaString].add in "Java" `{ 
+       fun key_set: HashSet[JavaString] import HashSet[JavaString],
+         HashSet[JavaString].add in "Java" `{
                Set<String> java_set = self.keySet();
-               int nit_hashset = new_HashSet_of_JavaString();
+               NitObject nit_hashset = new_HashSet_of_JavaString();
 
                for (String element: java_set)
                        HashSet_of_JavaString_add(nit_hashset, element);
@@ -257,7 +258,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_integer_array_list(key: JavaString): Array[Int]
                import Array[Int], Array[Int].add in "Java" `{
                ArrayList<Integer> java_array = self.getIntegerArrayList(key);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                if (java_array == null) return nit_array;
 
@@ -269,7 +270,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_string_array_list(key: JavaString): Array[String]
                import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                ArrayList<String> java_array = self.getStringArrayList(key);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                if (java_array == null) return nit_array;
 
@@ -281,7 +282,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_char_sequence_array_list(key: JavaString): Array[String]
                import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                ArrayList<CharSequence> java_array = self.getCharSequenceArrayList(key);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                if (java_array == null) return nit_array;
 
@@ -293,7 +294,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_boolean_array(key: JavaString): Array[Bool]
                import Array[Bool], Array[Bool].add in "Java" `{
                boolean[] java_array = self.getBooleanArray(key);
-               int nit_array = new_Array_of_Bool();
+               NitObject nit_array = new_Array_of_Bool();
 
                if (java_array == null) return nit_array;
 
@@ -305,7 +306,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_byte_array(key: JavaString): Array[Int]
                import Array[Int], Array[Int].add in "Java" `{
                byte[] java_array = self.getByteArray(key);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                if (java_array == null) return nit_array;
 
@@ -317,7 +318,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_short_array(key: JavaString): Array[Int]
                import Array[Int], Array[Int].add in "Java" `{
                short[] java_array = self.getShortArray(key);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                if (java_array == null) return nit_array;
 
@@ -330,7 +331,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_char_array(key: JavaString): Array[Char]
                import Array[Char], Array[Char].add in "Java" `{
                char[] java_array = self.getCharArray(key);
-               int nit_array = new_Array_of_Char();
+               NitObject nit_array = new_Array_of_Char();
 
                if (java_array == null) return nit_array;
 
@@ -342,7 +343,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_int_array(key: JavaString): Array[Int]
                import Array[Int], Array[Int].add in "Java" `{
                int[] java_array = self.getIntArray(key);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                if (java_array == null) return nit_array;
 
@@ -355,7 +356,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_long_array(key: JavaString): Array[Int]
                import Array[Int], Array[Int].add in "Java" `{
                long[] java_array = self.getLongArray(key);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                if (java_array == null) return nit_array;
 
@@ -367,7 +368,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_float_array(key: JavaString): Array[Float]
                import Array[Float], Array[Float].add in "Java" `{
                float[] java_array = self.getFloatArray(key);
-               int nit_array = new_Array_of_Float();
+               NitObject nit_array = new_Array_of_Float();
 
                if (java_array == null) return nit_array;
 
@@ -379,7 +380,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_double_array(key: JavaString): Array[Float]
                import Array[Float], Array[Float].add in "Java" `{
                double[] java_array = self.getDoubleArray(key);
-               int nit_array = new_Array_of_Float();
+               NitObject nit_array = new_Array_of_Float();
 
                if (java_array == null) return nit_array;
 
@@ -391,7 +392,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_string_array(key: JavaString): Array[String]
                import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                String[] java_array = self.getStringArray(key);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                if (java_array == null) return nit_array;
 
@@ -403,7 +404,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `}
        fun get_char_sequence_array(key: JavaString): Array[String]
                import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                CharSequence[] java_array = self.getCharSequenceArray(key);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                if (java_array == null) return nit_array;
 

diff --git a/lib/android/intent/intent_api10.nit b/lib/android/intent/intent_api10.nit
index f9e6c3b..1c05f89 100644 (file)
--- a/lib/android/intent/intent_api10.nit
+++ b/lib/android/intent/intent_api10.nit
@@ -29,6 +29,7 @@ in "Java" `{
        import android.graphics.Rect;
        import java.util.Set;
        import java.util.ArrayList;
+       import nit.app.NitObject;
 `}
 
 extern class NativeIntent in "Java" `{ android.content.Intent `}
@@ -45,7 +46,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun boolean_array_extra(name: JavaString): Array[Bool] import Array[Bool],
          Array[Bool].push in "Java" `{
                boolean[] java_array = self.getBooleanArrayExtra(name);
-               int nit_array = new_Array_of_Bool();
+               NitObject nit_array = new_Array_of_Bool();
 
                for(int i=0; i < java_array.length; ++i)
                        Array_of_Bool_push(nit_array, java_array[i]);
@@ -58,7 +59,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun byte_array_extra(name: JavaString): Array[Int] import Array[Int],
          Array[Int].add in "Java" `{
                byte[] java_array = self.getByteArrayExtra(name);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                for (int i=0; i < java_array.length; ++i)
                        Array_of_Int_add(nit_array, java_array[i]);
@@ -72,7 +73,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun char_array_extra(name: JavaString): Array[Char] import Array[Char],
          Array[Char].add in "Java" `{
                char[] java_array = self.getCharArrayExtra(name);
-               int nit_array = new_Array_of_Char();
+               NitObject nit_array = new_Array_of_Char();
 
                for (int i = 0; i < java_array.length; ++i)
                        Array_of_Char_add(nit_array, java_array[i]);
@@ -86,7 +87,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun char_sequence_array_extra(name: JavaString): Array[String]
          import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                CharSequence[] java_array = self.getCharSequenceArrayExtra(name);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                for (int i = 0; i < java_array.length; ++i)
                        StringCopyArray_add(nit_array, (String) java_array[i]);
@@ -96,7 +97,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun char_sequence_array_list_extra(name: JavaString): Array[String]
          import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                ArrayList<CharSequence> java_array = self.getCharSequenceArrayListExtra(name);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                if (java_array == null) return nit_array;
 
@@ -111,7 +112,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun categories: HashSet[String] import StringCopyHashSet,
          StringCopyHashSet.add, StringCopyHashSet.collection  in "Java" `{
                Set<String> java_set = self.getCategories();
-               int nit_hashset = new_StringCopyHashSet();
+               NitObject nit_hashset = new_StringCopyHashSet();
 
                if (java_set == null) return nit_hashset;
 
@@ -125,7 +126,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun double_array_extra(name: JavaString): Array[Float] import Array[Float],
          Array[Float].push in "Java" `{
                double[] java_array = self.getDoubleArrayExtra(name);
-               int nit_array = new_Array_of_Float();
+               NitObject nit_array = new_Array_of_Float();
 
                for(int i=0; i < java_array.length; ++i)
                        Array_of_Float_push(nit_array, java_array[i]);
@@ -139,7 +140,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun float_array_extra(name: JavaString): Array[Float] import Array[Float],
          Array[Float].push in "Java" `{
                float[] java_array = self.getFloatArrayExtra(name);
-               int nit_array = new_Array_of_Float();
+               NitObject nit_array = new_Array_of_Float();
 
                for(int i=0; i < java_array.length; ++i)
                        Array_of_Float_push(nit_array, java_array[i]);
@@ -152,7 +153,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun int_array_extra(name: JavaString): Array[Int] import Array[Int],
          Array[Int].push in "Java" `{
                int[] java_array = self.getIntArrayExtra(name);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                for(int i=0; i < java_array.length; ++i)
                        Array_of_Int_push(nit_array, java_array[i]);
@@ -165,7 +166,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun long_array_extra(name: JavaString): Array[Int] import Array[Int],
          Array[Int].push in "Java" `{
                long[] java_array = self.getLongArrayExtra(name);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                for(int i=0; i < java_array.length; ++i)
                        Array_of_Int_push(nit_array, (int) java_array[i]);
@@ -180,7 +181,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun short_array_extra(name: JavaString): Array[Int] import Array[Int],
          Array[Int].push in "Java" `{
                short[] java_array = self.getShortArrayExtra(name);
-               int nit_array = new_Array_of_Int();
+               NitObject nit_array = new_Array_of_Int();
 
                for(int i=0; i < java_array.length; ++i)
                        Array_of_Int_push(nit_array, (int) java_array[i]);
@@ -193,7 +194,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun string_array_extra(name: JavaString): Array[String]
          import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                String[] java_array = self.getStringArrayExtra(name);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                for(int i=0; i < java_array.length; ++i)
                        StringCopyArray_add(nit_array, java_array[i]);
@@ -203,7 +204,7 @@ extern class NativeIntent in "Java" `{ android.content.Intent `}
        fun string_array_list_extra(name: JavaString): Array[String]
          import StringCopyArray, StringCopyArray.add, StringCopyArray.collection in "Java" `{
                ArrayList<String> java_array = self.getStringArrayListExtra(name);
-               int nit_array = new_StringCopyArray();
+               NitObject nit_array = new_StringCopyArray();
 
                for (String element: java_array)
                        StringCopyArray_add(nit_array, element);

diff --git a/lib/android/shared_preferences/shared_preferences_api10.nit b/lib/android/shared_preferences/shared_preferences_api10.nit
index 0464b67..f012ed2 100644 (file)
--- a/lib/android/shared_preferences/shared_preferences_api10.nit
+++ b/lib/android/shared_preferences/shared_preferences_api10.nit
@@ -38,7 +38,7 @@ extern class NativeSharedPreferences in "Java" `{ android.content.SharedPreferen
        fun get_all: HashMap[JavaString, JavaObject] import HashMap[JavaString, JavaObject],
                HashMap[JavaString, JavaObject].[]= in "Java" `{
                Map<String, ?> java_map = null;
-               int nit_hashmap = new_HashMap_of_JavaString_JavaObject();
+               nit.app.NitObject nit_hashmap = new_HashMap_of_JavaString_JavaObject();
                try {
                        java_map = self.getAll();
                } catch (NullPointerException e) {

diff --git a/lib/android/shared_preferences/shared_preferences_api11.nit b/lib/android/shared_preferences/shared_preferences_api11.nit
index 85623d8..9d2dbcf 100644 (file)
--- a/lib/android/shared_preferences/shared_preferences_api11.nit
+++ b/lib/android/shared_preferences/shared_preferences_api11.nit
@@ -32,7 +32,7 @@ redef extern class NativeSharedPreferences
                HashSet[JavaString].add in "Java" `{
                Set<String> def_value = new HashSet<String>();
                Set<String> java_set = self.getStringSet(key, def_value);
-               int nit_hashset = new_HashSet_of_JavaString();
+               nit.app.NitObject nit_hashset = new_HashSet_of_JavaString();
 
                for (String element: java_set)
                        HashSet_of_JavaString_add(nit_hashset, element);
@@ -47,7 +47,7 @@ redef extern class NativeSharedPreferencesEditor
                import HashSet[JavaString], HashSet[JavaString].iterator, Iterator[JavaString].is_ok,
                Iterator[JavaString].item, Iterator[JavaString].next in "Java" `{
                Set<String> java_set = new HashSet<String>();
-               int itr = HashSet_of_JavaString_iterator(value);
+               nit.app.NitObject itr = HashSet_of_JavaString_iterator(value);
 
                while (Iterator_of_JavaString_is_ok(itr)) {
                        java_set.add(Iterator_of_JavaString_item(itr));

diff --git a/lib/android/ui/ui.nit b/lib/android/ui/ui.nit
index 60f7909..767039b 100644 (file)
--- a/lib/android/ui/ui.nit
+++ b/lib/android/ui/ui.nit
@@ -207,7 +207,7 @@ end
 redef class Android_widget_ArrayAdapter
        private new (context: NativeContext, res: Int, sender: ListLayout)
        import ListLayout.create_view in "Java" `{
-               final int final_sender_object = sender;
+               final nit.app.NitObject final_sender_object = sender;
                ListLayout_incr_ref(sender);
 
                return new android.widget.ArrayAdapter(context, (int)res) {
@@ -276,7 +276,7 @@ redef class CheckBox
 
        private fun set_callback_on_toggle(view: NATIVE)
        import on_toggle in "Java" `{
-               final int final_sender_object = self;
+               final nit.app.NitObject final_sender_object = self;
                CheckBox_incr_ref(final_sender_object);
 
                view.setOnCheckedChangeListener(
@@ -328,7 +328,7 @@ end
 redef class NativeButton
        private new (context: NativeActivity, sender_object: Button)
        import Button.on_click in "Java" `{
-               final int final_sender_object = sender_object;
+               final nit.app.NitObject final_sender_object = sender_object;
                Button_incr_ref(final_sender_object);
 
                return new android.widget.Button(context) {
@@ -349,7 +349,7 @@ end
 redef class Android_app_Fragment
        private new (nit_window: Window)
        import Window.on_create_fragment in "Java" `{
-               final int final_nit_window = nit_window;
+               final nit.app.NitObject final_nit_window = nit_window;
                Window_incr_ref(nit_window);
 
                return new android.app.Fragment(){