Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[generator] Use custom delegates instead of Func/Action. #632

Merged
merged 4 commits into from
Apr 28, 2020
Merged

[generator] Use custom delegates instead of Func/Action. #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dec7404
[generator] Use custom delegates instead of Func/Action.
jpobst Apr 21, 2020
3a24821
Add support for Kotlin unsigned types.
jpobst Apr 24, 2020
c102f43
Revert some unintended changes.
jpobst Apr 28, 2020
62b2fbe
Update expected test results.
jpobst Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tests/generator-Tests/Tests-Core/expected.cp/__NamespaceMapping__.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
using System;

[assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]
[assembly:global::Android.Runtime.NamespaceMapping (Java = "xamarin.test.invalidnames", Managed="Xamarin.Test.Invalidnames")]

2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpannable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Va
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected.ji/Android.Text.ISpanned.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public unsafe SpannableString (string source)
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected.ji/Android.Text.SpannableStringInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
8 changes: 4 additions & 4 deletions tests/generator-Tests/Tests-Core/expected.ji/Android.Views.View.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba
static Delegate GetOnClick_Landroid_view_View_Handler ()
{
if (cb_onClick_Landroid_view_View_ == null)
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_OnClick_Landroid_view_View_);
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnClick_Landroid_view_View_);
return cb_onClick_Landroid_view_View_;
}

Expand Down Expand Up @@ -154,7 +154,7 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR
static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler ()
{
if (cb_setOnClickListener_Landroid_view_View_OnClickListener_ == null)
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
return cb_setOnClickListener_Landroid_view_View_OnClickListener_;
}

Expand Down Expand Up @@ -184,7 +184,7 @@ public virtual unsafe void SetOnClickListener (Android.Views.View.IOnClickListen
static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ()
{
if (cb_setOn123Listener_Landroid_view_View_OnClickListener_ == null)
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
return cb_setOn123Listener_Landroid_view_View_OnClickListener_;
}

Expand Down Expand Up @@ -214,7 +214,7 @@ public virtual unsafe void SetOn123Listener (Android.Views.View.IOnClickListener
static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler ()
{
if (cb_addTouchables_Ljava_util_ArrayList_ == null)
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_AddTouchables_Ljava_util_ArrayList_);
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_AddTouchables_Ljava_util_ArrayList_);
return cb_addTouchables_Ljava_util_ArrayList_;
}

Expand Down
5 changes: 5 additions & 0 deletions tests/generator-Tests/Tests-Core/expected.ji/__NamespaceMapping__.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
using System;

[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.view", Managed="Android.Views")]
[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.text", Managed="Android.Text")]
[assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]

delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected/Android.Text.ISpannable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Va
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected/Android.Text.ISpanned.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Vali
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableString.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public unsafe SpannableString (string source)
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/generator-Tests/Tests-Core/expected/Android.Text.SpannableStringInternal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran
static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler ()
{
if (cb_getSpanFlags_Ljava_lang_Object_ == null)
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetSpanFlags_Ljava_lang_Object_);
cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetSpanFlags_Ljava_lang_Object_);
return cb_getSpanFlags_Ljava_lang_Object_;
}

Expand Down
8 changes: 4 additions & 4 deletions tests/generator-Tests/Tests-Core/expected/Android.Views.View.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba
static Delegate GetOnClick_Landroid_view_View_Handler ()
{
if (cb_onClick_Landroid_view_View_ == null)
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_OnClick_Landroid_view_View_);
cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_OnClick_Landroid_view_View_);
return cb_onClick_Landroid_view_View_;
}

Expand Down Expand Up @@ -141,7 +141,7 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR
static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler ()
{
if (cb_setOnClickListener_Landroid_view_View_OnClickListener_ == null)
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOnClickListener_Landroid_view_View_OnClickListener_);
return cb_setOnClickListener_Landroid_view_View_OnClickListener_;
}

Expand Down Expand Up @@ -177,7 +177,7 @@ public virtual unsafe void SetOnClickListener (Android.Views.View.IOnClickListen
static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler ()
{
if (cb_setOn123Listener_Landroid_view_View_OnClickListener_ == null)
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_SetOn123Listener_Landroid_view_View_OnClickListener_);
return cb_setOn123Listener_Landroid_view_View_OnClickListener_;
}

