diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt index 77a7d5395..ee71f4428 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteDuplicateInterfaceEventArgs.txt @@ -66,13 +66,13 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_OnAnimationEnd_I; + static Delegate cb_OnAnimationEnd_OnAnimationEnd_I_Z; #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IHandler () { - if (cb_OnAnimationEnd_I == null) - cb_OnAnimationEnd_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I)); - return cb_OnAnimationEnd_I; + if (cb_OnAnimationEnd_OnAnimationEnd_I_Z == null) + cb_OnAnimationEnd_OnAnimationEnd_I_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I)); + return cb_OnAnimationEnd_OnAnimationEnd_I_Z; } static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) @@ -92,13 +92,13 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima return JNIEnv.CallBooleanMethod (((global::Java.Lang.Object) this).Handle, id_OnAnimationEnd_I, __args); } - static Delegate cb_OnAnimationEnd_II; + static Delegate cb_OnAnimationEnd_OnAnimationEnd_II_Z; #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IIHandler () { - if (cb_OnAnimationEnd_II == null) - cb_OnAnimationEnd_II = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II)); - return cb_OnAnimationEnd_II; + if (cb_OnAnimationEnd_OnAnimationEnd_II_Z == null) + cb_OnAnimationEnd_OnAnimationEnd_II_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II)); + return cb_OnAnimationEnd_OnAnimationEnd_II_Z; } static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt index dd73ded38..67d9e65a3 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceRedeclaredDefaultMethod.txt @@ -62,13 +62,13 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_DoSomething; + static Delegate cb_DoSomething_DoSomething_V; #pragma warning disable 0169 static Delegate GetDoSomethingHandler () { - if (cb_DoSomething == null) - cb_DoSomething = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); - return cb_DoSomething; + if (cb_DoSomething_DoSomething_V == null) + cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); + return cb_DoSomething_DoSomething_V; } static void n_DoSomething (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt index e75b6c1aa..26dba5fcd 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt @@ -49,13 +49,13 @@ public partial class MyClass { } } - static Delegate? cb_get_Count; + static Delegate? cb_get_Count_get_Count_I; #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count == null) - cb_get_Count = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count; + if (cb_get_Count_get_Count_I == null) + cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); + return cb_get_Count_get_Count_I; } static int n_get_Count (IntPtr jnienv, IntPtr native__this) @@ -65,13 +65,13 @@ public partial class MyClass { } #pragma warning restore 0169 - static Delegate? cb_set_Count_I; + static Delegate? cb_set_Count_set_Count_I_V; #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_I == null) - cb_set_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_I; + if (cb_set_Count_set_Count_I_V == null) + cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); + return cb_set_Count_set_Count_I_V; } static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) @@ -105,13 +105,13 @@ public partial class MyClass { } } - static Delegate? cb_get_Key; + static Delegate? cb_get_Key_get_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key == null) - cb_get_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key; + if (cb_get_Key_get_Key_Ljava_lang_String_ == null) + cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); + return cb_get_Key_get_Key_Ljava_lang_String_; } static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) @@ -121,13 +121,13 @@ public partial class MyClass { } #pragma warning restore 0169 - static Delegate? cb_set_Key_Ljava_lang_String_; + static Delegate? cb_set_Key_set_Key_Ljava_lang_String__V; #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_Ljava_lang_String_ == null) - cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_Ljava_lang_String_; + if (cb_set_Key_set_Key_Ljava_lang_String__V == null) + cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); + return cb_set_Key_set_Key_Ljava_lang_String__V; } static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) @@ -188,13 +188,13 @@ public partial class MyClass { } } - static Delegate? cb_get_AbstractCount; + static Delegate? cb_get_AbstractCount_get_AbstractCount_I; #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount == null) - cb_get_AbstractCount = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount; + if (cb_get_AbstractCount_get_AbstractCount_I == null) + cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); + return cb_get_AbstractCount_get_AbstractCount_I; } static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) @@ -204,13 +204,13 @@ public partial class MyClass { } #pragma warning restore 0169 - static Delegate? cb_set_AbstractCount_I; + static Delegate? cb_set_AbstractCount_set_AbstractCount_I_V; #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_I == null) - cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_I; + if (cb_set_AbstractCount_set_AbstractCount_I_V == null) + cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); + return cb_set_AbstractCount_set_AbstractCount_I_V; } static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) @@ -230,13 +230,13 @@ public partial class MyClass { set; } - static Delegate? cb_GetCountForKey_Ljava_lang_String_; + static Delegate? cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_Ljava_lang_String_ == null) - cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_Ljava_lang_String_; + if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) + cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; } static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) @@ -264,13 +264,13 @@ public partial class MyClass { } } - static Delegate? cb_Key; + static Delegate? cb_Key_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key == null) - cb_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key; + if (cb_Key_Key_Ljava_lang_String_ == null) + cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); + return cb_Key_Key_Ljava_lang_String_; } static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) @@ -303,13 +303,13 @@ public partial class MyClass { } } - static Delegate? cb_AbstractMethod; + static Delegate? cb_AbstractMethod_AbstractMethod_V; #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod == null) - cb_AbstractMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod; + if (cb_AbstractMethod_AbstractMethod_V == null) + cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); + return cb_AbstractMethod_AbstractMethod_V; } static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt index f22b66d41..bf2f261cd 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt @@ -130,13 +130,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf JNIEnv.DeleteLocalRef (local_ref); } - static Delegate? cb_get_Count; + static Delegate? cb_get_Count_get_Count_I; #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count == null) - cb_get_Count = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count; + if (cb_get_Count_get_Count_I == null) + cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); + return cb_get_Count_get_Count_I; } static int n_get_Count (IntPtr jnienv, IntPtr native__this) @@ -146,13 +146,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } #pragma warning restore 0169 - static Delegate? cb_set_Count_I; + static Delegate? cb_set_Count_set_Count_I_V; #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_I == null) - cb_set_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_I; + if (cb_set_Count_set_Count_I_V == null) + cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); + return cb_set_Count_set_Count_I_V; } static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) @@ -179,13 +179,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } } - static Delegate? cb_get_Key; + static Delegate? cb_get_Key_get_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key == null) - cb_get_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key; + if (cb_get_Key_get_Key_Ljava_lang_String_ == null) + cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); + return cb_get_Key_get_Key_Ljava_lang_String_; } static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) @@ -195,13 +195,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } #pragma warning restore 0169 - static Delegate? cb_set_Key_Ljava_lang_String_; + static Delegate? cb_set_Key_set_Key_Ljava_lang_String__V; #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_Ljava_lang_String_ == null) - cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_Ljava_lang_String_; + if (cb_set_Key_set_Key_Ljava_lang_String__V == null) + cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); + return cb_set_Key_set_Key_Ljava_lang_String__V; } static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) @@ -231,13 +231,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } } - static Delegate? cb_get_AbstractCount; + static Delegate? cb_get_AbstractCount_get_AbstractCount_I; #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount == null) - cb_get_AbstractCount = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount; + if (cb_get_AbstractCount_get_AbstractCount_I == null) + cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); + return cb_get_AbstractCount_get_AbstractCount_I; } static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) @@ -247,13 +247,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } #pragma warning restore 0169 - static Delegate? cb_set_AbstractCount_I; + static Delegate? cb_set_AbstractCount_set_AbstractCount_I_V; #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_I == null) - cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_I; + if (cb_set_AbstractCount_set_AbstractCount_I_V == null) + cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); + return cb_set_AbstractCount_set_AbstractCount_I_V; } static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) @@ -280,13 +280,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } } - static Delegate? cb_GetCountForKey_Ljava_lang_String_; + static Delegate? cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_Ljava_lang_String_ == null) - cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_Ljava_lang_String_; + if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) + cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; } static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) @@ -311,13 +311,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf return __ret; } - static Delegate? cb_Key; + static Delegate? cb_Key_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key == null) - cb_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key; + if (cb_Key_Key_Ljava_lang_String_ == null) + cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); + return cb_Key_Key_Ljava_lang_String_; } static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) @@ -335,13 +335,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf return JNIEnv.GetString (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_Key), JniHandleOwnership.TransferLocalRef); } - static Delegate? cb_AbstractMethod; + static Delegate? cb_AbstractMethod_AbstractMethod_V; #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod == null) - cb_AbstractMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod; + if (cb_AbstractMethod_AbstractMethod_V == null) + cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); + return cb_AbstractMethod_AbstractMethod_V; } static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt index 2db53ca34..37650f15b 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteMethodWithCharSequenceArrays.txt @@ -29,13 +29,13 @@ public partial class MyClass : Java.Lang.Object { { } - static Delegate? cb_echo_arrayLjava_lang_CharSequence_; + static Delegate? cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_; #pragma warning disable 0169 static Delegate GetEcho_arrayLjava_lang_CharSequence_Handler () { - if (cb_echo_arrayLjava_lang_CharSequence_ == null) - cb_echo_arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_)); - return cb_echo_arrayLjava_lang_CharSequence_; + if (cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ == null) + cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_)); + return cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_; } static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index b99b83877..faccd1ed9 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -49,13 +49,13 @@ public partial class MyClass { } } - static Delegate cb_get_Count; + static Delegate cb_get_Count_get_Count_I; #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count == null) - cb_get_Count = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count; + if (cb_get_Count_get_Count_I == null) + cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); + return cb_get_Count_get_Count_I; } static int n_get_Count (IntPtr jnienv, IntPtr native__this) @@ -65,13 +65,13 @@ public partial class MyClass { } #pragma warning restore 0169 - static Delegate cb_set_Count_I; + static Delegate cb_set_Count_set_Count_I_V; #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_I == null) - cb_set_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_I; + if (cb_set_Count_set_Count_I_V == null) + cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); + return cb_set_Count_set_Count_I_V; } static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) @@ -105,13 +105,13 @@ public partial class MyClass { } } - static Delegate cb_get_Key; + static Delegate cb_get_Key_get_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key == null) - cb_get_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key; + if (cb_get_Key_get_Key_Ljava_lang_String_ == null) + cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); + return cb_get_Key_get_Key_Ljava_lang_String_; } static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) @@ -121,13 +121,13 @@ public partial class MyClass { } #pragma warning restore 0169 - static Delegate cb_set_Key_Ljava_lang_String_; + static Delegate cb_set_Key_set_Key_Ljava_lang_String__V; #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_Ljava_lang_String_ == null) - cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_Ljava_lang_String_; + if (cb_set_Key_set_Key_Ljava_lang_String__V == null) + cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); + return cb_set_Key_set_Key_Ljava_lang_String__V; } static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) @@ -188,13 +188,13 @@ public partial class MyClass { } } - static Delegate cb_get_AbstractCount; + static Delegate cb_get_AbstractCount_get_AbstractCount_I; #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount == null) - cb_get_AbstractCount = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount; + if (cb_get_AbstractCount_get_AbstractCount_I == null) + cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); + return cb_get_AbstractCount_get_AbstractCount_I; } static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) @@ -204,13 +204,13 @@ public partial class MyClass { } #pragma warning restore 0169 - static Delegate cb_set_AbstractCount_I; + static Delegate cb_set_AbstractCount_set_AbstractCount_I_V; #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_I == null) - cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_I; + if (cb_set_AbstractCount_set_AbstractCount_I_V == null) + cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); + return cb_set_AbstractCount_set_AbstractCount_I_V; } static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) @@ -230,13 +230,13 @@ public partial class MyClass { set; } - static Delegate cb_GetCountForKey_Ljava_lang_String_; + static Delegate cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_Ljava_lang_String_ == null) - cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_Ljava_lang_String_; + if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) + cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; } static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) @@ -264,13 +264,13 @@ public partial class MyClass { } } - static Delegate cb_Key; + static Delegate cb_Key_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key == null) - cb_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key; + if (cb_Key_Key_Ljava_lang_String_ == null) + cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); + return cb_Key_Key_Ljava_lang_String_; } static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) @@ -303,13 +303,13 @@ public partial class MyClass { } } - static Delegate cb_AbstractMethod; + static Delegate cb_AbstractMethod_AbstractMethod_V; #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod == null) - cb_AbstractMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod; + if (cb_AbstractMethod_AbstractMethod_V == null) + cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); + return cb_AbstractMethod_AbstractMethod_V; } static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index 664feeeec..5a80ed03b 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -7,13 +7,13 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [Register ("DoDeclaration", "()V", "GetDoDeclarationHandler:java.code.IMyInterfaceInvoker, MyAssembly")] void DoDeclaration (); - private static Delegate cb_DoDefault; + private static Delegate cb_DoDefault_DoDefault_V; #pragma warning disable 0169 private static Delegate GetDoDefaultHandler () { - if (cb_DoDefault == null) - cb_DoDefault = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoDefault)); - return cb_DoDefault; + if (cb_DoDefault_DoDefault_V == null) + cb_DoDefault_DoDefault_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoDefault)); + return cb_DoDefault_DoDefault_V; } private static void n_DoDefault (IntPtr jnienv, IntPtr native__this) @@ -91,13 +91,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_DoDeclaration; + static Delegate cb_DoDeclaration_DoDeclaration_V; #pragma warning disable 0169 static Delegate GetDoDeclarationHandler () { - if (cb_DoDeclaration == null) - cb_DoDeclaration = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoDeclaration)); - return cb_DoDeclaration; + if (cb_DoDeclaration_DoDeclaration_V == null) + cb_DoDeclaration_DoDeclaration_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoDeclaration)); + return cb_DoDeclaration_DoDeclaration_V; } static void n_DoDeclaration (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt index 77a7d5395..ee71f4428 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -66,13 +66,13 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_OnAnimationEnd_I; + static Delegate cb_OnAnimationEnd_OnAnimationEnd_I_Z; #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IHandler () { - if (cb_OnAnimationEnd_I == null) - cb_OnAnimationEnd_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I)); - return cb_OnAnimationEnd_I; + if (cb_OnAnimationEnd_OnAnimationEnd_I_Z == null) + cb_OnAnimationEnd_OnAnimationEnd_I_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_Z (n_OnAnimationEnd_I)); + return cb_OnAnimationEnd_OnAnimationEnd_I_Z; } static bool n_OnAnimationEnd_I (IntPtr jnienv, IntPtr native__this, int param1) @@ -92,13 +92,13 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima return JNIEnv.CallBooleanMethod (((global::Java.Lang.Object) this).Handle, id_OnAnimationEnd_I, __args); } - static Delegate cb_OnAnimationEnd_II; + static Delegate cb_OnAnimationEnd_OnAnimationEnd_II_Z; #pragma warning disable 0169 static Delegate GetOnAnimationEnd_IIHandler () { - if (cb_OnAnimationEnd_II == null) - cb_OnAnimationEnd_II = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II)); - return cb_OnAnimationEnd_II; + if (cb_OnAnimationEnd_OnAnimationEnd_II_Z == null) + cb_OnAnimationEnd_OnAnimationEnd_II_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPII_Z (n_OnAnimationEnd_II)); + return cb_OnAnimationEnd_OnAnimationEnd_II_Z; } static bool n_OnAnimationEnd_II (IntPtr jnienv, IntPtr native__this, int param1, int param2) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index b7bebab0a..593da8196 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -130,13 +130,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_get_Count; + static Delegate cb_get_Count_get_Count_I; #pragma warning disable 0169 static Delegate Getget_CountHandler () { - if (cb_get_Count == null) - cb_get_Count = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); - return cb_get_Count; + if (cb_get_Count_get_Count_I == null) + cb_get_Count_get_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Count)); + return cb_get_Count_get_Count_I; } static int n_get_Count (IntPtr jnienv, IntPtr native__this) @@ -146,13 +146,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } #pragma warning restore 0169 - static Delegate cb_set_Count_I; + static Delegate cb_set_Count_set_Count_I_V; #pragma warning disable 0169 static Delegate Getset_Count_IHandler () { - if (cb_set_Count_I == null) - cb_set_Count_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); - return cb_set_Count_I; + if (cb_set_Count_set_Count_I_V == null) + cb_set_Count_set_Count_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Count_I)); + return cb_set_Count_set_Count_I_V; } static void n_set_Count_I (IntPtr jnienv, IntPtr native__this, int value) @@ -179,13 +179,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } } - static Delegate cb_get_Key; + static Delegate cb_get_Key_get_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate Getget_KeyHandler () { - if (cb_get_Key == null) - cb_get_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); - return cb_get_Key; + if (cb_get_Key_get_Key_Ljava_lang_String_ == null) + cb_get_Key_get_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_get_Key)); + return cb_get_Key_get_Key_Ljava_lang_String_; } static IntPtr n_get_Key (IntPtr jnienv, IntPtr native__this) @@ -195,13 +195,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } #pragma warning restore 0169 - static Delegate cb_set_Key_Ljava_lang_String_; + static Delegate cb_set_Key_set_Key_Ljava_lang_String__V; #pragma warning disable 0169 static Delegate Getset_Key_Ljava_lang_String_Handler () { - if (cb_set_Key_Ljava_lang_String_ == null) - cb_set_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); - return cb_set_Key_Ljava_lang_String_; + if (cb_set_Key_set_Key_Ljava_lang_String__V == null) + cb_set_Key_set_Key_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_set_Key_Ljava_lang_String_)); + return cb_set_Key_set_Key_Ljava_lang_String__V; } static void n_set_Key_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) @@ -231,13 +231,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } } - static Delegate cb_get_AbstractCount; + static Delegate cb_get_AbstractCount_get_AbstractCount_I; #pragma warning disable 0169 static Delegate Getget_AbstractCountHandler () { - if (cb_get_AbstractCount == null) - cb_get_AbstractCount = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); - return cb_get_AbstractCount; + if (cb_get_AbstractCount_get_AbstractCount_I == null) + cb_get_AbstractCount_get_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_AbstractCount)); + return cb_get_AbstractCount_get_AbstractCount_I; } static int n_get_AbstractCount (IntPtr jnienv, IntPtr native__this) @@ -247,13 +247,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } #pragma warning restore 0169 - static Delegate cb_set_AbstractCount_I; + static Delegate cb_set_AbstractCount_set_AbstractCount_I_V; #pragma warning disable 0169 static Delegate Getset_AbstractCount_IHandler () { - if (cb_set_AbstractCount_I == null) - cb_set_AbstractCount_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); - return cb_set_AbstractCount_I; + if (cb_set_AbstractCount_set_AbstractCount_I_V == null) + cb_set_AbstractCount_set_AbstractCount_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_AbstractCount_I)); + return cb_set_AbstractCount_set_AbstractCount_I_V; } static void n_set_AbstractCount_I (IntPtr jnienv, IntPtr native__this, int value) @@ -280,13 +280,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf } } - static Delegate cb_GetCountForKey_Ljava_lang_String_; + static Delegate cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; #pragma warning disable 0169 static Delegate GetGetCountForKey_Ljava_lang_String_Handler () { - if (cb_GetCountForKey_Ljava_lang_String_ == null) - cb_GetCountForKey_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); - return cb_GetCountForKey_Ljava_lang_String_; + if (cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I == null) + cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetCountForKey_Ljava_lang_String_)); + return cb_GetCountForKey_GetCountForKey_Ljava_lang_String__I; } static int n_GetCountForKey_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_key) @@ -311,13 +311,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf return __ret; } - static Delegate cb_Key; + static Delegate cb_Key_Key_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetKeyHandler () { - if (cb_Key == null) - cb_Key = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); - return cb_Key; + if (cb_Key_Key_Ljava_lang_String_ == null) + cb_Key_Key_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_Key)); + return cb_Key_Key_Ljava_lang_String_; } static IntPtr n_Key (IntPtr jnienv, IntPtr native__this) @@ -335,13 +335,13 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf return JNIEnv.GetString (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_Key), JniHandleOwnership.TransferLocalRef); } - static Delegate cb_AbstractMethod; + static Delegate cb_AbstractMethod_AbstractMethod_V; #pragma warning disable 0169 static Delegate GetAbstractMethodHandler () { - if (cb_AbstractMethod == null) - cb_AbstractMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); - return cb_AbstractMethod; + if (cb_AbstractMethod_AbstractMethod_V == null) + cb_AbstractMethod_AbstractMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_AbstractMethod)); + return cb_AbstractMethod_AbstractMethod_V; } static void n_AbstractMethod (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index 89e07fbd7..fd2e7bd28 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -3,13 +3,13 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); - private static Delegate cb_DoSomething; + private static Delegate cb_DoSomething_DoSomething_V; #pragma warning disable 0169 private static Delegate GetDoSomethingHandler () { - if (cb_DoSomething == null) - cb_DoSomething = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); - return cb_DoSomething; + if (cb_DoSomething_DoSomething_V == null) + cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); + return cb_DoSomething_DoSomething_V; } private static void n_DoSomething (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index 64e36addf..ad2258f03 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -3,13 +3,13 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); - private static Delegate cb_get_Value; + private static Delegate cb_get_Value_get_Value_I; #pragma warning disable 0169 private static Delegate Getget_ValueHandler () { - if (cb_get_Value == null) - cb_get_Value = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Value)); - return cb_get_Value; + if (cb_get_Value_get_Value_I == null) + cb_get_Value_get_Value_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Value)); + return cb_get_Value_get_Value_I; } private static int n_get_Value (IntPtr jnienv, IntPtr native__this) @@ -19,13 +19,13 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { } #pragma warning restore 0169 - private static Delegate cb_set_Value_I; + private static Delegate cb_set_Value_set_Value_I_V; #pragma warning disable 0169 private static Delegate Getset_Value_IHandler () { - if (cb_set_Value_I == null) - cb_set_Value_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Value_I)); - return cb_set_Value_I; + if (cb_set_Value_set_Value_I_V == null) + cb_set_Value_set_Value_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_set_Value_I)); + return cb_set_Value_set_Value_I_V; } private static void n_set_Value_I (IntPtr jnienv, IntPtr native__this, int value) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index b926e6637..321c3ffec 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -3,13 +3,13 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { private static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (IMyInterface), isInterface: true); - private static Delegate cb_get_Value; + private static Delegate cb_get_Value_get_Value_I; #pragma warning disable 0169 private static Delegate Getget_ValueHandler () { - if (cb_get_Value == null) - cb_get_Value = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Value)); - return cb_get_Value; + if (cb_get_Value_get_Value_I == null) + cb_get_Value_get_Value_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_get_Value)); + return cb_get_Value_get_Value_I; } private static int n_get_Value (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt index dd73ded38..67d9e65a3 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt @@ -62,13 +62,13 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_DoSomething; + static Delegate cb_DoSomething_DoSomething_V; #pragma warning disable 0169 static Delegate GetDoSomethingHandler () { - if (cb_DoSomething == null) - cb_DoSomething = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); - return cb_DoSomething; + if (cb_DoSomething_DoSomething_V == null) + cb_DoSomething_DoSomething_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_DoSomething)); + return cb_DoSomething_DoSomething_V; } static void n_DoSomething (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt index e4d231b71..5ae296955 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteMethodWithCharSequenceArrays.txt @@ -29,13 +29,13 @@ public partial class MyClass : Java.Lang.Object { { } - static Delegate cb_echo_arrayLjava_lang_CharSequence_; + static Delegate cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_; #pragma warning disable 0169 static Delegate GetEcho_arrayLjava_lang_CharSequence_Handler () { - if (cb_echo_arrayLjava_lang_CharSequence_ == null) - cb_echo_arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_)); - return cb_echo_arrayLjava_lang_CharSequence_; + if (cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ == null) + cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Echo_arrayLjava_lang_CharSequence_)); + return cb_echo_Echo_arrayLjava_lang_CharSequence__arrayLjava_lang_CharSequence_; } static IntPtr n_Echo_arrayLjava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_messages) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt index f014926a4..9b6e1b388 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt @@ -97,13 +97,13 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_getBar; + static Delegate cb_getBar_GetBar_I; #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar == null) - cb_getBar = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar; + if (cb_getBar_GetBar_I == null) + cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); + return cb_getBar_GetBar_I; } static int n_GetBar (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt index 680bc5e9b..7cbb6e8ab 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt @@ -73,13 +73,13 @@ public partial interface IParent : IJavaObject, IJavaPeerable { JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_getBar; + static Delegate cb_getBar_GetBar_I; #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar == null) - cb_getBar = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar; + if (cb_getBar_GetBar_I == null) + cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); + return cb_getBar_GetBar_I; } static int n_GetBar (IntPtr jnienv, IntPtr native__this) @@ -157,13 +157,13 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_getBar; + static Delegate cb_getBar_GetBar_I; #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar == null) - cb_getBar = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar; + if (cb_getBar_GetBar_I == null) + cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); + return cb_getBar_GetBar_I; } static int n_GetBar (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt index ecb9ce6d9..9cf82ca41 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt @@ -64,13 +64,13 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_getBar; + static Delegate cb_getBar_GetBar_I; #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar == null) - cb_getBar = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar; + if (cb_getBar_GetBar_I == null) + cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); + return cb_getBar_GetBar_I; } static int n_GetBar (IntPtr jnienv, IntPtr native__this) @@ -157,13 +157,13 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { JNIEnv.DeleteLocalRef (local_ref); } - static Delegate cb_getBar; + static Delegate cb_getBar_GetBar_I; #pragma warning disable 0169 static Delegate GetGetBarHandler () { - if (cb_getBar == null) - cb_getBar = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); - return cb_getBar; + if (cb_getBar_GetBar_I == null) + cb_getBar_GetBar_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetBar)); + return cb_getBar_GetBar_I; } static int n_GetBar (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs b/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs index 1a46ad1c6..a8393c61b 100644 --- a/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs +++ b/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.IO; using System.Linq; using System.Text; using generator.SourceWriters; @@ -1197,6 +1198,16 @@ public void FixupDeprecatedSinceBaseMethods () Assert.AreEqual (11, gens.Single (g => g.Name == "MyClass").Methods.Single (m => m.Name == "DoStuff").DeprecatedSince); } + protected static IEnumerable GetLinesThatStartWith (string source, string value) + { + using (var reader = new StringReader (source)) { + string line; + while ((line = reader.ReadLine ()) != null) { + if (line.TrimStart ().StartsWith (value, StringComparison.Ordinal)) + yield return line; + } + } + } static string StripRegisterAttributes (string str) { // It is hard to test if the [Obsolete] is on the setter/etc due to the [Register], so remove all [Register]s @@ -1418,6 +1429,40 @@ public void StringPropertyOverride ([Values ("true", "false")] string final) }"), $"was: `{writer}`"); } } + + [Test] + public void CallbackVariableNamesShouldntCollide () + { + var xml = @" + + + + + + + + + + + + + + + "; + + var gens = ParseApiDefinition (xml); + var klass = gens.Single (g => g.Name == "MyClass"); + + generator.Context.ContextTypes.Push (klass); + generator.WriteType (klass, string.Empty, new GenerationInfo ("", "", "MyAssembly")); + generator.Context.ContextTypes.Pop (); + var a = writer.ToString (); + var lines = GetLinesThatStartWith (writer.ToString (), "static Delegate cb_"); + + // Ensure that 2 cb_ delegates got written, and they do not have the same name + Assert.AreEqual (2, lines.Count ()); + Assert.AreNotEqual (lines.ElementAt (0), lines.ElementAt (1)); + } } abstract class CodeGeneratorTests : CodeGeneratorTestBase diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index 14081ca48..d5a5f220a 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -46,13 +46,13 @@ protected BasePublicClass (IntPtr javaReference, JniHandleOwnership transfer) : { } - static Delegate cb_baseMethod; + static Delegate cb_baseMethod_BaseMethod_V; #pragma warning disable 0169 static Delegate GetBaseMethodHandler () { - if (cb_baseMethod == null) - cb_baseMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); - return cb_baseMethod; + if (cb_baseMethod_BaseMethod_V == null) + cb_baseMethod_BaseMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); + return cb_baseMethod_BaseMethod_V; } static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 30f0d1737..6220f72d3 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -63,13 +63,13 @@ public unsafe ExtendPublicClass () : base (IntPtr.Zero, JniHandleOwnership.DoNot } } - static Delegate cb_foo; + static Delegate cb_foo_Foo_V; #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_foo == null) - cb_foo = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_foo; + if (cb_foo_Foo_V == null) + cb_foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); + return cb_foo_Foo_V; } static void n_Foo (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index f637b575c..04ab7fd4f 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -50,13 +50,13 @@ public IExtendedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : { } - static Delegate cb_extendedMethod; + static Delegate cb_extendedMethod_ExtendedMethod_V; #pragma warning disable 0169 static Delegate GetExtendedMethodHandler () { - if (cb_extendedMethod == null) - cb_extendedMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_ExtendedMethod)); - return cb_extendedMethod; + if (cb_extendedMethod_ExtendedMethod_V == null) + cb_extendedMethod_ExtendedMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_ExtendedMethod)); + return cb_extendedMethod_ExtendedMethod_V; } static void n_ExtendedMethod (IntPtr jnienv, IntPtr native__this) @@ -75,13 +75,13 @@ public unsafe void ExtendedMethod () } } - static Delegate cb_baseMethod; + static Delegate cb_baseMethod_BaseMethod_V; #pragma warning disable 0169 static Delegate GetBaseMethodHandler () { - if (cb_baseMethod == null) - cb_baseMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); - return cb_baseMethod; + if (cb_baseMethod_BaseMethod_V == null) + cb_baseMethod_BaseMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); + return cb_baseMethod_BaseMethod_V; } static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs index b2521040e..4ae661d76 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -57,13 +57,13 @@ public IProtectedInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : { } - static Delegate cb_foo; + static Delegate cb_foo_Foo_V; #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_foo == null) - cb_foo = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_foo; + if (cb_foo_Foo_V == null) + cb_foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); + return cb_foo_Foo_V; } static void n_Foo (IntPtr jnienv, IntPtr native__this) @@ -129,13 +129,13 @@ public unsafe PublicClass () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransf } } - static Delegate cb_foo; + static Delegate cb_foo_Foo_V; #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_foo == null) - cb_foo = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_foo; + if (cb_foo_Foo_V == null) + cb_foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); + return cb_foo_Foo_V; } static void n_Foo (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs index b748cec51..921dab094 100644 --- a/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -63,13 +63,13 @@ public unsafe TestClass () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer } } - static Delegate cb_baseMethod; + static Delegate cb_baseMethod_BaseMethod_V; #pragma warning disable 0169 static Delegate GetBaseMethodHandler () { - if (cb_baseMethod == null) - cb_baseMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); - return cb_baseMethod; + if (cb_baseMethod_BaseMethod_V == null) + cb_baseMethod_BaseMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_BaseMethod)); + return cb_baseMethod_BaseMethod_V; } static void n_BaseMethod (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs index b4ab5efbf..9d42336df 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -46,13 +46,13 @@ protected AbsSpinner (IntPtr javaReference, JniHandleOwnership transfer) : base { } - static Delegate cb_getAdapter; + static Delegate cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_; #pragma warning disable 0169 static Delegate GetGetAdapterHandler () { - if (cb_getAdapter == null) - cb_getAdapter = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetAdapter)); - return cb_getAdapter; + if (cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_ == null) + cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetAdapter)); + return cb_getAdapter_GetAdapter_Lxamarin_test_SpinnerAdapter_; } static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) @@ -62,13 +62,13 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setAdapter_Lxamarin_test_SpinnerAdapter_; + static Delegate cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V; #pragma warning disable 0169 static Delegate GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler () { - if (cb_setAdapter_Lxamarin_test_SpinnerAdapter_ == null) - cb_setAdapter_Lxamarin_test_SpinnerAdapter_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_SpinnerAdapter_)); - return cb_setAdapter_Lxamarin_test_SpinnerAdapter_; + if (cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V == null) + cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_SpinnerAdapter_)); + return cb_setAdapter_SetAdapter_Lxamarin_test_SpinnerAdapter__V; } static void n_SetAdapter_Lxamarin_test_SpinnerAdapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs index f9d006317..a0603b282 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs @@ -47,13 +47,13 @@ protected AdapterView (IntPtr javaReference, JniHandleOwnership transfer) : base { } - static Delegate cb_getAdapter; + static Delegate cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_; #pragma warning disable 0169 static Delegate GetGetAdapterHandler () { - if (cb_getAdapter == null) - cb_getAdapter = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetAdapter)); - return cb_getAdapter; + if (cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_ == null) + cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetAdapter)); + return cb_getAdapter_GetAdapter_Lxamarin_test_Adapter_; } static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) @@ -63,13 +63,13 @@ static IntPtr n_GetAdapter (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setAdapter_Lxamarin_test_Adapter_; + static Delegate cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V; #pragma warning disable 0169 static Delegate GetSetAdapter_Lxamarin_test_Adapter_Handler () { - if (cb_setAdapter_Lxamarin_test_Adapter_ == null) - cb_setAdapter_Lxamarin_test_Adapter_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_Adapter_)); - return cb_setAdapter_Lxamarin_test_Adapter_; + if (cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V == null) + cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetAdapter_Lxamarin_test_Adapter_)); + return cb_setAdapter_SetAdapter_Lxamarin_test_Adapter__V; } static void n_SetAdapter_Lxamarin_test_Adapter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) diff --git a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs index 3e7c915be..a15152c8a 100644 --- a/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -46,13 +46,13 @@ protected GenericReturnObject (IntPtr javaReference, JniHandleOwnership transfer { } - static Delegate cb_GenericReturn; + static Delegate cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_; #pragma warning disable 0169 static Delegate GetGenericReturnHandler () { - if (cb_GenericReturn == null) - cb_GenericReturn = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GenericReturn)); - return cb_GenericReturn; + if (cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_ == null) + cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GenericReturn)); + return cb_GenericReturn_GenericReturn_Lxamarin_test_AdapterView_; } static IntPtr n_GenericReturn (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 91c42c291..18df6af7a 100644 --- a/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -66,13 +66,13 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base { } - static Delegate cb_getSomeColor; + static Delegate cb_getSomeColor_GetSomeColor_I; #pragma warning disable 0169 static Delegate GetGetSomeColorHandler () { - if (cb_getSomeColor == null) - cb_getSomeColor = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetSomeColor)); - return cb_getSomeColor; + if (cb_getSomeColor_GetSomeColor_I == null) + cb_getSomeColor_GetSomeColor_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetSomeColor)); + return cb_getSomeColor_GetSomeColor_I; } static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this) @@ -82,13 +82,13 @@ static int n_GetSomeColor (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setSomeColor_I; + static Delegate cb_setSomeColor_SetSomeColor_I_V; #pragma warning disable 0169 static Delegate GetSetSomeColor_IHandler () { - if (cb_setSomeColor_I == null) - cb_setSomeColor_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_SetSomeColor_I)); - return cb_setSomeColor_I; + if (cb_setSomeColor_SetSomeColor_I_V == null) + cb_setSomeColor_SetSomeColor_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_SetSomeColor_I)); + return cb_setSomeColor_SetSomeColor_I_V; } static void n_SetSomeColor_I (IntPtr jnienv, IntPtr native__this, int native_newvalue) diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs index 143653f06..3485bf63c 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs @@ -24,13 +24,13 @@ internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } } - static Delegate cb_getMessage; + static Delegate cb_getMessage_GetMessage_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetGetMessageHandler () { - if (cb_getMessage == null) - cb_getMessage = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetMessage)); - return cb_getMessage; + if (cb_getMessage_GetMessage_Ljava_lang_String_ == null) + cb_getMessage_GetMessage_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetMessage)); + return cb_getMessage_GetMessage_Ljava_lang_String_; } static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index bf086dc64..0b7497e00 100644 --- a/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -46,13 +46,13 @@ protected CSharpKeywords (IntPtr javaReference, JniHandleOwnership transfer) : b { } - static Delegate cb_usePartial_I; + static Delegate cb_usePartial_UsePartial_I_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetUsePartial_IHandler () { - if (cb_usePartial_I == null) - cb_usePartial_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_UsePartial_I)); - return cb_usePartial_I; + if (cb_usePartial_UsePartial_I_Ljava_lang_String_ == null) + cb_usePartial_UsePartial_I_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_UsePartial_I)); + return cb_usePartial_UsePartial_I_Ljava_lang_String_; } static IntPtr n_UsePartial_I (IntPtr jnienv, IntPtr native__this, int partial) diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs index 17244b78d..fe7575e43 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs @@ -42,13 +42,13 @@ public ISpannableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (ha { } - static Delegate cb_getSpanFlags_Ljava_lang_Object_; + static Delegate cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_Ljava_lang_Object_ == null) - cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_Ljava_lang_Object_; + if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) + cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; } static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs index f352b2946..9e29c945d 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs @@ -45,13 +45,13 @@ public ISpannedInvoker (IntPtr handle, JniHandleOwnership transfer) : base (hand { } - static Delegate cb_getSpanFlags_Ljava_lang_Object_; + static Delegate cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_Ljava_lang_Object_ == null) - cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_Ljava_lang_Object_; + if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) + cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; } static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs index 7112e3d54..355cc043d 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs @@ -89,13 +89,13 @@ public unsafe SpannableString (string source) : base (IntPtr.Zero, JniHandleOwne } } - static Delegate cb_getSpanFlags_Ljava_lang_Object_; + static Delegate cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_Ljava_lang_Object_ == null) - cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_Ljava_lang_Object_; + if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) + cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; } static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_what) diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs index fd16adf66..177673a96 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs @@ -46,13 +46,13 @@ protected SpannableStringInternal (IntPtr javaReference, JniHandleOwnership tran { } - static Delegate cb_getSpanFlags_Ljava_lang_Object_; + static Delegate cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_Ljava_lang_Object_ == null) - cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_Ljava_lang_Object_; + if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) + cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; } static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) diff --git a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs index af4486b04..5f63c2559 100644 --- a/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs +++ b/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs @@ -57,13 +57,13 @@ public IOnClickListenerInvoker (IntPtr handle, JniHandleOwnership transfer) : ba { } - static Delegate cb_onClick_Landroid_view_View_; + static Delegate cb_onClick_OnClick_Landroid_view_View__V; #pragma warning disable 0169 static Delegate GetOnClick_Landroid_view_View_Handler () { - if (cb_onClick_Landroid_view_View_ == null) - cb_onClick_Landroid_view_View_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_OnClick_Landroid_view_View_)); - return cb_onClick_Landroid_view_View_; + if (cb_onClick_OnClick_Landroid_view_View__V == null) + cb_onClick_OnClick_Landroid_view_View__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_OnClick_Landroid_view_View_)); + return cb_onClick_OnClick_Landroid_view_View__V; } static void n_OnClick_Landroid_view_View_ (IntPtr jnienv, IntPtr native__this, IntPtr native_v) @@ -146,13 +146,13 @@ protected View (IntPtr javaReference, JniHandleOwnership transfer) : base (javaR { } - static Delegate cb_setOnClickListener_Landroid_view_View_OnClickListener_; + static Delegate cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V; #pragma warning disable 0169 static Delegate GetSetOnClickListener_Landroid_view_View_OnClickListener_Handler () { - if (cb_setOnClickListener_Landroid_view_View_OnClickListener_ == null) - cb_setOnClickListener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOnClickListener_Landroid_view_View_OnClickListener_)); - return cb_setOnClickListener_Landroid_view_View_OnClickListener_; + if (cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V == null) + cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOnClickListener_Landroid_view_View_OnClickListener_)); + return cb_setOnClickListener_SetOnClickListener_Landroid_view_View_OnClickListener__V; } static void n_SetOnClickListener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) @@ -177,13 +177,13 @@ public virtual unsafe void SetOnClickListener (global::Android.Views.View.IOnCli } } - static Delegate cb_setOn123Listener_Landroid_view_View_OnClickListener_; + static Delegate cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V; #pragma warning disable 0169 static Delegate GetSetOn123Listener_Landroid_view_View_OnClickListener_Handler () { - if (cb_setOn123Listener_Landroid_view_View_OnClickListener_ == null) - cb_setOn123Listener_Landroid_view_View_OnClickListener_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOn123Listener_Landroid_view_View_OnClickListener_)); - return cb_setOn123Listener_Landroid_view_View_OnClickListener_; + if (cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V == null) + cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOn123Listener_Landroid_view_View_OnClickListener_)); + return cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V; } static void n_SetOn123Listener_Landroid_view_View_OnClickListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_l) @@ -208,13 +208,13 @@ public virtual unsafe void SetOn123Listener (global::Android.Views.View.IOnClick } } - static Delegate cb_addTouchables_Ljava_util_ArrayList_; + static Delegate cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V; #pragma warning disable 0169 static Delegate GetAddTouchables_Ljava_util_ArrayList_Handler () { - if (cb_addTouchables_Ljava_util_ArrayList_ == null) - cb_addTouchables_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_AddTouchables_Ljava_util_ArrayList_)); - return cb_addTouchables_Ljava_util_ArrayList_; + if (cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V == null) + cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_AddTouchables_Ljava_util_ArrayList_)); + return cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V; } static void n_AddTouchables_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_views) diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs index e7db649f3..4108d414d 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaCrypto.cs @@ -44,13 +44,13 @@ public IExoMediaCryptoInvoker (IntPtr handle, JniHandleOwnership transfer) : bas { } - static Delegate cb_requiresSecureDecoderComponent_Ljava_lang_String_; + static Delegate cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z; #pragma warning disable 0169 static Delegate GetRequiresSecureDecoderComponent_Ljava_lang_String_Handler () { - if (cb_requiresSecureDecoderComponent_Ljava_lang_String_ == null) - cb_requiresSecureDecoderComponent_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_RequiresSecureDecoderComponent_Ljava_lang_String_)); - return cb_requiresSecureDecoderComponent_Ljava_lang_String_; + if (cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z == null) + cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_RequiresSecureDecoderComponent_Ljava_lang_String_)); + return cb_requiresSecureDecoderComponent_RequiresSecureDecoderComponent_Ljava_lang_String__Z; } static bool n_RequiresSecureDecoderComponent_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) diff --git a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index 62a7c68cf..cfef94267 100644 --- a/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -45,13 +45,13 @@ public IExoMediaDrmOnEventListenerInvoker (IntPtr handle, JniHandleOwnership tra { } - static Delegate cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB; + static Delegate cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V; #pragma warning disable 0169 static Delegate GetOnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayBHandler () { - if (cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB == null) - cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLLIIL_V (n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB)); - return cb_onEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB; + if (cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V == null) + cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLLIIL_V (n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB)); + return cb_onEvent_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB_V; } static void n_OnEvent_Lcom_google_android_exoplayer_drm_ExoMediaDrm_arrayBIIarrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_p0, IntPtr native_p1, int p2, int p3, IntPtr native_p4) @@ -215,13 +215,13 @@ public IExoMediaDrmInvoker (IntPtr handle, JniHandleOwnership transfer) : base ( { } - static Delegate cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_; + static Delegate cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V; #pragma warning disable 0169 static Delegate GetSetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_Handler () { - if (cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ == null) - cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_)); - return cb_setOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_; + if (cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V == null) + cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_)); + return cb_setOnEventListener_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener__V; } static void n_SetOnEventListener_Lcom_google_android_exoplayer_drm_ExoMediaDrm_OnEventListener_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index 97eb76e60..3d923cf68 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -44,13 +44,13 @@ public II1Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, t { } - static Delegate cb_close; + static Delegate cb_close_Close_V; #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close == null) - cb_close = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close; + if (cb_close_Close_V == null) + cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); + return cb_close_Close_V; } static void n_Close (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index efed6fe19..6926b1bc3 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -44,13 +44,13 @@ public II2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (handle, t { } - static Delegate cb_close; + static Delegate cb_close_Close_V; #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close == null) - cb_close = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close; + if (cb_close_Close_V == null) + cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); + return cb_close_Close_V; } static void n_Close (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index 36cb738ff..0a7fcc09e 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -46,13 +46,13 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base { } - static Delegate cb_close; + static Delegate cb_close_Close_V; #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close == null) - cb_close = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close; + if (cb_close_Close_V == null) + cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); + return cb_close_Close_V; } static void n_Close (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index 6dfa92928..ea751b19e 100644 --- a/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -46,13 +46,13 @@ protected SomeObject2 (IntPtr javaReference, JniHandleOwnership transfer) : base { } - static Delegate cb_irrelevant; + static Delegate cb_irrelevant_Irrelevant_V; #pragma warning disable 0169 static Delegate GetIrrelevantHandler () { - if (cb_irrelevant == null) - cb_irrelevant = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Irrelevant)); - return cb_irrelevant; + if (cb_irrelevant_Irrelevant_V == null) + cb_irrelevant_Irrelevant_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Irrelevant)); + return cb_irrelevant_Irrelevant_V; } static void n_Irrelevant (IntPtr jnienv, IntPtr native__this) @@ -73,13 +73,13 @@ public virtual unsafe void Irrelevant () } } - static Delegate cb_close; + static Delegate cb_close_Close_V; #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close == null) - cb_close = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close; + if (cb_close_Close_V == null) + cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); + return cb_close_Close_V; } static void n_Close (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 5002282f3..0b72d3b9c 100644 --- a/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -60,13 +60,13 @@ public IFactoryInvoker (IntPtr handle, JniHandleOwnership transfer) : base (hand { } - static Delegate cb_build_I; + static Delegate cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_; #pragma warning disable 0169 static Delegate GetBuild_IHandler () { - if (cb_build_I == null) - cb_build_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_Build_I)); - return cb_build_I; + if (cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_ == null) + cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_Build_I)); + return cb_build_Build_I_Lxamarin_test_NotificationCompatBase_Action_; } static IntPtr n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs index 677e9f177..a7b3cf65b 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs @@ -50,13 +50,13 @@ protected B (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe { } - static Delegate cb_setCustomDimension_I; + static Delegate cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_; #pragma warning disable 0169 static Delegate GetSetCustomDimension_IHandler () { - if (cb_setCustomDimension_I == null) - cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_SetCustomDimension_I)); - return cb_setCustomDimension_I; + if (cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_ == null) + cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_SetCustomDimension_I)); + return cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_A_B_; } static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) @@ -110,13 +110,13 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe { } - static Delegate cb_getHandle; + static Delegate cb_getHandle_GetHandle_I; #pragma warning disable 0169 static Delegate GetGetHandleHandler () { - if (cb_getHandle == null) - cb_getHandle = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetHandle)); - return cb_getHandle; + if (cb_getHandle_GetHandle_I == null) + cb_getHandle_GetHandle_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetHandle)); + return cb_getHandle_GetHandle_I; } static int n_GetHandle (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs index e54eb5be4..3a26d8276 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs @@ -47,13 +47,13 @@ protected C (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe { } - static Delegate cb_setCustomDimension_I; + static Delegate cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_; #pragma warning disable 0169 static Delegate GetSetCustomDimension_IHandler () { - if (cb_setCustomDimension_I == null) - cb_setCustomDimension_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_SetCustomDimension_I)); - return cb_setCustomDimension_I; + if (cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_ == null) + cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_L (n_SetCustomDimension_I)); + return cb_setCustomDimension_SetCustomDimension_I_Lxamarin_test_C_; } static IntPtr n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__this, int index) diff --git a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs index b4607771a..4a0ffc6f5 100644 --- a/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -66,13 +66,13 @@ public unsafe SomeObject (global::Java.Lang.Class c) : base (IntPtr.Zero, JniHan } } - static Delegate cb_getType; + static Delegate cb_getType_GetType_arrayI; #pragma warning disable 0169 static Delegate GetGetTypeHandler () { - if (cb_getType == null) - cb_getType = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetType)); - return cb_getType; + if (cb_getType_GetType_arrayI == null) + cb_getType_GetType_arrayI = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetType)); + return cb_getType_GetType_arrayI; } static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this) @@ -94,13 +94,13 @@ static IntPtr n_GetType (IntPtr jnienv, IntPtr native__this) } } - static Delegate cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_; + static Delegate cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I; #pragma warning disable 0169 static Delegate GetHandle_Ljava_lang_Object_Ljava_lang_Throwable_Handler () { - if (cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ == null) - cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLL_I (n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_)); - return cb_handle_Ljava_lang_Object_Ljava_lang_Throwable_; + if (cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I == null) + cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLL_I (n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_)); + return cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I; } static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntPtr native__this, IntPtr native_o, IntPtr native_t) @@ -130,13 +130,13 @@ static int n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jnienv, IntP } } - static Delegate cb_IntegerMethod; + static Delegate cb_IntegerMethod_IntegerMethod_I; #pragma warning disable 0169 static Delegate GetIntegerMethodHandler () { - if (cb_IntegerMethod == null) - cb_IntegerMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_IntegerMethod)); - return cb_IntegerMethod; + if (cb_IntegerMethod_IntegerMethod_I == null) + cb_IntegerMethod_IntegerMethod_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_IntegerMethod)); + return cb_IntegerMethod_IntegerMethod_I; } static int n_IntegerMethod (IntPtr jnienv, IntPtr native__this) @@ -158,13 +158,13 @@ public virtual unsafe int IntegerMethod () } } - static Delegate cb_VoidMethod; + static Delegate cb_VoidMethod_VoidMethod_V; #pragma warning disable 0169 static Delegate GetVoidMethodHandler () { - if (cb_VoidMethod == null) - cb_VoidMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_VoidMethod)); - return cb_VoidMethod; + if (cb_VoidMethod_VoidMethod_V == null) + cb_VoidMethod_VoidMethod_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_VoidMethod)); + return cb_VoidMethod_VoidMethod_V; } static void n_VoidMethod (IntPtr jnienv, IntPtr native__this) @@ -185,13 +185,13 @@ public virtual unsafe void VoidMethod () } } - static Delegate cb_StringMethod; + static Delegate cb_StringMethod_StringMethod_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetStringMethodHandler () { - if (cb_StringMethod == null) - cb_StringMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_StringMethod)); - return cb_StringMethod; + if (cb_StringMethod_StringMethod_Ljava_lang_String_ == null) + cb_StringMethod_StringMethod_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_StringMethod)); + return cb_StringMethod_StringMethod_Ljava_lang_String_; } static IntPtr n_StringMethod (IntPtr jnienv, IntPtr native__this) @@ -213,13 +213,13 @@ public virtual unsafe string StringMethod () } } - static Delegate cb_ObjectMethod; + static Delegate cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_; #pragma warning disable 0169 static Delegate GetObjectMethodHandler () { - if (cb_ObjectMethod == null) - cb_ObjectMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_ObjectMethod)); - return cb_ObjectMethod; + if (cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_ == null) + cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_ObjectMethod)); + return cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_; } static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this) @@ -241,13 +241,13 @@ static IntPtr n_ObjectMethod (IntPtr jnienv, IntPtr native__this) } } - static Delegate cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_; + static Delegate cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V; #pragma warning disable 0169 static Delegate GetVoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_Handler () { - if (cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ == null) - cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLIL_V (n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_)); - return cb_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_; + if (cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V == null) + cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLIL_V (n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_)); + return cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V; } static void n_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_astring, int anint, IntPtr native_anObject) @@ -277,14 +277,14 @@ public virtual unsafe void VoidMethodWithParams (string astring, int anint, glob } } - static Delegate cb_ObsoleteMethod; + static Delegate cb_ObsoleteMethod_ObsoleteMethod_I; #pragma warning disable 0169 [global::System.Obsolete] static Delegate GetObsoleteMethodHandler () { - if (cb_ObsoleteMethod == null) - cb_ObsoleteMethod = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_ObsoleteMethod)); - return cb_ObsoleteMethod; + if (cb_ObsoleteMethod_ObsoleteMethod_I == null) + cb_ObsoleteMethod_ObsoleteMethod_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_ObsoleteMethod)); + return cb_ObsoleteMethod_ObsoleteMethod_I; } [global::System.Obsolete] @@ -308,13 +308,13 @@ public virtual unsafe int ObsoleteMethod () } } - static Delegate cb_ArrayListTest_Ljava_util_ArrayList_; + static Delegate cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V; #pragma warning disable 0169 static Delegate GetArrayListTest_Ljava_util_ArrayList_Handler () { - if (cb_ArrayListTest_Ljava_util_ArrayList_ == null) - cb_ArrayListTest_Ljava_util_ArrayList_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_ArrayListTest_Ljava_util_ArrayList_)); - return cb_ArrayListTest_Ljava_util_ArrayList_; + if (cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V == null) + cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_ArrayListTest_Ljava_util_ArrayList_)); + return cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V; } static void n_ArrayListTest_Ljava_util_ArrayList_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) diff --git a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs index 5dfb2294d..4b2071473 100644 --- a/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -46,13 +46,13 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base { } - static Delegate cb_getSomeInteger; + static Delegate cb_getSomeInteger_GetSomeInteger_I; #pragma warning disable 0169 static Delegate GetGetSomeIntegerHandler () { - if (cb_getSomeInteger == null) - cb_getSomeInteger = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetSomeInteger)); - return cb_getSomeInteger; + if (cb_getSomeInteger_GetSomeInteger_I == null) + cb_getSomeInteger_GetSomeInteger_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_GetSomeInteger)); + return cb_getSomeInteger_GetSomeInteger_I; } static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this) @@ -62,13 +62,13 @@ static int n_GetSomeInteger (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setSomeInteger_I; + static Delegate cb_setSomeInteger_SetSomeInteger_I_V; #pragma warning disable 0169 static Delegate GetSetSomeInteger_IHandler () { - if (cb_setSomeInteger_I == null) - cb_setSomeInteger_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_SetSomeInteger_I)); - return cb_setSomeInteger_I; + if (cb_setSomeInteger_SetSomeInteger_I_V == null) + cb_setSomeInteger_SetSomeInteger_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_SetSomeInteger_I)); + return cb_setSomeInteger_SetSomeInteger_I_V; } static void n_SetSomeInteger_I (IntPtr jnienv, IntPtr native__this, int newvalue) @@ -88,13 +88,13 @@ public abstract int SomeInteger { set; } - static Delegate cb_getSomeObjectProperty; + static Delegate cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_; #pragma warning disable 0169 static Delegate GetGetSomeObjectPropertyHandler () { - if (cb_getSomeObjectProperty == null) - cb_getSomeObjectProperty = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetSomeObjectProperty)); - return cb_getSomeObjectProperty; + if (cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_ == null) + cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetSomeObjectProperty)); + return cb_getSomeObjectProperty_GetSomeObjectProperty_Ljava_lang_Object_; } static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this) @@ -104,13 +104,13 @@ static IntPtr n_GetSomeObjectProperty (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setSomeObjectProperty_Ljava_lang_Object_; + static Delegate cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V; #pragma warning disable 0169 static Delegate GetSetSomeObjectProperty_Ljava_lang_Object_Handler () { - if (cb_setSomeObjectProperty_Ljava_lang_Object_ == null) - cb_setSomeObjectProperty_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetSomeObjectProperty_Ljava_lang_Object_)); - return cb_setSomeObjectProperty_Ljava_lang_Object_; + if (cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V == null) + cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetSomeObjectProperty_Ljava_lang_Object_)); + return cb_setSomeObjectProperty_SetSomeObjectProperty_Ljava_lang_Object__V; } static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) @@ -131,13 +131,13 @@ static void n_SetSomeObjectProperty_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na set; } - static Delegate cb_getSomeString; + static Delegate cb_getSomeString_GetSomeString_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetGetSomeStringHandler () { - if (cb_getSomeString == null) - cb_getSomeString = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetSomeString)); - return cb_getSomeString; + if (cb_getSomeString_GetSomeString_Ljava_lang_String_ == null) + cb_getSomeString_GetSomeString_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetSomeString)); + return cb_getSomeString_GetSomeString_Ljava_lang_String_; } static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this) @@ -147,13 +147,13 @@ static IntPtr n_GetSomeString (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setSomeString_Ljava_lang_String_; + static Delegate cb_setSomeString_SetSomeString_Ljava_lang_String__V; #pragma warning disable 0169 static Delegate GetSetSomeString_Ljava_lang_String_Handler () { - if (cb_setSomeString_Ljava_lang_String_ == null) - cb_setSomeString_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetSomeString_Ljava_lang_String_)); - return cb_setSomeString_Ljava_lang_String_; + if (cb_setSomeString_SetSomeString_Ljava_lang_String__V == null) + cb_setSomeString_SetSomeString_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetSomeString_Ljava_lang_String_)); + return cb_setSomeString_SetSomeString_Ljava_lang_String__V; } static void n_SetSomeString_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_newvalue) diff --git a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs index b2edb0eb0..f0f2dfd85 100644 --- a/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs +++ b/tests/generator-Tests/expected.xaji/ParameterXPath/Xamarin.Test.A.cs @@ -47,13 +47,13 @@ protected A (IntPtr javaReference, JniHandleOwnership transfer) : base (javaRefe { } - static Delegate cb_setA_Ljava_lang_Object_; + static Delegate cb_setA_SetA_Ljava_lang_Object__V; #pragma warning disable 0169 static Delegate GetSetA_Ljava_lang_Object_Handler () { - if (cb_setA_Ljava_lang_Object_ == null) - cb_setA_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetA_Ljava_lang_Object_)); - return cb_setA_Ljava_lang_Object_; + if (cb_setA_SetA_Ljava_lang_Object__V == null) + cb_setA_SetA_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetA_Ljava_lang_Object_)); + return cb_setA_SetA_Ljava_lang_Object__V; } static void n_SetA_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_adapter) @@ -80,13 +80,13 @@ public virtual unsafe void SetA (global::Java.Lang.Object adapter) } } - static Delegate cb_listTest_Ljava_util_List_; + static Delegate cb_listTest_ListTest_Ljava_util_List__V; #pragma warning disable 0169 static Delegate GetListTest_Ljava_util_List_Handler () { - if (cb_listTest_Ljava_util_List_ == null) - cb_listTest_Ljava_util_List_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_ListTest_Ljava_util_List_)); - return cb_listTest_Ljava_util_List_; + if (cb_listTest_ListTest_Ljava_util_List__V == null) + cb_listTest_ListTest_Ljava_util_List__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_ListTest_Ljava_util_List_)); + return cb_listTest_ListTest_Ljava_util_List__V; } static void n_ListTest_Ljava_util_List_ (IntPtr jnienv, IntPtr native__this, IntPtr native_p0) diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs index 4900e259e..f2ff5e0e8 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs @@ -68,13 +68,13 @@ public unsafe FilterOutputStream (global::System.IO.Stream @out) : base (IntPtr. } } - static Delegate cb_write_I; + static Delegate cb_write_Write_I_V; #pragma warning disable 0169 static Delegate GetWrite_IHandler () { - if (cb_write_I == null) - cb_write_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Write_I)); - return cb_write_I; + if (cb_write_Write_I_V == null) + cb_write_Write_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Write_I)); + return cb_write_Write_I_V; } static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs index ae3fbf63a..b9777d674 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs @@ -46,13 +46,13 @@ protected IOException (IntPtr javaReference, JniHandleOwnership transfer) : base { } - static Delegate cb_printStackTrace; + static Delegate cb_printStackTrace_PrintStackTrace_V; #pragma warning disable 0169 static Delegate GetPrintStackTraceHandler () { - if (cb_printStackTrace == null) - cb_printStackTrace = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_PrintStackTrace)); - return cb_printStackTrace; + if (cb_printStackTrace_PrintStackTrace_V == null) + cb_printStackTrace_PrintStackTrace_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_PrintStackTrace)); + return cb_printStackTrace_PrintStackTrace_V; } static void n_PrintStackTrace (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs index 9f106b41b..c33b5fe16 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs @@ -63,13 +63,13 @@ public unsafe InputStream () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransf } } - static Delegate cb_available; + static Delegate cb_available_Available_I; #pragma warning disable 0169 static Delegate GetAvailableHandler () { - if (cb_available == null) - cb_available = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_Available)); - return cb_available; + if (cb_available_Available_I == null) + cb_available_Available_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_Available)); + return cb_available_Available_I; } static int n_Available (IntPtr jnienv, IntPtr native__this) @@ -91,13 +91,13 @@ public virtual unsafe int Available () } } - static Delegate cb_close; + static Delegate cb_close_Close_V; #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close == null) - cb_close = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close; + if (cb_close_Close_V == null) + cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); + return cb_close_Close_V; } static void n_Close (IntPtr jnienv, IntPtr native__this) @@ -118,13 +118,13 @@ public virtual unsafe void Close () } } - static Delegate cb_mark_I; + static Delegate cb_mark_Mark_I_V; #pragma warning disable 0169 static Delegate GetMark_IHandler () { - if (cb_mark_I == null) - cb_mark_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Mark_I)); - return cb_mark_I; + if (cb_mark_Mark_I_V == null) + cb_mark_Mark_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Mark_I)); + return cb_mark_Mark_I_V; } static void n_Mark_I (IntPtr jnienv, IntPtr native__this, int readlimit) @@ -147,13 +147,13 @@ public virtual unsafe void Mark (int readlimit) } } - static Delegate cb_markSupported; + static Delegate cb_markSupported_MarkSupported_Z; #pragma warning disable 0169 static Delegate GetMarkSupportedHandler () { - if (cb_markSupported == null) - cb_markSupported = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_Z (n_MarkSupported)); - return cb_markSupported; + if (cb_markSupported_MarkSupported_Z == null) + cb_markSupported_MarkSupported_Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_Z (n_MarkSupported)); + return cb_markSupported_MarkSupported_Z; } static bool n_MarkSupported (IntPtr jnienv, IntPtr native__this) @@ -175,13 +175,13 @@ public virtual unsafe bool MarkSupported () } } - static Delegate cb_read; + static Delegate cb_read_Read_I; #pragma warning disable 0169 static Delegate GetReadHandler () { - if (cb_read == null) - cb_read = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_Read)); - return cb_read; + if (cb_read_Read_I == null) + cb_read_Read_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_I (n_Read)); + return cb_read_Read_I; } static int n_Read (IntPtr jnienv, IntPtr native__this) @@ -195,13 +195,13 @@ static int n_Read (IntPtr jnienv, IntPtr native__this) [Register ("read", "()I", "GetReadHandler")] public abstract int Read (); - static Delegate cb_read_arrayB; + static Delegate cb_read_Read_arrayB_I; #pragma warning disable 0169 static Delegate GetRead_arrayBHandler () { - if (cb_read_arrayB == null) - cb_read_arrayB = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_Read_arrayB)); - return cb_read_arrayB; + if (cb_read_Read_arrayB_I == null) + cb_read_Read_arrayB_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_Read_arrayB)); + return cb_read_Read_arrayB_I; } static int n_Read_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) @@ -235,13 +235,13 @@ public virtual unsafe int Read (byte[] buffer) } } - static Delegate cb_read_arrayBII; + static Delegate cb_read_Read_arrayBII_I; #pragma warning disable 0169 static Delegate GetRead_arrayBIIHandler () { - if (cb_read_arrayBII == null) - cb_read_arrayBII = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLII_I (n_Read_arrayBII)); - return cb_read_arrayBII; + if (cb_read_Read_arrayBII_I == null) + cb_read_Read_arrayBII_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLII_I (n_Read_arrayBII)); + return cb_read_Read_arrayBII_I; } static int n_Read_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int byteOffset, int byteCount) @@ -277,13 +277,13 @@ public virtual unsafe int Read (byte[] buffer, int byteOffset, int byteCount) } } - static Delegate cb_reset; + static Delegate cb_reset_Reset_V; #pragma warning disable 0169 static Delegate GetResetHandler () { - if (cb_reset == null) - cb_reset = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Reset)); - return cb_reset; + if (cb_reset_Reset_V == null) + cb_reset_Reset_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Reset)); + return cb_reset_Reset_V; } static void n_Reset (IntPtr jnienv, IntPtr native__this) @@ -304,13 +304,13 @@ public virtual unsafe void Reset () } } - static Delegate cb_skip_J; + static Delegate cb_skip_Skip_J_J; #pragma warning disable 0169 static Delegate GetSkip_JHandler () { - if (cb_skip_J == null) - cb_skip_J = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPJ_J (n_Skip_J)); - return cb_skip_J; + if (cb_skip_Skip_J_J == null) + cb_skip_Skip_J_J = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPJ_J (n_Skip_J)); + return cb_skip_Skip_J_J; } static long n_Skip_J (IntPtr jnienv, IntPtr native__this, long byteCount) diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs index a268bd3f8..125cb5ce3 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs @@ -63,13 +63,13 @@ public unsafe OutputStream () : base (IntPtr.Zero, JniHandleOwnership.DoNotTrans } } - static Delegate cb_close; + static Delegate cb_close_Close_V; #pragma warning disable 0169 static Delegate GetCloseHandler () { - if (cb_close == null) - cb_close = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); - return cb_close; + if (cb_close_Close_V == null) + cb_close_Close_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Close)); + return cb_close_Close_V; } static void n_Close (IntPtr jnienv, IntPtr native__this) @@ -90,13 +90,13 @@ public virtual unsafe void Close () } } - static Delegate cb_flush; + static Delegate cb_flush_Flush_V; #pragma warning disable 0169 static Delegate GetFlushHandler () { - if (cb_flush == null) - cb_flush = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Flush)); - return cb_flush; + if (cb_flush_Flush_V == null) + cb_flush_Flush_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Flush)); + return cb_flush_Flush_V; } static void n_Flush (IntPtr jnienv, IntPtr native__this) @@ -117,13 +117,13 @@ public virtual unsafe void Flush () } } - static Delegate cb_write_arrayB; + static Delegate cb_write_Write_arrayB_V; #pragma warning disable 0169 static Delegate GetWrite_arrayBHandler () { - if (cb_write_arrayB == null) - cb_write_arrayB = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Write_arrayB)); - return cb_write_arrayB; + if (cb_write_Write_arrayB_V == null) + cb_write_Write_arrayB_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Write_arrayB)); + return cb_write_Write_arrayB_V; } static void n_Write_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer) @@ -155,13 +155,13 @@ public virtual unsafe void Write (byte[] buffer) } } - static Delegate cb_write_arrayBII; + static Delegate cb_write_Write_arrayBII_V; #pragma warning disable 0169 static Delegate GetWrite_arrayBIIHandler () { - if (cb_write_arrayBII == null) - cb_write_arrayBII = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLII_V (n_Write_arrayBII)); - return cb_write_arrayBII; + if (cb_write_Write_arrayBII_V == null) + cb_write_Write_arrayBII_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPLII_V (n_Write_arrayBII)); + return cb_write_Write_arrayBII_V; } static void n_Write_arrayBII (IntPtr jnienv, IntPtr native__this, IntPtr native_buffer, int offset, int count) @@ -195,13 +195,13 @@ public virtual unsafe void Write (byte[] buffer, int offset, int count) } } - static Delegate cb_write_I; + static Delegate cb_write_Write_I_V; #pragma warning disable 0169 static Delegate GetWrite_IHandler () { - if (cb_write_I == null) - cb_write_I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Write_I)); - return cb_write_I; + if (cb_write_Write_I_V == null) + cb_write_Write_I_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPI_V (n_Write_I)); + return cb_write_Write_I_V; } static void n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte) diff --git a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs index 143653f06..3485bf63c 100644 --- a/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs +++ b/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs @@ -24,13 +24,13 @@ internal static IntPtr class_ref { get { return _members.JniPeerType.PeerReference.Handle; } } - static Delegate cb_getMessage; + static Delegate cb_getMessage_GetMessage_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetGetMessageHandler () { - if (cb_getMessage == null) - cb_getMessage = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetMessage)); - return cb_getMessage; + if (cb_getMessage_GetMessage_Ljava_lang_String_ == null) + cb_getMessage_GetMessage_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetMessage)); + return cb_getMessage_GetMessage_Ljava_lang_String_; } static IntPtr n_GetMessage (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs index cd2627cd4..42f25f2e4 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs @@ -61,13 +61,13 @@ public unsafe ClassWithoutNamespace () : base (IntPtr.Zero, JniHandleOwnership.D } } - static Delegate cb_Foo; + static Delegate cb_Foo_Foo_V; #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_Foo == null) - cb_Foo = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_Foo; + if (cb_Foo_Foo_V == null) + cb_Foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); + return cb_Foo_Foo_V; } static void n_Foo (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs index 06a41d2d4..77e0d32f4 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs @@ -42,13 +42,13 @@ public IInterfaceWithoutNamespaceInvoker (IntPtr handle, JniHandleOwnership tran { } - static Delegate cb_Foo; + static Delegate cb_Foo_Foo_V; #pragma warning disable 0169 static Delegate GetFooHandler () { - if (cb_Foo == null) - cb_Foo = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); - return cb_Foo; + if (cb_Foo_Foo_V == null) + cb_Foo_Foo_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Foo)); + return cb_Foo_Foo_V; } static void n_Foo (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs index 9da790869..d0ecf3c2a 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs @@ -49,13 +49,13 @@ public ICollectionInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h { } - static Delegate cb_add_Ljava_lang_Object_; + static Delegate cb_add_Add_Ljava_lang_Object__Z; #pragma warning disable 0169 static Delegate GetAdd_Ljava_lang_Object_Handler () { - if (cb_add_Ljava_lang_Object_ == null) - cb_add_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); - return cb_add_Ljava_lang_Object_; + if (cb_add_Add_Ljava_lang_Object__Z == null) + cb_add_Add_Ljava_lang_Object__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); + return cb_add_Add_Ljava_lang_Object__Z; } static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) @@ -82,13 +82,13 @@ public unsafe bool Add (global::Java.Lang.Object e) } } - static Delegate cb_clear; + static Delegate cb_clear_Clear_V; #pragma warning disable 0169 static Delegate GetClearHandler () { - if (cb_clear == null) - cb_clear = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); - return cb_clear; + if (cb_clear_Clear_V == null) + cb_clear_Clear_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); + return cb_clear_Clear_V; } static void n_Clear (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs index 59f2fe632..2253c2480 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs @@ -49,13 +49,13 @@ public IDequeInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle { } - static Delegate cb_add_Ljava_lang_Object_; + static Delegate cb_add_Add_Ljava_lang_Object__Z; #pragma warning disable 0169 static Delegate GetAdd_Ljava_lang_Object_Handler () { - if (cb_add_Ljava_lang_Object_ == null) - cb_add_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); - return cb_add_Ljava_lang_Object_; + if (cb_add_Add_Ljava_lang_Object__Z == null) + cb_add_Add_Ljava_lang_Object__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); + return cb_add_Add_Ljava_lang_Object__Z; } static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) @@ -82,13 +82,13 @@ public unsafe bool Add (global::Java.Lang.Object e) } } - static Delegate cb_clear; + static Delegate cb_clear_Clear_V; #pragma warning disable 0169 static Delegate GetClearHandler () { - if (cb_clear == null) - cb_clear = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); - return cb_clear; + if (cb_clear_Clear_V == null) + cb_clear_Clear_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); + return cb_clear_Clear_V; } static void n_Clear (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs index 9618be5c0..22715da9e 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs @@ -47,13 +47,13 @@ public IQueueInvoker (IntPtr handle, JniHandleOwnership transfer) : base (handle { } - static Delegate cb_add_Ljava_lang_Object_; + static Delegate cb_add_Add_Ljava_lang_Object__Z; #pragma warning disable 0169 static Delegate GetAdd_Ljava_lang_Object_Handler () { - if (cb_add_Ljava_lang_Object_ == null) - cb_add_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); - return cb_add_Ljava_lang_Object_; + if (cb_add_Add_Ljava_lang_Object__Z == null) + cb_add_Add_Ljava_lang_Object__Z = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_Z (n_Add_Ljava_lang_Object_)); + return cb_add_Add_Ljava_lang_Object__Z; } static bool n_Add_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_e) @@ -80,13 +80,13 @@ public unsafe bool Add (global::Java.Lang.Object e) } } - static Delegate cb_clear; + static Delegate cb_clear_Clear_V; #pragma warning disable 0169 static Delegate GetClearHandler () { - if (cb_clear == null) - cb_clear = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); - return cb_clear; + if (cb_clear_Clear_V == null) + cb_clear_Clear_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_V (n_Clear)); + return cb_clear_Clear_V; } static void n_Clear (IntPtr jnienv, IntPtr native__this) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs index 2d23d5428..bb9ad3ab3 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs @@ -63,13 +63,13 @@ public unsafe GenericImplementation () : base (IntPtr.Zero, JniHandleOwnership.D } } - static Delegate cb_SetObject_arrayB; + static Delegate cb_SetObject_SetObject_arrayB_V; #pragma warning disable 0169 static Delegate GetSetObject_arrayBHandler () { - if (cb_SetObject_arrayB == null) - cb_SetObject_arrayB = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_arrayB)); - return cb_SetObject_arrayB; + if (cb_SetObject_SetObject_arrayB_V == null) + cb_SetObject_SetObject_arrayB_V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_arrayB)); + return cb_SetObject_SetObject_arrayB_V; } static void n_SetObject_arrayB (IntPtr jnienv, IntPtr native__this, IntPtr native_value) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 216f6de4c..f3b3ad260 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -63,13 +63,13 @@ public unsafe GenericObjectPropertyImplementation () : base (IntPtr.Zero, JniHan } } - static Delegate cb_getObject; + static Delegate cb_getObject_GetObject_Ljava_lang_Object_; #pragma warning disable 0169 static Delegate GetGetObjectHandler () { - if (cb_getObject == null) - cb_getObject = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); - return cb_getObject; + if (cb_getObject_GetObject_Ljava_lang_Object_ == null) + cb_getObject_GetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); + return cb_getObject_GetObject_Ljava_lang_Object_; } static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) @@ -79,13 +79,13 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setObject_Ljava_lang_Object_; + static Delegate cb_setObject_SetObject_Ljava_lang_Object__V; #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_Object_Handler () { - if (cb_setObject_Ljava_lang_Object_ == null) - cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); - return cb_setObject_Ljava_lang_Object_; + if (cb_setObject_SetObject_Ljava_lang_Object__V == null) + cb_setObject_SetObject_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); + return cb_setObject_SetObject_Ljava_lang_Object__V; } static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs index f82690208..8b302fdf1 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -63,13 +63,13 @@ public unsafe GenericStringImplementation () : base (IntPtr.Zero, JniHandleOwner } } - static Delegate cb_SetObject_arrayLjava_lang_String_; + static Delegate cb_SetObject_SetObject_arrayLjava_lang_String__V; #pragma warning disable 0169 static Delegate GetSetObject_arrayLjava_lang_String_Handler () { - if (cb_SetObject_arrayLjava_lang_String_ == null) - cb_SetObject_arrayLjava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_arrayLjava_lang_String_)); - return cb_SetObject_arrayLjava_lang_String_; + if (cb_SetObject_SetObject_arrayLjava_lang_String__V == null) + cb_SetObject_SetObject_arrayLjava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_arrayLjava_lang_String_)); + return cb_SetObject_SetObject_arrayLjava_lang_String__V; } static void n_SetObject_arrayLjava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index 68fd45f6f..87c092a78 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -63,13 +63,13 @@ public unsafe GenericStringPropertyImplementation () : base (IntPtr.Zero, JniHan } } - static Delegate cb_getObject; + static Delegate cb_getObject_GetObject_Ljava_lang_String_; #pragma warning disable 0169 static Delegate GetGetObjectHandler () { - if (cb_getObject == null) - cb_getObject = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); - return cb_getObject; + if (cb_getObject_GetObject_Ljava_lang_String_ == null) + cb_getObject_GetObject_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); + return cb_getObject_GetObject_Ljava_lang_String_; } static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) @@ -79,13 +79,13 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_SetObject_Ljava_lang_String_; + static Delegate cb_SetObject_SetObject_Ljava_lang_String__V; #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_String_Handler () { - if (cb_SetObject_Ljava_lang_String_ == null) - cb_SetObject_Ljava_lang_String_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_String_)); - return cb_SetObject_Ljava_lang_String_; + if (cb_SetObject_SetObject_Ljava_lang_String__V == null) + cb_SetObject_SetObject_Ljava_lang_String__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_String_)); + return cb_SetObject_SetObject_Ljava_lang_String__V; } static void n_SetObject_Ljava_lang_String_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs index ce1e44f16..30efa1d2d 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericInterface.cs @@ -45,13 +45,13 @@ public IGenericInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : b { } - static Delegate cb_SetObject_Ljava_lang_Object_; + static Delegate cb_SetObject_SetObject_Ljava_lang_Object__V; #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_Object_Handler () { - if (cb_SetObject_Ljava_lang_Object_ == null) - cb_SetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); - return cb_SetObject_Ljava_lang_Object_; + if (cb_SetObject_SetObject_Ljava_lang_Object__V == null) + cb_SetObject_SetObject_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); + return cb_SetObject_SetObject_Ljava_lang_Object__V; } static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs index b2d2f04a5..71666dfe8 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -51,13 +51,13 @@ public IGenericPropertyInterfaceInvoker (IntPtr handle, JniHandleOwnership trans { } - static Delegate cb_getObject; + static Delegate cb_getObject_GetObject_Ljava_lang_Object_; #pragma warning disable 0169 static Delegate GetGetObjectHandler () { - if (cb_getObject == null) - cb_getObject = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); - return cb_getObject; + if (cb_getObject_GetObject_Ljava_lang_Object_ == null) + cb_getObject_GetObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_GetObject)); + return cb_getObject_GetObject_Ljava_lang_Object_; } static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) @@ -67,13 +67,13 @@ static IntPtr n_GetObject (IntPtr jnienv, IntPtr native__this) } #pragma warning restore 0169 - static Delegate cb_setObject_Ljava_lang_Object_; + static Delegate cb_setObject_SetObject_Ljava_lang_Object__V; #pragma warning disable 0169 static Delegate GetSetObject_Ljava_lang_Object_Handler () { - if (cb_setObject_Ljava_lang_Object_ == null) - cb_setObject_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); - return cb_setObject_Ljava_lang_Object_; + if (cb_setObject_SetObject_Ljava_lang_Object__V == null) + cb_setObject_SetObject_Ljava_lang_Object__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_SetObject_Ljava_lang_Object_)); + return cb_setObject_SetObject_Ljava_lang_Object__V; } static void n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native__object) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs index f65d7f0d8..8f2af06b3 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs @@ -106,13 +106,13 @@ public ITestInterfaceInvoker (IntPtr handle, JniHandleOwnership transfer) : base { } - static Delegate cb_getSpanFlags_Ljava_lang_Object_; + static Delegate cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_Ljava_lang_Object_ == null) - cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_Ljava_lang_Object_; + if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) + cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; } static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) @@ -137,13 +137,13 @@ public unsafe int GetSpanFlags (global::Java.Lang.Object tag) } } - static Delegate cb_append_Ljava_lang_CharSequence_; + static Delegate cb_append_Append_Ljava_lang_CharSequence__V; #pragma warning disable 0169 static Delegate GetAppend_Ljava_lang_CharSequence_Handler () { - if (cb_append_Ljava_lang_CharSequence_ == null) - cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_)); - return cb_append_Ljava_lang_CharSequence_; + if (cb_append_Append_Ljava_lang_CharSequence__V == null) + cb_append_Append_Ljava_lang_CharSequence__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_)); + return cb_append_Append_Ljava_lang_CharSequence__V; } static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) @@ -168,13 +168,13 @@ public unsafe void Append (global::Java.Lang.ICharSequence value) } } - static Delegate cb_identity_Ljava_lang_CharSequence_; + static Delegate cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_; #pragma warning disable 0169 static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () { - if (cb_identity_Ljava_lang_CharSequence_ == null) - cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_)); - return cb_identity_Ljava_lang_CharSequence_; + if (cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ == null) + cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_)); + return cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_; } static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) diff --git a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 69bbde3e1..9dec6d285 100644 --- a/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -84,13 +84,13 @@ public unsafe TestInterfaceImplementation () : base (IntPtr.Zero, JniHandleOwner } } - static Delegate cb_getSpanFlags_Ljava_lang_Object_; + static Delegate cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; #pragma warning disable 0169 static Delegate GetGetSpanFlags_Ljava_lang_Object_Handler () { - if (cb_getSpanFlags_Ljava_lang_Object_ == null) - cb_getSpanFlags_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); - return cb_getSpanFlags_Ljava_lang_Object_; + if (cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I == null) + cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_GetSpanFlags_Ljava_lang_Object_)); + return cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; } static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_tag) @@ -106,13 +106,13 @@ static int n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this [Register ("getSpanFlags", "(Ljava/lang/Object;)I", "GetGetSpanFlags_Ljava_lang_Object_Handler")] public abstract int GetSpanFlags (global::Java.Lang.Object tag); - static Delegate cb_append_Ljava_lang_CharSequence_; + static Delegate cb_append_Append_Ljava_lang_CharSequence__V; #pragma warning disable 0169 static Delegate GetAppend_Ljava_lang_CharSequence_Handler () { - if (cb_append_Ljava_lang_CharSequence_ == null) - cb_append_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_)); - return cb_append_Ljava_lang_CharSequence_; + if (cb_append_Append_Ljava_lang_CharSequence__V == null) + cb_append_Append_Ljava_lang_CharSequence__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_V (n_Append_Ljava_lang_CharSequence_)); + return cb_append_Append_Ljava_lang_CharSequence__V; } static void n_Append_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) @@ -134,13 +134,13 @@ public void Append (string value) jls_value?.Dispose (); } - static Delegate cb_identity_Ljava_lang_CharSequence_; + static Delegate cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_; #pragma warning disable 0169 static Delegate GetIdentity_Ljava_lang_CharSequence_Handler () { - if (cb_identity_Ljava_lang_CharSequence_ == null) - cb_identity_Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_)); - return cb_identity_Ljava_lang_CharSequence_; + if (cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ == null) + cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_L (n_Identity_Ljava_lang_CharSequence_)); + return cb_identity_Identity_Ljava_lang_CharSequence__Ljava_lang_CharSequence_; } static IntPtr n_Identity_Ljava_lang_CharSequence_ (IntPtr jnienv, IntPtr native__this, IntPtr native_value) diff --git a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs index 8b6985e44..96f2d33c1 100644 --- a/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/tests/generator-Tests/expected.xaji/java.lang.Enum/Java.Lang.IComparable.cs @@ -45,13 +45,13 @@ public IComparableInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h { } - static Delegate cb_compareTo_Ljava_lang_Object_; + static Delegate cb_compareTo_CompareTo_Ljava_lang_Object__I; #pragma warning disable 0169 static Delegate GetCompareTo_Ljava_lang_Object_Handler () { - if (cb_compareTo_Ljava_lang_Object_ == null) - cb_compareTo_Ljava_lang_Object_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_CompareTo_Ljava_lang_Object_)); - return cb_compareTo_Ljava_lang_Object_; + if (cb_compareTo_CompareTo_Ljava_lang_Object__I == null) + cb_compareTo_CompareTo_Ljava_lang_Object__I = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPL_I (n_CompareTo_Ljava_lang_Object_)); + return cb_compareTo_CompareTo_Ljava_lang_Object__I; } static int n_CompareTo_Ljava_lang_Object_ (IntPtr jnienv, IntPtr native__this, IntPtr native_another) diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs index 4d711708f..d818df4c2 100644 --- a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs +++ b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/Method.cs @@ -165,7 +165,7 @@ public Method Clone (GenBase declaringType) public string ConnectorName => $"Get{Name}{IDSignature}Handler"; - public string EscapedCallbackName => IdentifierValidator.CreateValidIdentifier ($"cb_{JavaName}{IDSignature}", true); + public string EscapedCallbackName => IdentifierValidator.CreateValidIdentifier ($"cb_{JavaName}_{Name}{IDSignatureWithReturnType}", true); public string EscapedIdName => IdentifierValidator.CreateValidIdentifier ($"id_{JavaName}{IDSignature}", true); diff --git a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs index 714f38392..8eb5c71da 100644 --- a/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs +++ b/tools/generator/Java.Interop.Tools.Generator.ObjectModel/MethodBase.cs @@ -84,7 +84,11 @@ public string GetSignature (CodeGenerationOptions opt) return sb.ToString (); } - internal string IDSignature => Parameters.Count > 0 ? "_" + Parameters.JniSignature.Replace ("/", "_").Replace ("`", "_").Replace (";", "_").Replace ("$", "_").Replace ("[", "array") : string.Empty; + internal string IDSignature => Parameters.Count > 0 ? "_" + EscapeSignature (Parameters.JniSignature) : string.Empty; + + internal string IDSignatureWithReturnType => IDSignature + (this is Method method ? "_" + EscapeSignature (method.RetVal.JniName) : ""); + + internal string EscapeSignature (string value) => value.Replace ("/", "_").Replace ("`", "_").Replace (";", "_").Replace ("$", "_").Replace ("[", "array"); public virtual bool IsGeneric => Parameters.HasGeneric;