From: Jean Privat Date: Tue, 22 Jul 2014 11:54:41 +0000 (-0400) Subject: lib/android: update to Java `long` to represent a Nit `Int` X-Git-Tag: v0.6.7~29^2 X-Git-Url: http://nitlanguage.org lib/android: update to Java `long` to represent a Nit `Int` Signed-off-by: Jean Privat --- diff --git a/lib/android/assets_and_resources.nit b/lib/android/assets_and_resources.nit index ef78d72..d654641 100644 --- a/lib/android/assets_and_resources.nit +++ b/lib/android/assets_and_resources.nit @@ -175,17 +175,17 @@ extern class NativeResources in "Java" `{ android.content.res.Resources `} redef type SELF: NativeResources fun get_assets:NativeAssetManager in "Java" `{ return recv.getAssets(); `} - fun get_color(id: Int): Int in "Java" `{ return recv.getColor(id); `} - fun get_boolean(id: Int): Bool in "Java" `{ return recv.getBoolean(id); `} - fun get_dimension(id: Int): Int in "Java" `{ return (int)recv.getDimension(id); `} - fun get_drawable(id: Int): NativeDrawable in "Java" `{ return recv.getDrawable(id); `} + fun get_color(id: Int): Int in "Java" `{ return recv.getColor((int)id); `} + fun get_boolean(id: Int): Bool in "Java" `{ return recv.getBoolean((int)id); `} + fun get_dimension(id: Int): Int in "Java" `{ return (int)recv.getDimension((int)id); `} + fun get_drawable(id: Int): NativeDrawable in "Java" `{ return recv.getDrawable((int)id); `} fun get_identifier(name, def_type, def_package: JavaString): Int in "Java" `{ return recv.getIdentifier(name, def_type, def_package); `} - fun get_integer(id: Int): Int in "Java" `{ return recv.getInteger(id); `} - fun get_string(id: Int): JavaString in "Java" `{ return recv.getString(id); `} - fun get_resource_entry_name(resid: Int): JavaString in "Java" `{ return recv.getResourceEntryName(resid); `} - fun get_resource_name(resid: Int): JavaString in "Java" `{ return recv.getResourceName(resid); `} - fun get_resource_pakage_name(resid: Int): JavaString in "Java" `{ return recv.getResourcePackageName(resid); `} - fun get_resource_type_name(resid: Int): JavaString in "Java" `{ return recv.getResourceTypeName(resid); `} + fun get_integer(id: Int): Int in "Java" `{ return recv.getInteger((int)id); `} + fun get_string(id: Int): JavaString in "Java" `{ return recv.getString((int)id); `} + fun get_resource_entry_name(resid: Int): JavaString in "Java" `{ return recv.getResourceEntryName((int)resid); `} + fun get_resource_name(resid: Int): JavaString in "Java" `{ return recv.getResourceName((int)resid); `} + fun get_resource_pakage_name(resid: Int): JavaString in "Java" `{ return recv.getResourcePackageName((int)resid); `} + fun get_resource_type_name(resid: Int): JavaString in "Java" `{ return recv.getResourceTypeName((int)resid); `} end # Resource manager for android resources placed in the `res` folder of your app @@ -284,7 +284,7 @@ extern class NativeBitmap in "Java" `{ android.graphics.Bitmap `} # Create a NativeBitmap using a resource ID and the NativeResources # Called by the ResourceManager - new from_resources(res: NativeResources, id: Int) in "Java" `{ return BitmapFactory.decodeResource(res, id); `} + new from_resources(res: NativeResources, id: Int) in "Java" `{ return BitmapFactory.decodeResource(res, (int)id); `} fun width: Int in "Java" `{ return recv.getWidth(); `} fun height: Int in "Java" `{ return recv.getHeight(); `} end diff --git a/lib/android/audio.nit b/lib/android/audio.nit index b46a660..7a19756 100644 --- a/lib/android/audio.nit +++ b/lib/android/audio.nit @@ -41,7 +41,7 @@ extern class NativeAudioManager in "Java" `{ android.media.AudioManager `} redef type SELF: NativeAudioManager fun mode: Int in "Java" `{ return recv.getMode(); `} - fun mode=(i: Int) in "Java" `{ recv.setMode(i); `} + fun mode=(i: Int) in "Java" `{ recv.setMode((int)i); `} fun wired_headset_on: Bool in "Java" `{ return recv.isWiredHeadsetOn(); `} fun wired_headset_on=(b: Bool) in "Java" `{ recv.setWiredHeadsetOn(b); `} fun speakerphone_on: Bool in "Java" `{ return recv.isSpeakerphoneOn(); `} @@ -74,7 +74,7 @@ extern class NativeMediaPlayer in "Java" `{ android.media.MediaPlayer `} } `} - fun create(context: NativeActivity, id: Int): NativeMediaPlayer in "Java" `{ return recv.create(context, id); `} + fun create(context: NativeActivity, id: Int): NativeMediaPlayer in "Java" `{ return recv.create(context, (int)id); `} fun pause in "Java" `{ recv.pause(); `} fun stop in "Java" `{ recv.stop(); `} fun playing: Bool in "Java" `{ return recv.isPlaying(); `} @@ -84,7 +84,7 @@ extern class NativeMediaPlayer in "Java" `{ android.media.MediaPlayer `} fun looping=(b: Bool) in "Java" `{ recv.setLooping(b); `} fun volume=(vol: Float) in "Java" `{ recv.setVolume((float)vol, (float)vol); `} fun both_volume(left_volume, right_volume: Float) in "Java" `{ recv.setVolume((float)left_volume, (float)right_volume); `} - fun stream_type=(stream_type: Int) in "Java" `{ recv.setAudioStreamType(stream_type); `} + fun stream_type=(stream_type: Int) in "Java" `{ recv.setAudioStreamType((int)stream_type); `} fun data_source_fd(fd: NativeFileDescriptor, start_offset, length: Int) in "Java" `{ try { recv.setDataSource(fd, start_offset, length); @@ -110,24 +110,24 @@ extern class NativeSoundPool in "Java" `{ android.media.SoundPool `} redef type SELF: NativeSoundPool new(max_streams, stream_type, src_quality: Int) in "Java" `{ - return new SoundPool(max_streams, stream_type, src_quality); + return new SoundPool((int)max_streams, (int)stream_type, (int)src_quality); `} - fun load_asset_fd(afd: NativeAssetFileDescriptor, priority: Int): Int in "Java" `{ return recv.load(afd, priority); `} - fun load_id(context: NativeActivity, resid, priority: Int): Int in "Java" `{ return recv.load(context, resid, priority); `} - fun load_path(path: JavaString, priority: Int): Int in "Java" `{ return recv.load(path, priority); `} + fun load_asset_fd(afd: NativeAssetFileDescriptor, priority: Int): Int in "Java" `{ return recv.load(afd, (int)priority); `} + fun load_id(context: NativeActivity, resid, priority: Int): Int in "Java" `{ return recv.load(context, (int)resid, (int)priority); `} + fun load_path(path: JavaString, priority: Int): Int in "Java" `{ return recv.load(path, (int)priority); `} fun play(sound_id: Int, left_volume, right_volume: Float, priority, l: Int, rate: Float): Int in "Java" `{ - return recv.play(sound_id, (float)left_volume, (float)right_volume, priority, l, (float)rate); + return recv.play((int)sound_id, (float)left_volume, (float)right_volume, (int)priority, (int)l, (float)rate); `} - fun pause(stream_id: Int) in "Java" `{ recv.pause(stream_id); `} + fun pause(stream_id: Int) in "Java" `{ recv.pause((int)stream_id); `} fun auto_pause in "Java" `{ recv.autoPause(); `} fun auto_resume in "Java" `{ recv.autoResume(); `} - fun resume(stream_id: Int) in "Java" `{ recv.resume(stream_id); `} - fun set_loop(stream_id, l: Int) in "Java" `{ recv.setLoop(stream_id, l); `} - fun set_priority(stream_id, priority: Int) in "Java" `{ recv.setPriority(stream_id, priority); `} - fun set_rate(stream_id: Int, rate: Float) in "Java" `{ recv.setRate(stream_id, (float)rate); `} - fun set_volume(stream_id: Int, left_volume, right_volume: Float) in "Java" `{ recv.setVolume(stream_id, (float)left_volume, (float)right_volume); `} - fun stop(stream_id: Int) in "Java" `{ recv.stop(stream_id); `} - fun unload(sound_id: Int): Bool in "Java" `{ return recv.unload(sound_id); `} + fun resume(stream_id: Int) in "Java" `{ recv.resume((int)stream_id); `} + fun set_loop(stream_id, l: Int) in "Java" `{ recv.setLoop((int)stream_id, (int)l); `} + fun set_priority(stream_id, priority: Int) in "Java" `{ recv.setPriority((int)stream_id, (int)priority); `} + fun set_rate(stream_id: Int, rate: Float) in "Java" `{ recv.setRate((int)stream_id, (float)rate); `} + fun set_volume(stream_id: Int, left_volume, right_volume: Float) in "Java" `{ recv.setVolume((int)stream_id, (float)left_volume, (float)right_volume); `} + fun stop(stream_id: Int) in "Java" `{ recv.stop((int)stream_id); `} + fun unload(sound_id: Int): Bool in "Java" `{ return recv.unload((int)sound_id); `} end diff --git a/lib/android/bundle/bundle.nit b/lib/android/bundle/bundle.nit index b8b8390..7a84d4b 100644 --- a/lib/android/bundle/bundle.nit +++ b/lib/android/bundle/bundle.nit @@ -85,7 +85,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} fun put_integer_array_list(key: JavaString, value: Array[Int]) import Array[Int].length, Array[Int].[] in "Java" `{ ArrayList java_array = - new ArrayList(Array_of_Int_length(value)); + new ArrayList((int) Array_of_Int_length(value)); for(int i=0; i < java_array.size(); ++i) java_array.add((int) Array_of_Int__index(value, i)); @@ -94,7 +94,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_string_array_list(key: JavaString, value: Array[JavaString]) import Array[JavaString].length, Array[JavaString].[] in "Java" `{ - ArrayList java_array = new ArrayList(Array_of_JavaString_length(value)); + ArrayList java_array = new ArrayList((int)Array_of_JavaString_length(value)); for(int i=0; i < java_array.size(); ++i) java_array.add(Array_of_JavaString__index(value, i)); @@ -104,7 +104,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} fun put_char_sequence_array_list(key: JavaString, value: Array[JavaString]) import Array[JavaString].length, Array[JavaString].[] in "Java" `{ ArrayList java_array = - new ArrayList(Array_of_JavaString_length(value)); + new ArrayList((int)Array_of_JavaString_length(value)); for(int i=0; i < java_array.size(); ++i) java_array.add(Array_of_JavaString__index(value, i)); @@ -113,7 +113,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_boolean_array(key: JavaString, value: Array[Bool]) import Array[Bool].length, Array[Bool].[] in "Java" `{ - boolean[] java_array = new boolean[Array_of_Bool_length(value)]; + boolean[] java_array = new boolean[(int)Array_of_Bool_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = Array_of_Bool__index(value, i); @@ -122,7 +122,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_byte_array(key: JavaString, value: Array[Int]) import Array[Int].length, Array[Int].[] in "Java" `{ - byte[] java_array = new byte[Array_of_Int_length(value)]; + byte[] java_array = new byte[(int)Array_of_Int_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = (byte) Array_of_Int__index(value, i); @@ -131,7 +131,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_short_array(key: JavaString, value: Array[Int]) import Array[Int].length, Array[Int].[] in "Java" `{ - short[] java_array = new short[Array_of_Int_length(value)]; + short[] java_array = new short[(int)Array_of_Int_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = (short) Array_of_Int__index(value, i); @@ -140,7 +140,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_char_array(key: JavaString, value: Array[Char]) import Array[Char].length, Array[Char].[] in "Java" `{ - char[] java_array = new char[Array_of_Char_length(value)]; + char[] java_array = new char[(int)Array_of_Char_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = Array_of_Char__index(value, i); @@ -149,7 +149,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_int_array(key: JavaString, value: Array[Int]) import Array[Int].length, Array[Int].[] in "Java" `{ - int[] java_array = new int[Array_of_Int_length(value)]; + int[] java_array = new int[(int)Array_of_Int_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = (int) Array_of_Int__index(value, i); @@ -158,7 +158,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_long_array(key: JavaString, value: Array[Int]) import Array[Int].length, Array[Int].[] in "Java" `{ - long[] java_array = new long[Array_of_Int_length(value)]; + long[] java_array = new long[(int)Array_of_Int_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = Array_of_Int__index(value, i); @@ -167,7 +167,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_float_array(key: JavaString, value: Array[Float]) import Array[Float].length, Array[Float].[] in "Java" `{ - float[] java_array = new float[Array_of_Float_length(value)]; + float[] java_array = new float[(int)Array_of_Float_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = (float) Array_of_Float__index(value, i); @@ -176,7 +176,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_double_array(key: JavaString, value: Array[Float]) import Array[Float].length, Array[Float].[] in "Java" `{ - double[] java_array = new double[Array_of_Float_length(value)]; + double[] java_array = new double[(int)Array_of_Float_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = Array_of_Float__index(value, i); @@ -185,7 +185,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_string_array(key: JavaString, value: Array[JavaString]) import Array[JavaString].length, Array[JavaString].[] in "Java" `{ - String[] java_array = new String[Array_of_JavaString_length(value)]; + String[] java_array = new String[(int)Array_of_JavaString_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = Array_of_JavaString__index(value, i); @@ -194,7 +194,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun put_char_sequence_array(key: JavaString, value: Array[JavaString]) import Array[JavaString].length, Array[JavaString].[] in "Java" `{ - CharSequence[] java_array = new CharSequence[Array_of_JavaString_length(value)]; + CharSequence[] java_array = new CharSequence[(int)Array_of_JavaString_length(value)]; for(int i=0; i < java_array.length; ++i) java_array[i] = Array_of_JavaString__index(value, i); @@ -222,13 +222,11 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} `} fun get_int(key: JavaString): Int in "Java" `{ return recv.getInt(key); `} fun get_int_with_def_value(key: JavaString, def_value: Int): Int in "Java" `{ - return (int) recv.getInt(key, (int) def_value); + return recv.getInt(key, (int) def_value); `} - # FIXME: Get rid of the int cast as soon as the ffi is fixed - fun get_long(key: JavaString): Int in "Java" `{ return (int) recv.getLong(key); `} - # FIXME: Get rid of the int cast as soon as the ffi is fixed + fun get_long(key: JavaString): Int in "Java" `{ return recv.getLong(key); `} fun get_long_with_def_value(key: JavaString, def_value: Int): Int in "Java" `{ - return (int) recv.getLong(key); + return recv.getLong(key); `} fun get_float(key: JavaString): Float in "Java" `{ return (float) recv.getFloat(key); @@ -305,7 +303,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} if (java_array == null) return nit_array; for(int i=0; i < java_array.length; ++i) - Array_of_Int_add(nit_array, (int) java_array[i]); + Array_of_Int_add(nit_array, java_array[i]); return nit_array; `} @@ -317,7 +315,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} if (java_array == null) return nit_array; for(int i=0; i < java_array.length; ++i) - Array_of_Int_add(nit_array, (int) java_array[i]); + Array_of_Int_add(nit_array, java_array[i]); return nit_array; `} @@ -354,7 +352,7 @@ extern class NativeBundle in "Java" `{ android.os.Bundle `} if (java_array == null) return nit_array; for(int i=0; i < java_array.length; ++i) - Array_of_Int_add(nit_array, (int) java_array[i]); + Array_of_Int_add(nit_array, java_array[i]); return nit_array; `} diff --git a/lib/android/java_io.nit b/lib/android/java_io.nit index 7b67cb3..bcd70dc 100644 --- a/lib/android/java_io.nit +++ b/lib/android/java_io.nit @@ -128,7 +128,7 @@ extern class NativeFileOutputStream in "Java" `{ java.io.FileOutputStream `} `} fun write(one_byte: Int) in "Java" `{ try { - recv.write(one_byte); + recv.write((byte)one_byte); }catch(IOException e){ e.printStackTrace(); } diff --git a/lib/android/shared_preferences/shared_preferences_api10.nit b/lib/android/shared_preferences/shared_preferences_api10.nit index 577d0d2..81ababc 100644 --- a/lib/android/shared_preferences/shared_preferences_api10.nit +++ b/lib/android/shared_preferences/shared_preferences_api10.nit @@ -75,14 +75,13 @@ extern class NativeSharedPreferences in "Java" `{ android.content.SharedPreferen fun get_int(key: JavaString, def_value: Int): Int in "Java" `{ int return_value; try { - return_value = recv.getInt(key, def_value); + return_value = recv.getInt(key, (int)def_value); } catch (ClassCastException e) { return def_value; } return return_value; `} - #FIXME: Get rid of the `int` cast when the ffi is fixed fun get_long(key: JavaString, def_value: Int): Int in "Java" `{ long return_value; try { @@ -118,7 +117,7 @@ extern class NativeSharedPreferencesEditor in "Java" `{ android.content.SharedPr return recv.putFloat(key, (float) value); `} fun put_int(key: JavaString, value: Int): NativeSharedPreferencesEditor in "Java" `{ - return recv.putInt(key, value); + return recv.putInt(key, (int)value); `} fun put_long(key: JavaString, value: Int): NativeSharedPreferencesEditor in "Java" `{ return recv.putLong(key, value); @@ -169,9 +168,9 @@ class SharedPreferences // Uses default SharedPreferences if file_name is an empty String if (file_name.equals("")) { - sp = context.getPreferences( mode); + sp = context.getPreferences((int)mode); } else { - sp = context.getSharedPreferences(file_name, mode); + sp = context.getSharedPreferences(file_name, (int)mode); } SharedPreferences.Editor editor = sp.edit();