Expand Down Expand Up @@ -213,7 +213,7 @@ public virtual unsafe void SetOn123Listener (Android.Views.View.IOnClickListener
static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler ()
{
if (cb_addTouchables_Ljava_util_ArrayList_ == null)
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_AddTouchables_Ljava_util_ArrayList_);
cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_AddTouchables_Ljava_util_ArrayList_);
return cb_addTouchables_Ljava_util_ArrayList_;
}

Expand Down
5 changes: 5 additions & 0 deletions tests/generator-Tests/Tests-Core/expected/__NamespaceMapping__.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
using System;

[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.view", Managed="Android.Views")]
[assembly:global::Android.Runtime.NamespaceMapping (Java = "android.text", Managed="Android.Text")]
[assembly:global::Android.Runtime.NamespaceMapping (Java = "java.lang", Managed="Java.Lang")]

delegate int _JniMarshal_PPL_I (IntPtr jnienv, IntPtr klass, IntPtr p0);
delegate void _JniMarshal_PPL_V (IntPtr jnienv, IntPtr klass, IntPtr p0);
6 changes: 3 additions & 3 deletions ...tor-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokers.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
{
if (cb_GetCountForKey_Ljava_lang_String_ == null)
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
return cb_GetCountForKey_Ljava_lang_String_;
}

Expand Down Expand Up @@ -34,7 +34,7 @@ static Delegate cb_Key;
static Delegate GetKeyHandler ()
{
if (cb_Key == null)
cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
return cb_Key;
}

Expand All @@ -58,7 +58,7 @@ static Delegate cb_AbstractMethod;
static Delegate GetAbstractMethodHandler ()
{
if (cb_AbstractMethod == null)
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
return cb_AbstractMethod;
}

Expand Down
6 changes: 3 additions & 3 deletions .../Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceMethodInvokersWithSkips.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ static Delegate cb_GetCountForKey_Ljava_lang_String_;
static Delegate GetGetCountForKey_Ljava_lang_String_Handler ()
{
if (cb_GetCountForKey_Ljava_lang_String_ == null)
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr, int>) n_GetCountForKey_Ljava_lang_String_);
cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_I) n_GetCountForKey_Ljava_lang_String_);
return cb_GetCountForKey_Ljava_lang_String_;
}

Expand Down Expand Up @@ -34,7 +34,7 @@ static Delegate cb_Key;
static Delegate GetKeyHandler ()
{
if (cb_Key == null)
cb_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_Key);
cb_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_Key);
return cb_Key;
}

Expand All @@ -58,7 +58,7 @@ static Delegate cb_AbstractMethod;
static Delegate GetAbstractMethodHandler ()
{
if (cb_AbstractMethod == null)
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr>) n_AbstractMethod);
cb_AbstractMethod = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_V) n_AbstractMethod);
return cb_AbstractMethod;
}

Expand Down
16 changes: 8 additions & 8 deletions ...r-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokers.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ static Delegate cb_get_Count;
static Delegate Getget_CountHandler ()
{
if (cb_get_Count == null)
cb_get_Count = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_Count);
cb_get_Count = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_Count);
return cb_get_Count;
}

Expand All @@ -19,7 +19,7 @@ static Delegate cb_set_Count_I;
static Delegate Getset_Count_IHandler ()
{
if (cb_set_Count_I == null)
cb_set_Count_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_Count_I);
cb_set_Count_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_Count_I);
return cb_set_Count_I;
}

Expand Down Expand Up @@ -52,7 +52,7 @@ static Delegate cb_get_Key;
static Delegate Getget_KeyHandler ()
{
if (cb_get_Key == null)
cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
return cb_get_Key;
}

Expand All @@ -68,7 +68,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
static Delegate Getset_Key_Ljava_lang_String_Handler ()
{
if (cb_set_Key_Ljava_lang_String_ == null)
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
return cb_set_Key_Ljava_lang_String_;
}

Expand Down Expand Up @@ -104,7 +104,7 @@ static Delegate cb_get_StaticCount;
static Delegate Getget_StaticCountHandler ()
{
if (cb_get_StaticCount == null)
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
return cb_get_StaticCount;
}

Expand All @@ -120,7 +120,7 @@ static Delegate cb_set_StaticCount_I;
static Delegate Getset_StaticCount_IHandler ()
{
if (cb_set_StaticCount_I == null)
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
return cb_set_StaticCount_I;
}

Expand Down Expand Up @@ -153,7 +153,7 @@ static Delegate cb_get_AbstractCount;
static Delegate Getget_AbstractCountHandler ()
{
if (cb_get_AbstractCount == null)
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
return cb_get_AbstractCount;
}

Expand All @@ -169,7 +169,7 @@ static Delegate cb_set_AbstractCount_I;
static Delegate Getset_AbstractCount_IHandler ()
{
if (cb_set_AbstractCount_I == null)
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
return cb_set_AbstractCount_I;
}

Expand Down
12 changes: 6 additions & 6 deletions ...nit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfacePropertyInvokersWithSkips.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ static Delegate cb_get_Key;
static Delegate Getget_KeyHandler ()
{
if (cb_get_Key == null)
cb_get_Key = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, IntPtr>) n_get_Key);
cb_get_Key = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_L) n_get_Key);
return cb_get_Key;
}

Expand All @@ -19,7 +19,7 @@ static Delegate cb_set_Key_Ljava_lang_String_;
static Delegate Getset_Key_Ljava_lang_String_Handler ()
{
if (cb_set_Key_Ljava_lang_String_ == null)
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, IntPtr>) n_set_Key_Ljava_lang_String_);
cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_V) n_set_Key_Ljava_lang_String_);
return cb_set_Key_Ljava_lang_String_;
}

Expand Down Expand Up @@ -55,7 +55,7 @@ static Delegate cb_get_StaticCount;
static Delegate Getget_StaticCountHandler ()
{
if (cb_get_StaticCount == null)
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_StaticCount);
cb_get_StaticCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_StaticCount);
return cb_get_StaticCount;
}

Expand All @@ -71,7 +71,7 @@ static Delegate cb_set_StaticCount_I;
static Delegate Getset_StaticCount_IHandler ()
{
if (cb_set_StaticCount_I == null)
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_StaticCount_I);
cb_set_StaticCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_StaticCount_I);
return cb_set_StaticCount_I;
}

Expand Down Expand Up @@ -104,7 +104,7 @@ static Delegate cb_get_AbstractCount;
static Delegate Getget_AbstractCountHandler ()
{
if (cb_get_AbstractCount == null)
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_AbstractCount);
cb_get_AbstractCount = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_AbstractCount);
return cb_get_AbstractCount;
}

Expand All @@ -120,7 +120,7 @@ static Delegate cb_set_AbstractCount_I;
static Delegate Getset_AbstractCount_IHandler ()
{
if (cb_set_AbstractCount_I == null)
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_AbstractCount_I);
cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_AbstractCount_I);
return cb_set_AbstractCount_I;
}

Expand Down
4 changes: 2 additions & 2 deletions ...Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyAbstractDeclaration.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
static Delegate Getget_MyPropertyHandler ()
{
if (cb_get_MyProperty == null)
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
return cb_get_MyProperty;
}

Expand All @@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
static Delegate Getset_MyProperty_IHandler ()
{
if (cb_set_MyProperty_I == null)
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
return cb_set_MyProperty_I;
}

Expand Down
4 changes: 2 additions & 2 deletions ...generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WritePropertyCallbacks.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ static Delegate cb_get_MyProperty;
static Delegate Getget_MyPropertyHandler ()
{
if (cb_get_MyProperty == null)
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((Func<IntPtr, IntPtr, int>) n_get_MyProperty);
cb_get_MyProperty = JNINativeWrapper.CreateDelegate ((_JniMarshal_PP_I) n_get_MyProperty);
return cb_get_MyProperty;
}

Expand All @@ -19,7 +19,7 @@ static Delegate cb_set_MyProperty_I;
static Delegate Getset_MyProperty_IHandler ()
{
if (cb_set_MyProperty_I == null)
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, int>) n_set_MyProperty_I);
cb_set_MyProperty_I = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPI_V) n_set_MyProperty_I);
return cb_set_MyProperty_I;
}

Expand Down
Loading