diff --git a/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalMethods.cs b/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalMethods.cs index a30350685be..53ca7faa329 100644 --- a/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalMethods.cs +++ b/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalMethods.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using NUnit.Framework; namespace generatortests @@ -15,7 +16,27 @@ public void GeneratedOK () outputRelativePath: "NormalMethods", apiDescriptionFile: "expected.ji/NormalMethods/NormalMethods.xml", expectedRelativePath: "NormalMethods"); + + var output = File.ReadAllText (FullPath ("out.xaji/NormalMethods/Xamarin.Test.SomeObject.cs")); + Assert.That (output, Does.Contain (string.Join (Environment.NewLine, new [] { + "\t\t\tvar __result = __rm;", + "\t\t\tglobal::System.GC.KeepAlive (o);", + "\t\t\tglobal::System.GC.KeepAlive (t);", + "\t\t\treturn __result;", + }))); + Assert.That (output, Does.Contain (string.Join (Environment.NewLine, new [] { + "\t\t\t_members.InstanceMethods.FinishCreateInstance (__id, this, __args);", + "\t\t\tglobal::System.GC.KeepAlive (c);", + }))); + Assert.That (output, Does.Contain (string.Join (Environment.NewLine, new [] { + "\t\t\ttry {", + "\t\t\t\tJniArgumentValue* __args = stackalloc JniArgumentValue [3];", + }))); + Assert.That (output, Does.Contain (string.Join (Environment.NewLine, new [] { + "\t\t\t} finally {", + "\t\t\t\tJNIEnv.DeleteLocalRef (native_astring);", + "\t\t\t\tglobal::System.GC.KeepAlive (anObject);", + }))); } } } - diff --git a/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalProperties.cs b/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalProperties.cs index 97e973b3f49..117b3a6f6fc 100644 --- a/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalProperties.cs +++ b/external/Java.Interop/tests/generator-Tests/Integration-Tests/NormalProperties.cs @@ -1,4 +1,5 @@ using System; +using System.IO; using NUnit.Framework; namespace generatortests @@ -13,7 +14,12 @@ public void GeneratedOK () outputRelativePath: "NormalProperties", apiDescriptionFile: "expected.ji/NormalProperties/NormalProperties.xml", expectedRelativePath: "NormalProperties"); + + var output = File.ReadAllText (FullPath ("out.xaji/NormalProperties/Xamarin.Test.SomeObject.cs")); + Assert.That (output, Does.Contain (string.Join (Environment.NewLine, new [] { + "\t\t\t\t_members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args);", + "\t\t\t\tglobal::System.GC.KeepAlive (value);", + }))); } } } - diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt index 9366fc206c3..9e4f70cb88d 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteClass.txt @@ -16,12 +16,9 @@ public partial class MyClass { if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath constructor reference: path="/api/package[@name='java.code']/class[@name='MyClass']/constructor[@name='MyClass' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" @@ -49,21 +46,15 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_Count' and count(parameter)=0]" get { const string __id = "get_Count.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_Count' and count(parameter)=1 and parameter[1][@type='int']]" set { const string __id = "set_Count.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } @@ -71,11 +62,8 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_Key' and count(parameter)=0]" get { const string __id = "get_Key.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" set { @@ -95,21 +83,15 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_StaticCount' and count(parameter)=0]" get { const string __id = "get_StaticCount.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_StaticCount' and count(parameter)=1 and parameter[1][@type='int']]" set { const string __id = "set_StaticCount.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.StaticMethods.InvokeVoidMethod (__id, __args); } } @@ -144,11 +126,8 @@ public partial class MyClass { public virtual unsafe string? Key () { const string __id = "Key.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='StaticMethod' and count(parameter)=0]" @@ -156,10 +135,7 @@ public partial class MyClass { public static unsafe void StaticMethod () { const string __id = "StaticMethod.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='AbstractMethod' and count(parameter)=0]" diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt index 221e111c87b..f17a4468d56 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -28,26 +28,20 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima public unsafe bool OnAnimationEnd (int param1) { const string __id = "OnAnimationEnd.(I)Z"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (param1); - var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); - return __rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (param1); + var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + return __rm; } public unsafe bool OnAnimationEnd (int param1, int param2) { const string __id = "OnAnimationEnd.(II)Z"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue (param1); - __args [1] = new JniArgumentValue (param2); - var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); - return __rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [2]; + __args [0] = new JniArgumentValue (param1); + __args [1] = new JniArgumentValue (param2); + var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt index 5df892f297a..63cecbe3c5d 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt @@ -37,21 +37,15 @@ public partial interface IMyInterface : IJavaPeerable { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_StaticCount' and count(parameter)=0]" get { const string __id = "get_StaticCount.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_StaticCount' and count(parameter)=1 and parameter[1][@type='int']]" set { const string __id = "set_StaticCount.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.StaticMethods.InvokeVoidMethod (__id, __args); } } @@ -72,10 +66,7 @@ public partial interface IMyInterface : IJavaPeerable { public static unsafe void StaticMethod () { const string __id = "StaticMethod.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } } @@ -97,31 +88,22 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe int Count { get { const string __id = "get_Count.()I"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } set { const string __id = "set_Count.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } public unsafe string? Key { get { const string __id = "get_Key.()Ljava/lang/String;"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } set { const string __id = "set_Key.(Ljava/lang/String;)V"; @@ -139,20 +121,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe int AbstractCount { get { const string __id = "get_AbstractCount.()I"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } set { const string __id = "set_AbstractCount.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -173,20 +149,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe string? Key () { const string __id = "Key.()Ljava/lang/String;"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } public unsafe void AbstractMethod () { const string __id = "AbstractMethod.()V"; - try { - _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt index 67df154c853..f663b5cf550 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt @@ -11,11 +11,8 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_UIntProp' and count(parameter)=0]" get { const string __id = "get_UIntProp.()[I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UIntProp' and count(parameter)=1 and parameter[1][@type='uint[]']]" set { @@ -38,11 +35,8 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_UShortProp' and count(parameter)=0]" get { const string __id = "get_UShortProp.()[S"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UShortProp' and count(parameter)=1 and parameter[1][@type='ushort[]']]" set { @@ -65,11 +59,8 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_ULongProp' and count(parameter)=0]" get { const string __id = "get_ULongProp.()[J"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_ULongProp' and count(parameter)=1 and parameter[1][@type='ulong[]']]" set { @@ -92,11 +83,8 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_UByteProp' and count(parameter)=0]" get { const string __id = "get_UByteProp.()[B"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UByteProp' and count(parameter)=1 and parameter[1][@type='ubyte[]']]" set { diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt index ac069c810cf..8e33721d4d1 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt @@ -12,13 +12,10 @@ public partial class MyClass { public unsafe uint Echo (uint value) { const string __id = "Echo.(I)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return (uint)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + return (uint)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ushort']]" @@ -26,13 +23,10 @@ public partial class MyClass { public unsafe ushort Echo (ushort value) { const string __id = "Echo.(S)S"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, __args); - return (ushort)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, __args); + return (ushort)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ulong']]" @@ -40,13 +34,10 @@ public partial class MyClass { public unsafe ulong Echo (ulong value) { const string __id = "Echo.(J)J"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, __args); - return (ulong)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, __args); + return (ulong)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ubyte']]" @@ -54,13 +45,10 @@ public partial class MyClass { public unsafe byte Echo (byte value) { const string __id = "Echo.(B)B"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, __args); - return (byte)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, __args); + return (byte)__rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt index 377c2f941a3..1cde1f14c7e 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt @@ -11,21 +11,15 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_UIntProp' and count(parameter)=0]" get { const string __id = "get_UIntProp.()I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return (uint)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return (uint)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UIntProp' and count(parameter)=1 and parameter[1][@type='uint']]" set { const string __id = "set_UIntProp.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -33,21 +27,15 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_UShortProp' and count(parameter)=0]" get { const string __id = "get_UShortProp.()S"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, null); - return (ushort)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, null); + return (ushort)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UShortProp' and count(parameter)=1 and parameter[1][@type='ushort']]" set { const string __id = "set_UShortProp.(S)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -55,21 +43,15 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_ULongProp' and count(parameter)=0]" get { const string __id = "get_ULongProp.()J"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, null); - return (ulong)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, null); + return (ulong)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_ULongProp' and count(parameter)=1 and parameter[1][@type='ulong']]" set { const string __id = "set_ULongProp.(J)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -77,21 +59,15 @@ public partial class MyClass { // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='get_UByteProp' and count(parameter)=0]" get { const string __id = "get_UByteProp.()B"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, null); - return (byte)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, null); + return (byte)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UByteProp' and count(parameter)=1 and parameter[1][@type='ubyte']]" set { const string __id = "set_UByteProp.(B)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt index dc5184f1864..d240b1f2e49 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteObjectField.txt @@ -13,11 +13,8 @@ public partial class MyClass { set { const string __id = "field.Ljava/code/Example;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt index 79bbf1b741a..018834c1651 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteClass.txt @@ -20,12 +20,9 @@ public partial class MyClass { if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath constructor reference: path="/api/package[@name='java.code']/class[@name='MyClass']/constructor[@name='MyClass' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" @@ -94,22 +91,16 @@ public partial class MyClass { [Register ("get_Count", "()I", "Getget_CountHandler")] get { const string __id = "get_Count.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_Count' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("set_Count", "(I)V", "Getset_Count_IHandler")] set { const string __id = "set_Count.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } @@ -159,11 +150,8 @@ public partial class MyClass { [Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler")] get { const string __id = "get_Key.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" [Register ("set_Key", "(Ljava/lang/String;)V", "Getset_Key_Ljava_lang_String_Handler")] @@ -185,22 +173,16 @@ public partial class MyClass { [Register ("get_StaticCount", "()I", "")] get { const string __id = "get_StaticCount.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_StaticCount' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("set_StaticCount", "(I)V", "")] set { const string __id = "set_StaticCount.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.StaticMethods.InvokeVoidMethod (__id, __args); } } @@ -317,11 +299,8 @@ public partial class MyClass { public virtual unsafe string? Key () { const string __id = "Key.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='StaticMethod' and count(parameter)=0]" @@ -329,10 +308,7 @@ public partial class MyClass { public static unsafe void StaticMethod () { const string __id = "StaticMethod.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } static Delegate? cb_AbstractMethod_AbstractMethod_V; diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt index 98fb449c6f5..64524efd145 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1-NRT/WriteInterface.txt @@ -9,10 +9,7 @@ public abstract class MyInterface : Java.Lang.Object { public static unsafe void StaticMethod () { const string __id = "StaticMethod.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); @@ -148,20 +145,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe int Count { get { const string __id = "get_Count.()I"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } set { const string __id = "set_Count.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } @@ -209,11 +200,8 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe string? Key { get { const string __id = "get_Key.()Ljava/lang/String;"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } set { const string __id = "set_Key.(Ljava/lang/String;)V"; @@ -271,20 +259,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe int AbstractCount { get { const string __id = "get_AbstractCount.()I"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } set { const string __id = "set_AbstractCount.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -347,11 +329,8 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe string? Key () { const string __id = "Key.()Ljava/lang/String;"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } static Delegate? cb_AbstractMethod_AbstractMethod_V; @@ -377,10 +356,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe void AbstractMethod () { const string __id = "AbstractMethod.()V"; - try { - _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt index 4c026482296..fd875775219 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/ObsoleteInterfaceAlternativeClass.txt @@ -34,11 +34,8 @@ public abstract class Parent : Java.Lang.Object { public static unsafe int Comparing () { const string __id = "comparing.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='com.xamarin.android']/interface[@name='Parent']/method[@name='comparingOld' and count(parameter)=0]" @@ -47,11 +44,8 @@ public abstract class Parent : Java.Lang.Object { public static unsafe int ComparingOld () { const string __id = "comparingOld.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } static readonly JniPeerMembers _members = new XAPeerMembers ("com/xamarin/android/Parent", typeof (Parent)); @@ -89,11 +83,8 @@ public partial interface IParent : IJavaObject, IJavaPeerable { public static unsafe int Comparing () { const string __id = "comparing.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='com.xamarin.android']/interface[@name='Parent']/method[@name='comparingOld' and count(parameter)=0]" @@ -102,11 +93,8 @@ public partial interface IParent : IJavaObject, IJavaPeerable { public static unsafe int ComparingOld () { const string __id = "comparingOld.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt index 1c657d1b170..518fac85944 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteClass.txt @@ -20,12 +20,9 @@ public partial class MyClass { if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath constructor reference: path="/api/package[@name='java.code']/class[@name='MyClass']/constructor[@name='MyClass' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" @@ -94,22 +91,16 @@ public partial class MyClass { [Register ("get_Count", "()I", "Getget_CountHandler")] get { const string __id = "get_Count.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_Count' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("set_Count", "(I)V", "Getset_Count_IHandler")] set { const string __id = "set_Count.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } @@ -159,11 +150,8 @@ public partial class MyClass { [Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler")] get { const string __id = "get_Key.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" [Register ("set_Key", "(Ljava/lang/String;)V", "Getset_Key_Ljava_lang_String_Handler")] @@ -185,22 +173,16 @@ public partial class MyClass { [Register ("get_StaticCount", "()I", "")] get { const string __id = "get_StaticCount.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_StaticCount' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("set_StaticCount", "(I)V", "")] set { const string __id = "set_StaticCount.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.StaticMethods.InvokeVoidMethod (__id, __args); } } @@ -317,11 +299,8 @@ public partial class MyClass { public virtual unsafe string Key () { const string __id = "Key.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='StaticMethod' and count(parameter)=0]" @@ -329,10 +308,7 @@ public partial class MyClass { public static unsafe void StaticMethod () { const string __id = "StaticMethod.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } static Delegate cb_AbstractMethod_AbstractMethod_V; diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt index b488f9a2fae..3f4661598ae 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteConstSugarInterfaceFields.txt @@ -35,10 +35,7 @@ public abstract class MyInterface : Java.Lang.Object { set { const string __id = "MyStaticField.I"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt index 8499e8a02e9..d71ce579fee 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDefaultInterfaceMethodInvoker.txt @@ -32,10 +32,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { virtual unsafe void DoDefault () { const string __id = "DoDefault.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } @@ -93,10 +90,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe void DoDeclaration () { const string __id = "DoDeclaration.()V"; - try { - _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt index 48cd25e096e..60f538f3d58 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteDuplicateInterfaceEventArgs.txt @@ -64,13 +64,10 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima public unsafe bool OnAnimationEnd (int param1) { const string __id = "OnAnimationEnd.(I)Z"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (param1); - var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); - return __rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (param1); + var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + return __rm; } static Delegate cb_OnAnimationEnd_OnAnimationEnd_II_Z; @@ -96,14 +93,11 @@ internal partial class AnimatorListenerInvoker : global::Java.Lang.Object, Anima public unsafe bool OnAnimationEnd (int param1, int param2) { const string __id = "OnAnimationEnd.(II)Z"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue (param1); - __args [1] = new JniArgumentValue (param2); - var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); - return __rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [2]; + __args [0] = new JniArgumentValue (param1); + __args [1] = new JniArgumentValue (param2); + var __rm = _members_java_code_AnimatorListener.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt index 0a5b6b615ca..e3951c2b81d 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt @@ -9,10 +9,7 @@ public abstract class MyInterface : Java.Lang.Object { public static unsafe void StaticMethod () { const string __id = "StaticMethod.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); @@ -148,20 +145,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe int Count { get { const string __id = "get_Count.()I"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } set { const string __id = "set_Count.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } @@ -209,11 +200,8 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe string Key { get { const string __id = "get_Key.()Ljava/lang/String;"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } set { const string __id = "set_Key.(Ljava/lang/String;)V"; @@ -271,20 +259,14 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe int AbstractCount { get { const string __id = "get_AbstractCount.()I"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } set { const string __id = "set_AbstractCount.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -347,11 +329,8 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe string Key () { const string __id = "Key.()Ljava/lang/String;"; - try { - var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } static Delegate cb_AbstractMethod_AbstractMethod_V; @@ -377,10 +356,7 @@ internal partial class IMyInterfaceInvoker : global::Java.Lang.Object, IMyInterf public unsafe void AbstractMethod () { const string __id = "AbstractMethod.()V"; - try { - _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_code_IMyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt index 3f7764f0a3f..15fc3f309ea 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultMethod.txt @@ -28,10 +28,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { virtual unsafe void DoSomething () { const string __id = "DoSomething.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt index 5abe36fe1fa..f32390cd376 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultProperty.txt @@ -48,22 +48,16 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [Register ("get_Value", "()I", "Getget_ValueHandler:java.code.IMyInterface, MyAssembly")] get { const string __id = "get_Value.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Value' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("set_Value", "(I)V", "Getset_Value_IHandler:java.code.IMyInterface, MyAssembly")] set { const string __id = "set_Value.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt index 54998f6fc7f..d7551f0418d 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDefaultPropertyGetterOnly.txt @@ -28,11 +28,8 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [Register ("get_Value", "()I", "Getget_ValueHandler:java.code.IMyInterface, MyAssembly")] get { const string __id = "get_Value.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt index 966bebbd494..92ce24a54d7 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceFieldAsDimProperty.txt @@ -21,10 +21,7 @@ public abstract class MyInterface : Java.Lang.Object { set { const string __id = "EGL_NO_SURFACE.I"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } @@ -59,10 +56,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { set { const string __id = "EGL_NO_SURFACE.I"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt index c2528f201bd..afc2767a9c2 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceRedeclaredDefaultMethod.txt @@ -62,10 +62,7 @@ internal partial class IMyInterface2Invoker : global::Java.Lang.Object, IMyInter public unsafe void DoSomething () { const string __id = "DoSomething.()V"; - try { - _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members_java_code_IMyInterface.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt index 8736f0eab7d..048cac26745 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedArrayTypePropertiesClass.txt @@ -16,11 +16,8 @@ public partial class MyClass { [Register ("get_UIntProp", "()[I", "")] get { const string __id = "get_UIntProp.()[I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (uint[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (uint)); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return (uint[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (uint)); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UIntProp' and count(parameter)=1 and parameter[1][@type='uint[]']]" [Register ("set_UIntProp", "([I)V", "")] @@ -46,11 +43,8 @@ public partial class MyClass { [Register ("get_UShortProp", "()[S", "")] get { const string __id = "get_UShortProp.()[S"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (ushort[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (ushort)); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return (ushort[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (ushort)); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UShortProp' and count(parameter)=1 and parameter[1][@type='ushort[]']]" [Register ("set_UShortProp", "([S)V", "")] @@ -76,11 +70,8 @@ public partial class MyClass { [Register ("get_ULongProp", "()[J", "")] get { const string __id = "get_ULongProp.()[J"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (ulong[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (ulong)); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return (ulong[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (ulong)); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_ULongProp' and count(parameter)=1 and parameter[1][@type='ulong[]']]" [Register ("set_ULongProp", "([J)V", "")] @@ -106,11 +97,8 @@ public partial class MyClass { [Register ("get_UByteProp", "()[B", "")] get { const string __id = "get_UByteProp.()[B"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (byte[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (byte)); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return (byte[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (byte)); } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UByteProp' and count(parameter)=1 and parameter[1][@type='ubyte[]']]" [Register ("set_UByteProp", "([B)V", "")] diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt index 3b132be4563..e7bf7e2045f 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypeMethodsClass.txt @@ -16,13 +16,10 @@ public partial class MyClass { public unsafe uint Echo (uint value) { const string __id = "Echo.(I)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return (uint)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + return (uint)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ushort']]" @@ -30,13 +27,10 @@ public partial class MyClass { public unsafe ushort Echo (ushort value) { const string __id = "Echo.(S)S"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, __args); - return (ushort)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, __args); + return (ushort)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ulong']]" @@ -44,13 +38,10 @@ public partial class MyClass { public unsafe ulong Echo (ulong value) { const string __id = "Echo.(J)J"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, __args); - return (ulong)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, __args); + return (ulong)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='Echo' and count(parameter)=1 and parameter[1][@type='ubyte']]" @@ -58,13 +49,10 @@ public partial class MyClass { public unsafe byte Echo (byte value) { const string __id = "Echo.(B)B"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, __args); - return (byte)__rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, __args); + return (byte)__rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt index 7538d95984a..3ef572c1453 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteKotlinUnsignedTypePropertiesClass.txt @@ -16,22 +16,16 @@ public partial class MyClass { [Register ("get_UIntProp", "()I", "")] get { const string __id = "get_UIntProp.()I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return (uint)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return (uint)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UIntProp' and count(parameter)=1 and parameter[1][@type='uint']]" [Register ("set_UIntProp", "(I)V", "")] set { const string __id = "set_UIntProp.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -40,22 +34,16 @@ public partial class MyClass { [Register ("get_UShortProp", "()S", "")] get { const string __id = "get_UShortProp.()S"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, null); - return (ushort)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt16Method (__id, this, null); + return (ushort)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UShortProp' and count(parameter)=1 and parameter[1][@type='ushort']]" [Register ("set_UShortProp", "(S)V", "")] set { const string __id = "set_UShortProp.(S)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -64,22 +52,16 @@ public partial class MyClass { [Register ("get_ULongProp", "()J", "")] get { const string __id = "get_ULongProp.()J"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, null); - return (ulong)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt64Method (__id, this, null); + return (ulong)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_ULongProp' and count(parameter)=1 and parameter[1][@type='ulong']]" [Register ("set_ULongProp", "(J)V", "")] set { const string __id = "set_ULongProp.(J)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -88,22 +70,16 @@ public partial class MyClass { [Register ("get_UByteProp", "()B", "")] get { const string __id = "get_UByteProp.()B"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, null); - return (byte)__rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractSByteMethod (__id, this, null); + return (byte)__rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/class[@name='MyClass']/method[@name='set_UByteProp' and count(parameter)=1 and parameter[1][@type='ubyte']]" [Register ("set_UByteProp", "(B)V", "")] set { const string __id = "set_UByteProp.(B)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt index 5704eb70f9e..0ce0708acaa 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceClass.txt @@ -95,11 +95,8 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { public unsafe int Bar { get { const string __id = "getBar.()I"; - try { - var __rm = _members_com_xamarin_android_Parent.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_com_xamarin_android_Parent.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt index 807d66da6bb..662a4b0b092 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteNestedInterfaceTypes.txt @@ -71,11 +71,8 @@ public partial interface IParent : IJavaObject, IJavaPeerable { public unsafe int Bar { get { const string __id = "getBar.()I"; - try { - var __rm = _members_com_xamarin_android_Parent_Child.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_com_xamarin_android_Parent_Child.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } } @@ -136,11 +133,8 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { public unsafe int Bar { get { const string __id = "getBar.()I"; - try { - var __rm = _members_com_xamarin_android_Parent.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_com_xamarin_android_Parent.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt index 65861a0f952..f414fe1c97e 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceMethod.txt @@ -9,10 +9,7 @@ public abstract class MyInterface : Java.Lang.Object { public static unsafe void DoSomething () { const string __id = "DoSomething.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } static readonly JniPeerMembers _members = new XAPeerMembers ("java/code/IMyInterface", typeof (MyInterface)); @@ -38,10 +35,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { public static unsafe void DoSomething () { const string __id = "DoSomething.()V"; - try { - _members.StaticMethods.InvokeVoidMethod (__id, null); - } finally { - } + _members.StaticMethods.InvokeVoidMethod (__id, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt index f85226e205d..631c623ce48 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteStaticInterfaceProperty.txt @@ -8,22 +8,16 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable { [Register ("get_Value", "()I", "")] get { const string __id = "get_Value.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Value' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("set_Value", "(I)V", "")] set { const string __id = "set_Value.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.StaticMethods.InvokeVoidMethod (__id, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt index a918ca7e0dd..eadbda6874f 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteUnnestedInterfaceTypes.txt @@ -62,11 +62,8 @@ internal partial class IParentChildInvoker : global::Java.Lang.Object, IParentCh public unsafe int Bar { get { const string __id = "getBar.()I"; - try { - var __rm = _members_com_xamarin_android_Parent_Child.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_com_xamarin_android_Parent_Child.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } } @@ -136,11 +133,8 @@ internal partial class IParentInvoker : global::Java.Lang.Object, IParent { public unsafe int Bar { get { const string __id = "getBar.()I"; - try { - var __rm = _members_com_xamarin_android_Parent.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members_com_xamarin_android_Parent.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs index 3058ada62a0..d6ed6b08aac 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/CodeGeneratorTests.cs @@ -457,10 +457,17 @@ public void CompatVirtualMethod_Class () var xml = @" + + + + + + + "; @@ -472,7 +479,29 @@ public void CompatVirtualMethod_Class () generator.WriteType (klass, string.Empty, new GenerationInfo ("", "", "MyAssembly")); generator.Context.ContextTypes.Pop (); - Assert.True (writer.ToString ().NormalizeLineEndings ().Contains ("catch (Java.Lang.NoSuchMethodError) { throw new Java.Lang.AbstractMethodError (__id); }".NormalizeLineEndings ()), $"was: `{writer}`"); + var generated = writer.ToString (); + Assert.True (generated.NormalizeLineEndings ().Contains ("catch (Java.Lang.NoSuchMethodError) { throw new Java.Lang.AbstractMethodError (__id); }".NormalizeLineEndings ()), $"was: `{writer}`"); + Assert.That (generated.NormalizeLineEndings (), Does.Contain (""" + var __result = __rm; + global::System.GC.KeepAlive (value); + return __result; + } + catch (Java.Lang.NoSuchMethodError) { + global::System.GC.KeepAlive (value); + throw new Java.Lang.AbstractMethodError (__id); + } + """.NormalizeLineEndings ()), generated); + Assert.That (generated.NormalizeLineEndings (), Does.Contain (""" + } + catch (Java.Lang.NoSuchMethodError) { + throw new Java.Lang.AbstractMethodError (__id); + } finally { + """.NormalizeLineEndings ()), generated); + var expectedStringCleanup = Target == CodeGenerationTarget.JavaInterop1 + ? "global::Java.Interop.JniObjectReference.Dispose (ref native_value);" + : "JNIEnv.DeleteLocalRef (native_value);"; + Assert.That (generated, Does.Contain (expectedStringCleanup)); + Assert.AreEqual (generated.Count (c => c == '{'), generated.Count (c => c == '}'), generated); } [Test] diff --git a/external/Java.Interop/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs b/external/Java.Interop/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs index 7269620a091..e821a8e3dac 100644 --- a/external/Java.Interop/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs +++ b/external/Java.Interop/tests/generator-Tests/Unit-Tests/DefaultInterfaceMethodsTests.cs @@ -512,7 +512,9 @@ public void CompatVirtualMethod_Interface () generator.WriteType (klass, string.Empty, new GenerationInfo ("", "", "MyAssembly")); generator.Context.ContextTypes.Pop (); - Assert.True (writer.ToString ().NormalizeLineEndings ().Contains ("catch (Java.Lang.NoSuchMethodError) { throw new Java.Lang.AbstractMethodError (__id); }".NormalizeLineEndings ()), $"was: `{writer}`"); + var generated = writer.ToString (); + Assert.True (generated.NormalizeLineEndings ().Contains ("catch (Java.Lang.NoSuchMethodError) { throw new Java.Lang.AbstractMethodError (__id); }".NormalizeLineEndings ()), $"was: `{writer}`"); + Assert.AreEqual (generated.Count (c => c == '{'), generated.Count (c => c == '}'), generated); } [Test] diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index e7622dd0d29..92588565701 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -34,10 +34,7 @@ protected BasePublicClass (ref JniObjectReference reference, JniObjectReferenceO public virtual unsafe void BaseMethod () { const string __id = "baseMethod.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 4940693b031..daafd07856a 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -38,12 +38,9 @@ public unsafe ExtendPublicClass () : base (ref *InvalidJniObjectReference, JniOb if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='ExtendPublicClass']/method[@name='foo' and count(parameter)=0]" @@ -51,10 +48,7 @@ public unsafe ExtendPublicClass () : base (ref *InvalidJniObjectReference, JniOb public virtual unsafe void Foo () { const string __id = "foo.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index e95004b2cd1..50c8e330181 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -36,19 +36,13 @@ public IExtendedInterfaceInvoker (ref JniObjectReference reference, JniObjectRef public unsafe void ExtendedMethod () { const string __id = "extendedMethod.()V"; - try { - _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } public unsafe void BaseMethod () { const string __id = "baseMethod.()V"; - try { - _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs index 3b4bd69b428..850cdf49f55 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -43,10 +43,7 @@ public IProtectedInterfaceInvoker (ref JniObjectReference reference, JniObjectRe public unsafe void Foo () { const string __id = "foo.()V"; - try { - _members_xamarin_test_PublicClass_ProtectedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_PublicClass_ProtectedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } @@ -72,12 +69,9 @@ public unsafe PublicClass () : base (ref *InvalidJniObjectReference, JniObjectRe if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PublicClass']/method[@name='foo' and count(parameter)=0]" @@ -85,10 +79,7 @@ public unsafe PublicClass () : base (ref *InvalidJniObjectReference, JniObjectRe public virtual unsafe void Foo () { const string __id = "foo.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs index 762a41a2186..acf59e10c1a 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs @@ -34,10 +34,7 @@ internal PublicFinalClass (ref JniObjectReference reference, JniObjectReferenceO public unsafe void PublicMethod () { const string __id = "publicMethod.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PublicFinalClass']/method[@name='packageMethodB' and count(parameter)=0]" @@ -45,10 +42,7 @@ public unsafe void PublicMethod () public unsafe void PackageMethodB () { const string __id = "packageMethodB.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PublicFinalClass']/method[@name='packageMethodA' and count(parameter)=0]" @@ -56,10 +50,7 @@ public unsafe void PackageMethodB () public unsafe void PackageMethodA () { const string __id = "packageMethodA.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs index 3589da87056..c6ddb6022d8 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -38,12 +38,9 @@ public unsafe TestClass () : base (ref *InvalidJniObjectReference, JniObjectRefe if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='TestClass']/method[@name='baseMethod' and count(parameter)=0]" @@ -51,10 +48,7 @@ public unsafe TestClass () : base (ref *InvalidJniObjectReference, JniObjectRefe public virtual unsafe void BaseMethod () { const string __id = "baseMethod.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs index 72e9142528b..c91bb75eafa 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -33,22 +33,16 @@ protected AbsSpinner (ref JniObjectReference reference, JniObjectReferenceOption // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AbsSpinner']/method[@name='getAdapter' and count(parameter)=0]" get { const string __id = "getAdapter.()Lxamarin/test/SpinnerAdapter;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AbsSpinner']/method[@name='setAdapter' and count(parameter)=1 and parameter[1][@type='xamarin.test.SpinnerAdapter']]" set { const string __id = "setAdapter.(Lxamarin/test/SpinnerAdapter;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } @@ -72,23 +66,17 @@ public AbsSpinnerInvoker (ref JniObjectReference reference, JniObjectReferenceOp // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AdapterView']/method[@name='getAdapter' and count(parameter)=0]" get { const string __id = "getAdapter.()Lxamarin/test/Adapter;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AdapterView']/method[@name='setAdapter' and count(parameter)=1 and parameter[1][@type='T']]" set { const string __id = "setAdapter.(Lxamarin/test/Adapter;)V"; var native_value = (value?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs index 70e9a218080..001718d21df 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.AdapterView.cs @@ -60,23 +60,17 @@ public AdapterViewInvoker (ref JniObjectReference reference, JniObjectReferenceO // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AdapterView']/method[@name='getAdapter' and count(parameter)=0]" get { const string __id = "getAdapter.()Lxamarin/test/Adapter;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AdapterView']/method[@name='setAdapter' and count(parameter)=1 and parameter[1][@type='T']]" set { const string __id = "setAdapter.(Lxamarin/test/Adapter;)V"; var native_value = (value?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs index 2ddfe6c4d14..6e381585e2f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -34,11 +34,8 @@ protected GenericReturnObject (ref JniObjectReference reference, JniObjectRefere public virtual unsafe global::Xamarin.Test.AdapterView GenericReturn () { const string __id = "GenericReturn.()Lxamarin/test/AdapterView;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs index 8ee4768affc..d1057b8f26f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Arrays/Xamarin.Test.SomeObject.cs @@ -29,11 +29,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myStrings.[Ljava/lang/String;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -49,11 +46,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myInts.[I"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -69,11 +63,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "mybools.[Z"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -89,11 +80,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myObjects.[Ljava/lang/Object;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -109,11 +97,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myfloats.[F"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -129,11 +114,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "mydoubles.[D"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -149,11 +131,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "mylongs.[J"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Java.Lang.Throwable.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Java.Lang.Throwable.cs index f627b04b98c..8759e6d08cd 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Java.Lang.Throwable.cs @@ -23,11 +23,8 @@ public partial class Throwable { // Metadata.xml XPath method reference: path="/api/package[@name='java.lang']/class[@name='Throwable']/method[@name='getMessage' and count(parameter)=0]" get { const string __id = "getMessage.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index a0ec376a3c5..9c0c9d228be 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -34,13 +34,10 @@ protected CSharpKeywords (ref JniObjectReference reference, JniObjectReferenceOp public virtual unsafe string UsePartial (int partial) { const string __id = "usePartial.(I)Ljava/lang/String;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (partial); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (partial); + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='CSharpKeywords']/method[@name='useThis' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs index 785cddc8ee6..430b2cdfda9 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject.cs @@ -39,12 +39,9 @@ public unsafe SomeObject () : base (ref *InvalidJniObjectReference, JniObjectRef if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath constructor reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/constructor[@name='SomeObject' and count(parameter)=1 and parameter[1][@type='int']]" @@ -56,14 +53,11 @@ public unsafe SomeObject (int aint) : base (ref *InvalidJniObjectReference, JniO if (PeerReference.IsValid) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (aint); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (aint); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject2.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject2.cs index a07754a2bca..277473fcc2f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Constructors/Xamarin.Test.SomeObject2.cs @@ -38,14 +38,11 @@ public unsafe SomeObject2 (int aint) : base (ref *InvalidJniObjectReference, Jni if (PeerReference.IsValid) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (aint); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (aint); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index de1e6308d3b..a9c4ebb012c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -30,10 +30,7 @@ public II1Invoker (ref JniObjectReference reference, JniObjectReferenceOptions o public unsafe void Close () { const string __id = "close.()V"; - try { - _members_xamarin_test_I1.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_I1.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index 228f6349007..576ee1cb44f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -30,10 +30,7 @@ public II2Invoker (ref JniObjectReference reference, JniObjectReferenceOptions o public unsafe void Close () { const string __id = "close.()V"; - try { - _members_xamarin_test_I2.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_I2.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index d28401ffff2..85890070781 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -34,10 +34,7 @@ protected SomeObject (ref JniObjectReference reference, JniObjectReferenceOption public virtual unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index 775f0372f7b..d392fab9c08 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -34,10 +34,7 @@ protected SomeObject2 (ref JniObjectReference reference, JniObjectReferenceOptio public virtual unsafe void Irrelevant () { const string __id = "irrelevant.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/interface[@name='I1']/method[@name='close' and count(parameter)=0]" @@ -64,10 +61,7 @@ public SomeObject2Invoker (ref JniObjectReference reference, JniObjectReferenceO public override unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index 8a4e1de3ed0..19bb37bd609 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -46,13 +46,10 @@ public IFactoryInvoker (ref JniObjectReference reference, JniObjectReferenceOpti public unsafe global::Xamarin.Test.NotificationCompatBase.Action Build (int p0) { const string __id = "build.(I)Lxamarin/test/NotificationCompatBase$Action;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (p0); - var __rm = _members_xamarin_test_NotificationCompatBase_Action_Factory.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (p0); + var __rm = _members_xamarin_test_NotificationCompatBase_Action_Factory.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } } @@ -111,15 +108,12 @@ public unsafe InstanceInner (global::Xamarin.Test.NotificationCompatBase __self) if (PeerReference.IsValid) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (__self); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - global::System.GC.KeepAlive (__self); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (__self); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); + global::System.GC.KeepAlive (__self); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs index 0edd8c70f5b..3211c3b8a0e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/NonStaticFields/Xamarin.Test.SomeObject.cs @@ -29,10 +29,7 @@ public int Value { set { const string __id = "Value.I"; - try { - _members.InstanceFields.SetValue (__id, this, value); - } finally { - } + _members.InstanceFields.SetValue (__id, this, value); } } @@ -48,10 +45,7 @@ public bool BooleanValue { set { const string __id = "BooleanValue.Z"; - try { - _members.InstanceFields.SetValue (__id, this, value); - } finally { - } + _members.InstanceFields.SetValue (__id, this, value); } } @@ -67,10 +61,7 @@ public char CharValue { set { const string __id = "CharValue.C"; - try { - _members.InstanceFields.SetValue (__id, this, value); - } finally { - } + _members.InstanceFields.SetValue (__id, this, value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs index d65fba4f30a..6ae8f33fdb1 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -79,21 +79,15 @@ public override unsafe int SomeInteger { // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeInteger' and count(parameter)=0]" get { const string __id = "getSomeInteger.()I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeInteger' and count(parameter)=1 and parameter[1][@type='int']]" set { const string __id = "setSomeInteger.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -101,22 +95,16 @@ public override unsafe int SomeInteger { // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeObjectProperty' and count(parameter)=0]" get { const string __id = "getSomeObjectProperty.()Ljava/lang/Object;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeObjectProperty' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" set { const string __id = "setSomeObjectProperty.(Ljava/lang/Object;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } @@ -124,11 +112,8 @@ public override unsafe string SomeString { // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeString' and count(parameter)=0]" get { const string __id = "getSomeString.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeString' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" set { diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs index 472dba9621e..57dc52aa623 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/ParameterXPath/Xamarin.Test.A.cs @@ -36,13 +36,10 @@ public virtual unsafe void SetA (global::Java.Lang.Object adapter) { const string __id = "setA.(Ljava/lang/Object;)V"; var native_adapter = (adapter?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_adapter); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (adapter); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_adapter); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (adapter); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='A']/method[@name='listTest' and count(parameter)=1 and parameter[1][@type='java.util.List<java.lang.Integer>']]" @@ -50,13 +47,10 @@ public virtual unsafe void SetA (global::Java.Lang.Object adapter) public virtual unsafe void ListTest (global::Java.Util.IList p0) { const string __id = "listTest.(Ljava/util/List;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (p0); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (p0); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (p0); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (p0); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs index 8d567d71e06..c120c863617 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/StaticFields/Xamarin.Test.SomeObject.cs @@ -40,10 +40,7 @@ public static int Value2 { set { const string __id = "Value2.I"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } @@ -59,10 +56,7 @@ public static bool BooleanValue { set { const string __id = "BooleanValue.Z"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } @@ -78,10 +72,7 @@ public static char CharValue { set { const string __id = "CharValue.C"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs index 31f27208011..17e2f1cc7f8 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/StaticMethods/Xamarin.Test.SomeObject.cs @@ -34,11 +34,8 @@ protected SomeObject (ref JniObjectReference reference, JniObjectReferenceOption public static unsafe int MethodAsInt () { const string __id = "methodAsInt.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='methodAsString' and count(parameter)=0]" @@ -46,11 +43,8 @@ public static unsafe int MethodAsInt () public static unsafe string MethodAsString () { const string __id = "methodAsString.()Ljava/lang/String;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='Obsoletemethod' and count(parameter)=0]" @@ -59,11 +53,8 @@ public static unsafe string MethodAsString () public static unsafe string Obsoletemethod () { const string __id = "Obsoletemethod.()Ljava/lang/String;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs index 847372322d1..be303dd9b4c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/StaticProperties/Xamarin.Test.SomeObject.cs @@ -33,21 +33,15 @@ public static unsafe int SomeInteger { // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeInteger' and count(parameter)=0]" get { const string __id = "getSomeInteger.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeInteger' and count(parameter)=1 and parameter[1][@type='int']]" set { const string __id = "setSomeInteger.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.StaticMethods.InvokeVoidMethod (__id, __args); } } @@ -55,11 +49,8 @@ public static unsafe string SomeString { // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='getSomeString' and count(parameter)=0]" get { const string __id = "getSomeString.()Ljava/lang/String;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeString' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" set { @@ -80,11 +71,8 @@ public static unsafe string SomeString { public static unsafe global::Java.Lang.Object GetSomeObject () { const string __id = "getSomeObject.()Ljava/lang/Object;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeObject' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" @@ -92,13 +80,10 @@ public static unsafe string SomeString { public static unsafe void SetSomeObject (global::Java.Lang.Object newvalue) { const string __id = "setSomeObject.(Ljava/lang/Object;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (newvalue); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - global::System.GC.KeepAlive (newvalue); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (newvalue); + _members.StaticMethods.InvokeVoidMethod (__id, __args); + global::System.GC.KeepAlive (newvalue); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs index 1269bbc2d31..84d9ed5f893 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.FilterOutputStream.cs @@ -38,15 +38,12 @@ public unsafe FilterOutputStream (global::Java.IO.OutputStream @out) : base (ref if (PeerReference.IsValid) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (@out); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - global::System.GC.KeepAlive (@out); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (@out); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); + global::System.GC.KeepAlive (@out); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='FilterOutputStream']/method[@name='write' and count(parameter)=1 and parameter[1][@type='int']]" @@ -54,12 +51,9 @@ public unsafe FilterOutputStream (global::Java.IO.OutputStream @out) : base (ref public override unsafe void Write (int oneByte) { const string __id = "write.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (oneByte); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (oneByte); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs index d2d9cd673f8..b708593b722 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.IOException.cs @@ -34,10 +34,7 @@ protected IOException (ref JniObjectReference reference, JniObjectReferenceOptio public virtual unsafe void PrintStackTrace () { const string __id = "printStackTrace.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs index 3b787e704c3..1d848a4a215 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.InputStream.cs @@ -38,12 +38,9 @@ public unsafe InputStream () : base (ref *InvalidJniObjectReference, JniObjectRe if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='available' and count(parameter)=0]" @@ -51,11 +48,8 @@ public unsafe InputStream () : base (ref *InvalidJniObjectReference, JniObjectRe public virtual unsafe int Available () { const string __id = "available.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='close' and count(parameter)=0]" @@ -63,10 +57,7 @@ public virtual unsafe int Available () public virtual unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='mark' and count(parameter)=1 and parameter[1][@type='int']]" @@ -74,12 +65,9 @@ public virtual unsafe void Close () public virtual unsafe void Mark (int readlimit) { const string __id = "mark.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (readlimit); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (readlimit); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='markSupported' and count(parameter)=0]" @@ -87,11 +75,8 @@ public virtual unsafe void Mark (int readlimit) public virtual unsafe bool MarkSupported () { const string __id = "markSupported.()Z"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='read' and count(parameter)=0]" @@ -142,10 +127,7 @@ public virtual unsafe int Read (global::Java.Interop.JavaSByteArray buffer, int public virtual unsafe void Reset () { const string __id = "reset.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='InputStream']/method[@name='skip' and count(parameter)=1 and parameter[1][@type='long']]" @@ -153,13 +135,10 @@ public virtual unsafe void Reset () public virtual unsafe long Skip (long byteCount) { const string __id = "skip.(J)J"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (byteCount); - var __rm = _members.InstanceMethods.InvokeVirtualInt64Method (__id, this, __args); - return __rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (byteCount); + var __rm = _members.InstanceMethods.InvokeVirtualInt64Method (__id, this, __args); + return __rm; } } @@ -183,11 +162,8 @@ public InputStreamInvoker (ref JniObjectReference reference, JniObjectReferenceO public override unsafe int Read () { const string __id = "read.()I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs index 7af6b63e5fb..541b9304e1b 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.IO.OutputStream.cs @@ -38,12 +38,9 @@ public unsafe OutputStream () : base (ref *InvalidJniObjectReference, JniObjectR if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='close' and count(parameter)=0]" @@ -51,10 +48,7 @@ public unsafe OutputStream () : base (ref *InvalidJniObjectReference, JniObjectR public virtual unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='flush' and count(parameter)=0]" @@ -62,10 +56,7 @@ public virtual unsafe void Close () public virtual unsafe void Flush () { const string __id = "flush.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='java.io']/class[@name='OutputStream']/method[@name='write' and count(parameter)=1 and parameter[1][@type='byte[]']]" @@ -130,12 +121,9 @@ public OutputStreamInvoker (ref JniObjectReference reference, JniObjectReference public override unsafe void Write (int oneByte) { const string __id = "write.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (oneByte); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (oneByte); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs index f627b04b98c..8759e6d08cd 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/Streams/Java.Lang.Throwable.cs @@ -23,11 +23,8 @@ public partial class Throwable { // Metadata.xml XPath method reference: path="/api/package[@name='java.lang']/class[@name='Throwable']/method[@name='getMessage' and count(parameter)=0]" get { const string __id = "getMessage.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/ClassWithoutNamespace.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/ClassWithoutNamespace.cs index 65b44c3e2c1..2ce95b75346 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/ClassWithoutNamespace.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/ClassWithoutNamespace.cs @@ -36,12 +36,9 @@ public unsafe ClassWithoutNamespace () : base (ref *InvalidJniObjectReference, J if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='']/interface[@name='InterfaceWithoutNamespace']/method[@name='Foo' and count(parameter)=0]" @@ -68,10 +65,7 @@ public ClassWithoutNamespaceInvoker (ref JniObjectReference reference, JniObject public override unsafe void Foo () { const string __id = "Foo.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/IInterfaceWithoutNamespace.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/IInterfaceWithoutNamespace.cs index 7a693cfe6de..2d688b3b3c6 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/IInterfaceWithoutNamespace.cs @@ -28,10 +28,7 @@ public IInterfaceWithoutNamespaceInvoker (ref JniObjectReference reference, JniO public unsafe void Foo () { const string __id = "Foo.()V"; - try { - _members__InterfaceWithoutNamespace.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members__InterfaceWithoutNamespace.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.ICollection.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.ICollection.cs index b67ca171c59..72de97493a1 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.ICollection.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.ICollection.cs @@ -36,23 +36,18 @@ public unsafe bool Add (global::Java.Lang.Object e) { const string __id = "add.(Ljava/lang/Object;)Z"; var native_e = (e?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_e); - var __rm = _members_java_util_Collection.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (e); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_e); + var __rm = _members_java_util_Collection.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (e); + return __result; } public unsafe void Clear () { const string __id = "clear.()V"; - try { - _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IDeque.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IDeque.cs index 57186f03e17..18ececbce65 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IDeque.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IDeque.cs @@ -36,23 +36,18 @@ public unsafe bool Add (global::Java.Lang.Object e) { const string __id = "add.(Ljava/lang/Object;)Z"; var native_e = (e?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_e); - var __rm = _members_java_util_Deque.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (e); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_e); + var __rm = _members_java_util_Deque.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (e); + return __result; } public unsafe void Clear () { const string __id = "clear.()V"; - try { - _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IQueue.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IQueue.cs index 8125f2edbda..204fce61c8b 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IQueue.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Java.Util.IQueue.cs @@ -34,23 +34,18 @@ public unsafe bool Add (global::Java.Lang.Object e) { const string __id = "add.(Ljava/lang/Object;)Z"; var native_e = (e?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_e); - var __rm = _members_java_util_Queue.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (e); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_e); + var __rm = _members_java_util_Queue.InstanceMethods.InvokeAbstractBooleanMethod (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (e); + return __result; } public unsafe void Clear () { const string __id = "clear.()V"; - try { - _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs index f520881a2f5..452a41f8242 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericImplementation.cs @@ -38,12 +38,9 @@ public unsafe GenericImplementation () : base (ref *InvalidJniObjectReference, J if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericImplementation']/method[@name='SetObject' and count(parameter)=1 and parameter[1][@type='byte[]']]" diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 9f538e8c3cb..d60a7c0eccd 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -38,34 +38,25 @@ public unsafe GenericObjectPropertyImplementation () : base (ref *InvalidJniObje if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } public virtual unsafe global::Java.Lang.Object Object { // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericObjectPropertyImplementation']/method[@name='getObject' and count(parameter)=0]" get { const string __id = "getObject.()Ljava/lang/Object;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericObjectPropertyImplementation']/method[@name='setObject' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" set { const string __id = "setObject.(Ljava/lang/Object;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs index 7a47fee8210..75e638ce55f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -38,12 +38,9 @@ public unsafe GenericStringImplementation () : base (ref *InvalidJniObjectRefere if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericStringImplementation']/method[@name='SetObject' and count(parameter)=1 and parameter[1][@type='java.lang.String[]']]" diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index 14ccac53892..7c33ca609db 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -38,23 +38,17 @@ public unsafe GenericStringPropertyImplementation () : base (ref *InvalidJniObje if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } public virtual unsafe string Object { // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericStringPropertyImplementation']/method[@name='getObject' and count(parameter)=0]" get { const string __id = "getObject.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Strings.ToString (ref __rm, JniObjectReferenceOptions.CopyAndDispose); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericStringPropertyImplementation']/method[@name='SetObject' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" set { diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs index 5bc81d5c3c6..af5e22436fa 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericInterface.cs @@ -32,13 +32,10 @@ public unsafe void SetObject (global::Java.Lang.Object value) { const string __id = "SetObject.(Ljava/lang/Object;)V"; var native_value = (value?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_value); - _members_test_me_GenericInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_value); + _members_test_me_GenericInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs index a9698b97eea..3aed80ed50b 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -37,22 +37,16 @@ public IGenericPropertyInterfaceInvoker (ref JniObjectReference reference, JniOb public unsafe global::Java.Lang.Object Object { get { const string __id = "getObject.()Ljava/lang/Object;"; - try { - var __rm = _members_test_me_GenericPropertyInterface.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - } + var __rm = _members_test_me_GenericPropertyInterface.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); } set { const string __id = "setObject.(Ljava/lang/Object;)V"; var native_value = (value?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_value); - _members_test_me_GenericPropertyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_value); + _members_test_me_GenericPropertyInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs index a3a7a9c4945..00450b482d8 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.ITestInterface.cs @@ -57,39 +57,32 @@ public ITestInterfaceInvoker (ref JniObjectReference reference, JniObjectReferen public unsafe int GetSpanFlags (global::Java.Lang.Object tag) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (tag); - var __rm = _members_test_me_TestInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (tag); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (tag); + var __rm = _members_test_me_TestInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (tag); + return __result; } public unsafe void Append (global::Java.Lang.ICharSequence value) { const string __id = "append.(Ljava/lang/CharSequence;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members_test_me_TestInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members_test_me_TestInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } public unsafe global::Java.Lang.ICharSequence IdentityFormatted (global::Java.Lang.ICharSequence value) { const string __id = "identity.(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members_test_me_TestInterface.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members_test_me_TestInterface.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); + var __result = global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); + global::System.GC.KeepAlive (value); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs index 1dcf2d643ed..4fde42f7469 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -57,12 +57,9 @@ public unsafe TestInterfaceImplementation () : base (ref *InvalidJniObjectRefere if (PeerReference.IsValid) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + Construct (ref __r, JniObjectReferenceOptions.CopyAndDispose); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/interface[@name='TestInterface']/method[@name='getSpanFlags' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" @@ -111,14 +108,12 @@ public TestInterfaceImplementationInvoker (ref JniObjectReference reference, Jni public override unsafe int GetSpanFlags (global::Java.Lang.Object tag) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (tag); - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (tag); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (tag); + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (tag); + return __result; } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/interface[@name='TestInterface']/method[@name='append' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" @@ -126,13 +121,10 @@ public override unsafe int GetSpanFlags (global::Java.Lang.Object tag) public override unsafe void Append (global::Java.Lang.ICharSequence value) { const string __id = "append.(Ljava/lang/CharSequence;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/interface[@name='TestInterface']/method[@name='identity' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" @@ -140,14 +132,12 @@ public override unsafe void Append (global::Java.Lang.ICharSequence value) public override unsafe global::Java.Lang.ICharSequence IdentityFormatted (global::Java.Lang.ICharSequence value) { const string __id = "identity.(Ljava/lang/CharSequence;)Ljava/lang/CharSequence;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); + var __result = global::Java.Interop.JniEnvironment.Runtime.ValueManager.GetValue(ref __rm, JniObjectReferenceOptions.CopyAndDispose); + global::System.GC.KeepAlive (value); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs index 846f6c0c69d..cb7006e66c6 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.Enum.cs @@ -36,14 +36,12 @@ public unsafe int CompareTo (global::Java.Lang.Object o) { const string __id = "compareTo.(Ljava/lang/Enum;)I"; var native_o = (o?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_o); - var __rm = _members.InstanceMethods.InvokeNonvirtualInt32Method (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (o); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_o); + var __rm = _members.InstanceMethods.InvokeNonvirtualInt32Method (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (o); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs index 61f341858ee..9f7402515fa 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/java.lang.Enum/Java.Lang.IComparable.cs @@ -32,14 +32,12 @@ public unsafe int CompareTo (global::Java.Lang.Object another) { const string __id = "compareTo.(Ljava/lang/Object;)I"; var native_another = (another?.PeerReference ?? default); - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (native_another); - var __rm = _members_java_lang_Comparable.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (another); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (native_another); + var __rm = _members_java_lang_Comparable.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (another); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs index 8b839100199..9dc8db93b8a 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.ji/java.util.List/Xamarin.Test.SomeObject.cs @@ -29,11 +29,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myStrings.Ljava/util/List;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -49,11 +46,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myInts.Ljava/util/List;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -69,11 +63,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "mybools.Ljava/util/List;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -89,11 +80,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myObjects.Ljava/util/List;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -109,11 +97,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "myfloats.Ljava/util/List;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -129,11 +114,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "mydoubles.Ljava/util/List;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } @@ -149,11 +131,8 @@ public partial class SomeObject : global::Java.Lang.Object { set { const string __id = "mylongs.Ljava/util/List;"; - try { - _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); - } finally { - GC.KeepAlive (value); - } + _members.InstanceFields.SetValue (__id, this, value?.PeerReference ?? default); + GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs index f83bcd5db70..1873e4ee5f0 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.BasePublicClass.cs @@ -71,10 +71,7 @@ private static void __n_BaseMethod (IntPtr jnienv, IntPtr native__this) public virtual unsafe void BaseMethod () { const string __id = "baseMethod.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs index 8ba4146dee1..00df7a0bb92 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.ExtendPublicClass.cs @@ -55,12 +55,9 @@ public unsafe ExtendPublicClass () : base (IntPtr.Zero, JniHandleOwnership.DoNot if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_foo_Foo_V; @@ -88,10 +85,7 @@ private static void __n_Foo (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Foo () { const string __id = "foo.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs index 652e6a115a0..ecb217fd485 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.IExtendedInterface.cs @@ -73,10 +73,7 @@ private static void __n_ExtendedMethod (IntPtr jnienv, IntPtr native__this) public unsafe void ExtendedMethod () { const string __id = "extendedMethod.()V"; - try { - _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } static Delegate cb_baseMethod_BaseMethod_V; @@ -102,10 +99,7 @@ private static void __n_BaseMethod (IntPtr jnienv, IntPtr native__this) public unsafe void BaseMethod () { const string __id = "baseMethod.()V"; - try { - _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_ExtendedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs index edf9b90f794..0ae81578541 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicClass.cs @@ -80,10 +80,7 @@ private static void __n_Foo (IntPtr jnienv, IntPtr native__this) public unsafe void Foo () { const string __id = "foo.()V"; - try { - _members_xamarin_test_PublicClass_ProtectedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_PublicClass_ProtectedInterface.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } @@ -125,12 +122,9 @@ public unsafe PublicClass () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransf if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_foo_Foo_V; @@ -158,10 +152,7 @@ private static void __n_Foo (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Foo () { const string __id = "foo.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs index f1258d3ecc9..a0325507dec 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.PublicFinalClass.cs @@ -51,10 +51,7 @@ internal PublicFinalClass (IntPtr javaReference, JniHandleOwnership transfer) : public unsafe void PublicMethod () { const string __id = "publicMethod.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PublicFinalClass']/method[@name='packageMethodB' and count(parameter)=0]" @@ -62,10 +59,7 @@ public unsafe void PublicMethod () public unsafe void PackageMethodB () { const string __id = "packageMethodB.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='PublicFinalClass']/method[@name='packageMethodA' and count(parameter)=0]" @@ -73,10 +67,7 @@ public unsafe void PackageMethodB () public unsafe void PackageMethodA () { const string __id = "packageMethodA.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs index 411928bc99a..09cd3d86c22 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/AccessModifiers/Xamarin.Test.TestClass.cs @@ -55,12 +55,9 @@ public unsafe TestClass () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfer if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_baseMethod_BaseMethod_V; @@ -88,10 +85,7 @@ private static void __n_BaseMethod (IntPtr jnienv, IntPtr native__this) public virtual unsafe void BaseMethod () { const string __id = "baseMethod.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs index ab7a8784bd9..76b4c678f2e 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AbsSpinner.cs @@ -92,23 +92,17 @@ private static void __n_SetAdapter_Lxamarin_test_SpinnerAdapter_ (IntPtr jnienv, [Register ("getAdapter", "()Lxamarin/test/SpinnerAdapter;", "GetGetAdapterHandler")] get { const string __id = "getAdapter.()Lxamarin/test/SpinnerAdapter;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AbsSpinner']/method[@name='setAdapter' and count(parameter)=1 and parameter[1][@type='xamarin.test.SpinnerAdapter']]" [Register ("setAdapter", "(Lxamarin/test/SpinnerAdapter;)V", "GetSetAdapter_Lxamarin_test_SpinnerAdapter_Handler")] set { const string __id = "setAdapter.(Lxamarin/test/SpinnerAdapter;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((value == null) ? IntPtr.Zero : ((global::Java.Lang.Object) value).Handle); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((value == null) ? IntPtr.Zero : ((global::Java.Lang.Object) value).Handle); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } @@ -139,11 +133,8 @@ public AbsSpinnerInvoker (IntPtr handle, JniHandleOwnership transfer) : base (ha [Register ("getAdapter", "()Lxamarin/test/Adapter;", "GetGetAdapterHandler")] get { const string __id = "getAdapter.()Lxamarin/test/Adapter;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AdapterView']/method[@name='setAdapter' and count(parameter)=1 and parameter[1][@type='T']]" [Register ("setAdapter", "(Lxamarin/test/Adapter;)V", "GetSetAdapter_Lxamarin_test_Adapter_Handler")] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs index 06c4c550254..ec8a05e2578 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.AdapterView.cs @@ -125,11 +125,8 @@ public AdapterViewInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h [Register ("getAdapter", "()Lxamarin/test/Adapter;", "GetGetAdapterHandler")] get { const string __id = "getAdapter.()Lxamarin/test/Adapter;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='AdapterView']/method[@name='setAdapter' and count(parameter)=1 and parameter[1][@type='T']]" [Register ("setAdapter", "(Lxamarin/test/Adapter;)V", "GetSetAdapter_Lxamarin_test_Adapter_Handler")] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs index 027de617b7e..e1593d46bb2 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Adapters/Xamarin.Test.GenericReturnObject.cs @@ -71,11 +71,8 @@ private static IntPtr __n_GenericReturn (IntPtr jnienv, IntPtr native__this) public virtual unsafe global::Xamarin.Test.AdapterView GenericReturn () { const string __id = "GenericReturn.()Lxamarin/test/AdapterView;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs index 4a45666913b..799327c3539 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Android.Graphics.Color/Xamarin.Test.SomeObject.cs @@ -31,10 +31,7 @@ public abstract partial class SomeObject : global::Java.Lang.Object { set { const string __id = "backColor.I"; - try { - _members.InstanceFields.SetValue (__id, this, value.ToArgb ()); - } finally { - } + _members.InstanceFields.SetValue (__id, this, value.ToArgb ()); } } @@ -144,22 +141,16 @@ public SomeObjectInvoker (IntPtr handle, JniHandleOwnership transfer) : base (ha [Register ("getSomeColor", "()I", "GetGetSomeColorHandler")] get { const string __id = "getSomeColor.()I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return new global::Android.Graphics.Color (__rm); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return new global::Android.Graphics.Color (__rm); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeColor' and count(parameter)=1 and parameter[1][@type='Android.Graphics.Color']]" [Register ("setSomeColor", "(I)V", "GetSetSomeColor_IHandler")] set { const string __id = "setSomeColor.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value.ToArgb ()); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value.ToArgb ()); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs index 311c44de33b..8278e9b8daa 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Java.Lang.Throwable.cs @@ -49,11 +49,8 @@ private static IntPtr __n_GetMessage (IntPtr jnienv, IntPtr native__this) [Register ("getMessage", "()Ljava/lang/String;", "GetGetMessageHandler")] get { const string __id = "getMessage.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs index c7d2c3aaba7..a72afd01c24 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/CSharpKeywords/Xamarin.Test.CSharpKeywords.cs @@ -71,13 +71,10 @@ private static IntPtr __n_UsePartial_I (IntPtr jnienv, IntPtr native__this, int public virtual unsafe string UsePartial (int partial) { const string __id = "usePartial.(I)Ljava/lang/String;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (partial); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (partial); + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='CSharpKeywords']/method[@name='useThis' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs index a5d4dd041e8..327d9df37b6 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject.cs @@ -56,12 +56,9 @@ public unsafe SomeObject () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransfe if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath constructor reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/constructor[@name='SomeObject' and count(parameter)=1 and parameter[1][@type='int']]" @@ -73,14 +70,11 @@ public unsafe SomeObject (int aint) : base (IntPtr.Zero, JniHandleOwnership.DoNo if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (aint); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (aint); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs index b8bbda396cd..0df756c84fe 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Constructors/Xamarin.Test.SomeObject2.cs @@ -55,14 +55,11 @@ public unsafe SomeObject2 (int aint) : base (IntPtr.Zero, JniHandleOwnership.DoN if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (aint); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (aint); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs index 3ac495bb5c7..238a078cd16 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpannable.cs @@ -67,14 +67,12 @@ private static int __n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na public unsafe global::Android.Text.SpanTypes GetSpanFlags (global::Java.Lang.Object tag) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); - var __rm = _members_android_text_Spanned.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return (global::Android.Text.SpanTypes) __rm; - } finally { - global::System.GC.KeepAlive (tag); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); + var __rm = _members_android_text_Spanned.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + var __result = (global::Android.Text.SpanTypes) __rm; + global::System.GC.KeepAlive (tag); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs index 37abfa63214..b040f8db2fe 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.ISpanned.cs @@ -70,14 +70,12 @@ private static int __n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na public unsafe global::Android.Text.SpanTypes GetSpanFlags (global::Java.Lang.Object tag) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); - var __rm = _members_android_text_Spanned.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return (global::Android.Text.SpanTypes) __rm; - } finally { - global::System.GC.KeepAlive (tag); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); + var __rm = _members_android_text_Spanned.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + var __result = (global::Android.Text.SpanTypes) __rm; + global::System.GC.KeepAlive (tag); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs index f101c2f3c6c..1afac9de2ed 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableString.cs @@ -116,14 +116,12 @@ private static int __n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na public override unsafe global::Android.Text.SpanTypes GetSpanFlags (global::Java.Lang.Object what) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((what == null) ? IntPtr.Zero : ((global::Java.Lang.Object) what).Handle); - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, __args); - return (global::Android.Text.SpanTypes) __rm; - } finally { - global::System.GC.KeepAlive (what); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((what == null) ? IntPtr.Zero : ((global::Java.Lang.Object) what).Handle); + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, __args); + var __result = (global::Android.Text.SpanTypes) __rm; + global::System.GC.KeepAlive (what); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs index 0985ee1b062..0e1da7f760a 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Text.SpannableStringInternal.cs @@ -74,14 +74,12 @@ private static int __n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na public virtual unsafe global::Android.Text.SpanTypes GetSpanFlags (global::Java.Lang.Object p0) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, __args); - return (global::Android.Text.SpanTypes) __rm; - } finally { - global::System.GC.KeepAlive (p0); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, __args); + var __result = (global::Android.Text.SpanTypes) __rm; + global::System.GC.KeepAlive (p0); + return __result; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs index 3a1c6b7f821..a9c4f79d33f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Core_Jar2Xml/Android.Views.View.cs @@ -81,13 +81,10 @@ private static void __n_OnClick_Landroid_view_View_ (IntPtr jnienv, IntPtr nativ public unsafe void OnClick (global::Android.Views.View v) { const string __id = "onClick.(Landroid/view/View;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((v == null) ? IntPtr.Zero : ((global::Java.Lang.Object) v).Handle); - _members_android_view_View_OnClickListener.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (v); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((v == null) ? IntPtr.Zero : ((global::Java.Lang.Object) v).Handle); + _members_android_view_View_OnClickListener.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (v); } } @@ -176,13 +173,10 @@ private static void __n_SetOnClickListener_Landroid_view_View_OnClickListener_ ( public virtual unsafe void SetOnClickListener (global::Android.Views.View.IOnClickListener l) { const string __id = "setOnClickListener.(Landroid/view/View$OnClickListener;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((l == null) ? IntPtr.Zero : ((global::Java.Lang.Object) l).Handle); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (l); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((l == null) ? IntPtr.Zero : ((global::Java.Lang.Object) l).Handle); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (l); } static Delegate cb_setOn123Listener_SetOn123Listener_Landroid_view_View_OnClickListener__V; @@ -211,13 +205,10 @@ private static void __n_SetOn123Listener_Landroid_view_View_OnClickListener_ (In public virtual unsafe void SetOn123Listener (global::Android.Views.View.IOnClickListener l) { const string __id = "setOn123Listener.(Landroid/view/View$OnClickListener;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((l == null) ? IntPtr.Zero : ((global::Java.Lang.Object) l).Handle); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (l); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((l == null) ? IntPtr.Zero : ((global::Java.Lang.Object) l).Handle); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (l); } static Delegate cb_addTouchables_AddTouchables_Ljava_util_ArrayList__V; diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs index e3268911c23..7308b8027fe 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaCrypto.cs @@ -55,12 +55,9 @@ public unsafe FrameworkMediaCrypto () : base (IntPtr.Zero, JniHandleOwnership.Do if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.exoplayer.drm']/class[@name='FrameworkMediaCrypto']/method[@name='requiresSecureDecoderComponent' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs index 4e00d036000..a6a328ec211 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.FrameworkMediaDrm.cs @@ -55,12 +55,9 @@ public unsafe FrameworkMediaDrm () : base (IntPtr.Zero, JniHandleOwnership.DoNot if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } // Metadata.xml XPath method reference: path="/api/package[@name='com.google.android.exoplayer.drm']/class[@name='FrameworkMediaDrm']/method[@name='setOnEventListener' and count(parameter)=1 and parameter[1][@type='com.google.android.exoplayer.drm.ExoMediaDrm.OnEventListener<com.google.android.exoplayer.drm.FrameworkMediaCrypto>']]" @@ -68,13 +65,10 @@ public unsafe FrameworkMediaDrm () : base (IntPtr.Zero, JniHandleOwnership.DoNot public unsafe void SetOnEventListener (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrmOnEventListener p0) { const string __id = "setOnEventListener.(Lcom/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (p0); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (p0); } // This method is explicitly implemented as a member of an instantiated Com.Google.Android.Exoplayer.Drm.IExoMediaDrm diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs index e5e00d5f16b..d044c58ae19 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/GenericArguments/Com.Google.Android.Exoplayer.Drm.IExoMediaDrm.cs @@ -243,13 +243,10 @@ private static void __n_SetOnEventListener_Lcom_google_android_exoplayer_drm_Exo public unsafe void SetOnEventListener (global::Com.Google.Android.Exoplayer.Drm.IExoMediaDrmOnEventListener p0) { const string __id = "setOnEventListener.(Lcom/google/android/exoplayer/drm/ExoMediaDrm$OnEventListener;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); - _members_com_google_android_exoplayer_drm_ExoMediaDrm.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (p0); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((p0 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p0).Handle); + _members_com_google_android_exoplayer_drm_ExoMediaDrm.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (p0); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs index 57cfad2d233..eec7ad7ac22 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II1.cs @@ -67,10 +67,7 @@ private static void __n_Close (IntPtr jnienv, IntPtr native__this) public unsafe void Close () { const string __id = "close.()V"; - try { - _members_xamarin_test_I1.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_I1.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs index 3ff1c74b146..e657df8b885 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.II2.cs @@ -67,10 +67,7 @@ private static void __n_Close (IntPtr jnienv, IntPtr native__this) public unsafe void Close () { const string __id = "close.()V"; - try { - _members_xamarin_test_I2.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_xamarin_test_I2.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs index ad0b3332cf0..85504c1c77d 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject.cs @@ -71,10 +71,7 @@ private static void __n_Close (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs index e0d1154188b..aba52a82c2b 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/InterfaceMethodsConflict/Xamarin.Test.SomeObject2.cs @@ -71,10 +71,7 @@ private static void __n_Irrelevant (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Irrelevant () { const string __id = "irrelevant.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } static Delegate cb_close_Close_V; @@ -128,10 +125,7 @@ public SomeObject2Invoker (IntPtr handle, JniHandleOwnership transfer) : base (h public override unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs index ec8493f5cf0..8dafbba0eb1 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NestedTypes/Xamarin.Test.NotificationCompatBase.cs @@ -83,13 +83,10 @@ private static IntPtr __n_Build_I (IntPtr jnienv, IntPtr native__this, int p0) public unsafe global::Xamarin.Test.NotificationCompatBase.Action Build (int p0) { const string __id = "build.(I)Lxamarin/test/NotificationCompatBase$Action;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (p0); - var __rm = _members_xamarin_test_NotificationCompatBase_Action_Factory.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (p0); + var __rm = _members_xamarin_test_NotificationCompatBase_Action_Factory.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); + return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } } @@ -186,15 +183,12 @@ public unsafe InstanceInner (global::Xamarin.Test.NotificationCompatBase __self) if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((__self == null) ? IntPtr.Zero : ((global::Java.Lang.Object) __self).Handle); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - global::System.GC.KeepAlive (__self); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((__self == null) ? IntPtr.Zero : ((global::Java.Lang.Object) __self).Handle); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); + global::System.GC.KeepAlive (__self); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs index 3fa463e60cd..e1b66196236 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NonStaticFields/Xamarin.Test.SomeObject.cs @@ -31,10 +31,7 @@ public int Value { set { const string __id = "Value.I"; - try { - _members.InstanceFields.SetValue (__id, this, value); - } finally { - } + _members.InstanceFields.SetValue (__id, this, value); } } @@ -51,10 +48,7 @@ public bool BooleanValue { set { const string __id = "BooleanValue.Z"; - try { - _members.InstanceFields.SetValue (__id, this, value); - } finally { - } + _members.InstanceFields.SetValue (__id, this, value); } } @@ -71,10 +65,7 @@ public char CharValue { set { const string __id = "CharValue.C"; - try { - _members.InstanceFields.SetValue (__id, this, value); - } finally { - } + _members.InstanceFields.SetValue (__id, this, value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs index e246519bf0c..4c509366098 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.A.cs @@ -75,13 +75,10 @@ private static IntPtr __n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__th public virtual unsafe global::Java.Lang.Object SetCustomDimension (int index) { const string __id = "setCustomDimension.(I)Lxamarin/test/A$B;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (index); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (index); + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); + return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } } @@ -139,11 +136,8 @@ private static int __n_GetHandle (IntPtr jnienv, IntPtr native__this) public virtual unsafe int GetHandle () { const string __id = "getHandle.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs index 7b98e3a88ac..112a511ac72 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.C.cs @@ -72,13 +72,10 @@ private static IntPtr __n_SetCustomDimension_I (IntPtr jnienv, IntPtr native__th public virtual unsafe global::Java.Lang.Object SetCustomDimension (int index) { const string __id = "setCustomDimension.(I)Lxamarin/test/C;"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (index); - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (index); + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); + return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs index d47f6641753..b6d8a37b22c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalMethods/Xamarin.Test.SomeObject.cs @@ -55,15 +55,12 @@ public unsafe SomeObject (global::Java.Lang.Class c) : base (IntPtr.Zero, JniHan if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((c == null) ? IntPtr.Zero : ((global::Java.Lang.Object) c).Handle); - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, __args); - } finally { - global::System.GC.KeepAlive (c); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((c == null) ? IntPtr.Zero : ((global::Java.Lang.Object) c).Handle); + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), __args); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, __args); + global::System.GC.KeepAlive (c); } static Delegate cb_getType_GetType_arrayI; @@ -91,11 +88,8 @@ private static IntPtr __n_GetType (IntPtr jnienv, IntPtr native__this) public new virtual unsafe int[] GetType () { const string __id = "getType.()[I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return (int[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (int)); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return (int[]) JNIEnv.GetArray (__rm.Handle, JniHandleOwnership.TransferLocalRef, typeof (int)); } static Delegate cb_handle_Handle_Ljava_lang_Object_Ljava_lang_Throwable__I; @@ -126,16 +120,14 @@ private static int __n_Handle_Ljava_lang_Object_Ljava_lang_Throwable_ (IntPtr jn public new virtual unsafe int Handle (global::Java.Lang.Object o, global::Java.Lang.Throwable t) { const string __id = "handle.(Ljava/lang/Object;Ljava/lang/Throwable;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [2]; - __args [0] = new JniArgumentValue ((o == null) ? IntPtr.Zero : ((global::Java.Lang.Object) o).Handle); - __args [1] = new JniArgumentValue ((t == null) ? IntPtr.Zero : ((global::Java.Lang.Throwable) t).Handle); - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (o); - global::System.GC.KeepAlive (t); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [2]; + __args [0] = new JniArgumentValue ((o == null) ? IntPtr.Zero : ((global::Java.Lang.Object) o).Handle); + __args [1] = new JniArgumentValue ((t == null) ? IntPtr.Zero : ((global::Java.Lang.Throwable) t).Handle); + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (o); + global::System.GC.KeepAlive (t); + return __result; } static Delegate cb_IntegerMethod_IntegerMethod_I; @@ -163,11 +155,8 @@ private static int __n_IntegerMethod (IntPtr jnienv, IntPtr native__this) public virtual unsafe int IntegerMethod () { const string __id = "IntegerMethod.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } static Delegate cb_VoidMethod_VoidMethod_V; @@ -195,10 +184,7 @@ private static void __n_VoidMethod (IntPtr jnienv, IntPtr native__this) public virtual unsafe void VoidMethod () { const string __id = "VoidMethod.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } static Delegate cb_StringMethod_StringMethod_Ljava_lang_String_; @@ -226,11 +212,8 @@ private static IntPtr __n_StringMethod (IntPtr jnienv, IntPtr native__this) public virtual unsafe string StringMethod () { const string __id = "StringMethod.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } static Delegate cb_ObjectMethod_ObjectMethod_Ljava_lang_Object_; @@ -258,11 +241,8 @@ private static IntPtr __n_ObjectMethod (IntPtr jnienv, IntPtr native__this) public virtual unsafe global::Java.Lang.Object ObjectMethod () { const string __id = "ObjectMethod.()Ljava/lang/Object;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } static Delegate cb_VoidMethodWithParams_VoidMethodWithParams_Ljava_lang_String_ILjava_lang_Object__V; @@ -334,11 +314,8 @@ private static int __n_ObsoleteMethod (IntPtr jnienv, IntPtr native__this) public virtual unsafe int ObsoleteMethod () { const string __id = "ObsoleteMethod.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } static Delegate cb_ArrayListTest_ArrayListTest_Ljava_util_ArrayList__V; diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs index 09989862c02..8b9060ca65f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/NormalProperties/Xamarin.Test.SomeObject.cs @@ -225,22 +225,16 @@ public override unsafe int SomeInteger { [Register ("getSomeInteger", "()I", "GetGetSomeIntegerHandler")] get { const string __id = "getSomeInteger.()I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeInteger' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("setSomeInteger", "(I)V", "GetSetSomeInteger_IHandler")] set { const string __id = "setSomeInteger.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } @@ -249,23 +243,17 @@ public override unsafe int SomeInteger { [Register ("getSomeObjectProperty", "()Ljava/lang/Object;", "GetGetSomeObjectPropertyHandler")] get { const string __id = "getSomeObjectProperty.()Ljava/lang/Object;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeObjectProperty' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" [Register ("setSomeObjectProperty", "(Ljava/lang/Object;)V", "GetSetSomeObjectProperty_Ljava_lang_Object_Handler")] set { const string __id = "setSomeObjectProperty.(Ljava/lang/Object;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((value == null) ? IntPtr.Zero : ((global::Java.Lang.Object) value).Handle); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((value == null) ? IntPtr.Zero : ((global::Java.Lang.Object) value).Handle); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } @@ -274,11 +262,8 @@ public override unsafe string SomeString { [Register ("getSomeString", "()Ljava/lang/String;", "GetGetSomeStringHandler")] get { const string __id = "getSomeString.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeString' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" [Register ("setSomeString", "(Ljava/lang/String;)V", "GetSetSomeString_Ljava_lang_String_Handler")] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs index 261590db72d..dace737822f 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticFields/Xamarin.Test.SomeObject.cs @@ -43,10 +43,7 @@ public static int Value2 { set { const string __id = "Value2.I"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } @@ -63,10 +60,7 @@ public static bool BooleanValue { set { const string __id = "BooleanValue.Z"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } @@ -83,10 +77,7 @@ public static char CharValue { set { const string __id = "CharValue.C"; - try { - _members.StaticFields.SetValue (__id, value); - } finally { - } + _members.StaticFields.SetValue (__id, value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs index 59976149b9a..7888824b698 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticMethods/Xamarin.Test.SomeObject.cs @@ -51,11 +51,8 @@ protected SomeObject (IntPtr javaReference, JniHandleOwnership transfer) : base public static unsafe int MethodAsInt () { const string __id = "methodAsInt.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='methodAsString' and count(parameter)=0]" @@ -63,11 +60,8 @@ public static unsafe int MethodAsInt () public static unsafe string MethodAsString () { const string __id = "methodAsString.()Ljava/lang/String;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='Obsoletemethod' and count(parameter)=0]" @@ -76,11 +70,8 @@ public static unsafe string MethodAsString () public static unsafe string Obsoletemethod () { const string __id = "Obsoletemethod.()Ljava/lang/String;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs index 80cffc22b59..1293507e505 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/StaticProperties/Xamarin.Test.SomeObject.cs @@ -51,22 +51,16 @@ public static unsafe int SomeInteger { [Register ("getSomeInteger", "()I", "")] get { const string __id = "getSomeInteger.()I"; - try { - var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); - return __rm; - } finally { - } + var __rm = _members.StaticMethods.InvokeInt32Method (__id, null); + return __rm; } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeInteger' and count(parameter)=1 and parameter[1][@type='int']]" [Register ("setSomeInteger", "(I)V", "")] set { const string __id = "setSomeInteger.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (value); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (value); + _members.StaticMethods.InvokeVoidMethod (__id, __args); } } @@ -75,11 +69,8 @@ public static unsafe string SomeString { [Register ("getSomeString", "()Ljava/lang/String;", "")] get { const string __id = "getSomeString.()Ljava/lang/String;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeString' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" [Register ("setSomeString", "(Ljava/lang/String;)V", "")] @@ -101,11 +92,8 @@ public static unsafe string SomeString { public static unsafe global::Java.Lang.Object GetSomeObject () { const string __id = "getSomeObject.()Ljava/lang/Object;"; - try { - var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.StaticMethods.InvokeObjectMethod (__id, null); + return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='xamarin.test']/class[@name='SomeObject']/method[@name='setSomeObject' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" @@ -113,13 +101,10 @@ public static unsafe string SomeString { public static unsafe void SetSomeObject (global::Java.Lang.Object newvalue) { const string __id = "setSomeObject.(Ljava/lang/Object;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((newvalue == null) ? IntPtr.Zero : ((global::Java.Lang.Object) newvalue).Handle); - _members.StaticMethods.InvokeVoidMethod (__id, __args); - } finally { - global::System.GC.KeepAlive (newvalue); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((newvalue == null) ? IntPtr.Zero : ((global::Java.Lang.Object) newvalue).Handle); + _members.StaticMethods.InvokeVoidMethod (__id, __args); + global::System.GC.KeepAlive (newvalue); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs index 82fa1d65700..b85af324899 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.FilterOutputStream.cs @@ -93,12 +93,9 @@ private static void __n_Write_I (IntPtr jnienv, IntPtr native__this, int oneByte public override unsafe void Write (int oneByte) { const string __id = "write.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (oneByte); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (oneByte); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs index 96a5f1c7cd2..559b22d64a5 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.IOException.cs @@ -71,10 +71,7 @@ private static void __n_PrintStackTrace (IntPtr jnienv, IntPtr native__this) public virtual unsafe void PrintStackTrace () { const string __id = "printStackTrace.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs index 16afe2e40ce..469c5285716 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.InputStream.cs @@ -55,12 +55,9 @@ public unsafe InputStream () : base (IntPtr.Zero, JniHandleOwnership.DoNotTransf if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_available_Available_I; @@ -88,11 +85,8 @@ private static int __n_Available (IntPtr jnienv, IntPtr native__this) public virtual unsafe int Available () { const string __id = "available.()I"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualInt32Method (__id, this, null); + return __rm; } static Delegate cb_close_Close_V; @@ -120,10 +114,7 @@ private static void __n_Close (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } static Delegate cb_mark_Mark_I_V; @@ -151,12 +142,9 @@ private static void __n_Mark_I (IntPtr jnienv, IntPtr native__this, int readlimi public virtual unsafe void Mark (int readlimit) { const string __id = "mark.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (readlimit); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (readlimit); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); } static Delegate cb_markSupported_MarkSupported_Z; @@ -184,11 +172,8 @@ private static sbyte __n_MarkSupported (IntPtr jnienv, IntPtr native__this) public virtual unsafe bool MarkSupported () { const string __id = "markSupported.()Z"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualBooleanMethod (__id, this, null); + return __rm; } static Delegate cb_read_Read_I; @@ -330,10 +315,7 @@ private static void __n_Reset (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Reset () { const string __id = "reset.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } static Delegate cb_skip_Skip_J_J; @@ -361,13 +343,10 @@ private static long __n_Skip_J (IntPtr jnienv, IntPtr native__this, long byteCou public virtual unsafe long Skip (long byteCount) { const string __id = "skip.(J)J"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (byteCount); - var __rm = _members.InstanceMethods.InvokeVirtualInt64Method (__id, this, __args); - return __rm; - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (byteCount); + var __rm = _members.InstanceMethods.InvokeVirtualInt64Method (__id, this, __args); + return __rm; } } @@ -397,11 +376,8 @@ public InputStreamInvoker (IntPtr handle, JniHandleOwnership transfer) : base (h public override unsafe int Read () { const string __id = "read.()I"; - try { - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); - return __rm; - } finally { - } + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, null); + return __rm; } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs index 8a6959ec7f2..9b10f33756c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.IO.OutputStream.cs @@ -55,12 +55,9 @@ public unsafe OutputStream () : base (IntPtr.Zero, JniHandleOwnership.DoNotTrans if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_close_Close_V; @@ -88,10 +85,7 @@ private static void __n_Close (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Close () { const string __id = "close.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } static Delegate cb_flush_Flush_V; @@ -119,10 +113,7 @@ private static void __n_Flush (IntPtr jnienv, IntPtr native__this) public virtual unsafe void Flush () { const string __id = "flush.()V"; - try { - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, null); } static Delegate cb_write_Write_arrayB_V; @@ -262,12 +253,9 @@ public OutputStreamInvoker (IntPtr handle, JniHandleOwnership transfer) : base ( public override unsafe void Write (int oneByte) { const string __id = "write.(I)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue (oneByte); - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); - } finally { - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue (oneByte); + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs index 311c44de33b..8278e9b8daa 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/Streams/Java.Lang.Throwable.cs @@ -49,11 +49,8 @@ private static IntPtr __n_GetMessage (IntPtr jnienv, IntPtr native__this) [Register ("getMessage", "()Ljava/lang/String;", "GetGetMessageHandler")] get { const string __id = "getMessage.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs index 613ab546dd9..41580bc88f9 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/ClassWithoutNamespace.cs @@ -53,12 +53,9 @@ public unsafe ClassWithoutNamespace () : base (IntPtr.Zero, JniHandleOwnership.D if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_Foo_Foo_V; @@ -112,10 +109,7 @@ public ClassWithoutNamespaceInvoker (IntPtr handle, JniHandleOwnership transfer) public override unsafe void Foo () { const string __id = "Foo.()V"; - try { - _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs index 4b9ea61616b..e875ad0e924 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/IInterfaceWithoutNamespace.cs @@ -65,10 +65,7 @@ private static void __n_Foo (IntPtr jnienv, IntPtr native__this) public unsafe void Foo () { const string __id = "Foo.()V"; - try { - _members__InterfaceWithoutNamespace.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members__InterfaceWithoutNamespace.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs index 5f366be2722..4be652fd8df 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.ICollection.cs @@ -109,10 +109,7 @@ private static void __n_Clear (IntPtr jnienv, IntPtr native__this) public unsafe void Clear () { const string __id = "clear.()V"; - try { - _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs index 0e38e3ef14a..a09069e0870 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IDeque.cs @@ -109,10 +109,7 @@ private static void __n_Clear (IntPtr jnienv, IntPtr native__this) public unsafe void Clear () { const string __id = "clear.()V"; - try { - _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs index 6aea8ff7537..ee285955483 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Java.Util.IQueue.cs @@ -107,10 +107,7 @@ private static void __n_Clear (IntPtr jnienv, IntPtr native__this) public unsafe void Clear () { const string __id = "clear.()V"; - try { - _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); - } finally { - } + _members_java_util_Collection.InstanceMethods.InvokeAbstractVoidMethod (__id, this, null); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs index 885f1f0e816..4328b6d2f3d 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericImplementation.cs @@ -55,12 +55,9 @@ public unsafe GenericImplementation () : base (IntPtr.Zero, JniHandleOwnership.D if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_SetObject_SetObject_arrayB_V; diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs index 8ea79c2e21b..33e16a6f22d 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericObjectPropertyImplementation.cs @@ -55,12 +55,9 @@ public unsafe GenericObjectPropertyImplementation () : base (IntPtr.Zero, JniHan if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_getObject_GetObject_Ljava_lang_Object_; @@ -109,23 +106,17 @@ private static void __n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr nati [Register ("getObject", "()Ljava/lang/Object;", "GetGetObjectHandler")] get { const string __id = "getObject.()Ljava/lang/Object;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericObjectPropertyImplementation']/method[@name='setObject' and count(parameter)=1 and parameter[1][@type='java.lang.Object']]" [Register ("setObject", "(Ljava/lang/Object;)V", "GetSetObject_Ljava_lang_Object_Handler")] set { const string __id = "setObject.(Ljava/lang/Object;)V"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((value == null) ? IntPtr.Zero : ((global::Java.Lang.Object) value).Handle); - _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); - } finally { - global::System.GC.KeepAlive (value); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((value == null) ? IntPtr.Zero : ((global::Java.Lang.Object) value).Handle); + _members.InstanceMethods.InvokeVirtualVoidMethod (__id, this, __args); + global::System.GC.KeepAlive (value); } } diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs index 151f245abd9..4f3160ce626 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringImplementation.cs @@ -55,12 +55,9 @@ public unsafe GenericStringImplementation () : base (IntPtr.Zero, JniHandleOwner if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_SetObject_SetObject_arrayLjava_lang_String__V; diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs index dc9859f3695..4c7433abf7c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.GenericStringPropertyImplementation.cs @@ -55,12 +55,9 @@ public unsafe GenericStringPropertyImplementation () : base (IntPtr.Zero, JniHan if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_getObject_GetObject_Ljava_lang_String_; @@ -109,11 +106,8 @@ public virtual unsafe string Object { [Register ("getObject", "()Ljava/lang/String;", "GetGetObjectHandler")] get { const string __id = "getObject.()Ljava/lang/String;"; - try { - var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); - return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null); + return JNIEnv.GetString (__rm.Handle, JniHandleOwnership.TransferLocalRef); } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/class[@name='GenericStringPropertyImplementation']/method[@name='SetObject' and count(parameter)=1 and parameter[1][@type='java.lang.String']]" [Register ("SetObject", "(Ljava/lang/String;)V", "GetSetObject_Ljava_lang_String_Handler")] diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs index 9c40dc51df9..6dc1b9cfc19 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.IGenericPropertyInterface.cs @@ -95,11 +95,8 @@ private static void __n_SetObject_Ljava_lang_Object_ (IntPtr jnienv, IntPtr nati public unsafe global::Java.Lang.Object Object { get { const string __id = "getObject.()Ljava/lang/Object;"; - try { - var __rm = _members_test_me_GenericPropertyInterface.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); - return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); - } finally { - } + var __rm = _members_test_me_GenericPropertyInterface.InstanceMethods.InvokeAbstractObjectMethod (__id, this, null); + return (global::Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); } set { const string __id = "setObject.(Ljava/lang/Object;)V"; diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs index 5df4d25ee9e..2261b018f6c 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.ITestInterface.cs @@ -131,14 +131,12 @@ private static int __n_GetSpanFlags_Ljava_lang_Object_ (IntPtr jnienv, IntPtr na public unsafe int GetSpanFlags (global::Java.Lang.Object tag) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); - var __rm = _members_test_me_TestInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (tag); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); + var __rm = _members_test_me_TestInterface.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (tag); + return __result; } static Delegate cb_append_Append_Ljava_lang_CharSequence__V; diff --git a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs index ad4e1e4d659..8640dde651b 100644 --- a/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs +++ b/external/Java.Interop/tests/generator-Tests/expected.xaji/TestInterface/Test.ME.TestInterfaceImplementation.cs @@ -76,12 +76,9 @@ public unsafe TestInterfaceImplementation () : base (IntPtr.Zero, JniHandleOwner if (((global::Java.Lang.Object) this).Handle != IntPtr.Zero) return; - try { - var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); - SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); - _members.InstanceMethods.FinishCreateInstance (__id, this, null); - } finally { - } + var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (), null); + SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef); + _members.InstanceMethods.FinishCreateInstance (__id, this, null); } static Delegate cb_getSpanFlags_GetSpanFlags_Ljava_lang_Object__I; @@ -204,14 +201,12 @@ public TestInterfaceImplementationInvoker (IntPtr handle, JniHandleOwnership tra public override unsafe int GetSpanFlags (global::Java.Lang.Object tag) { const string __id = "getSpanFlags.(Ljava/lang/Object;)I"; - try { - JniArgumentValue* __args = stackalloc JniArgumentValue [1]; - __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); - var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); - return __rm; - } finally { - global::System.GC.KeepAlive (tag); - } + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((tag == null) ? IntPtr.Zero : ((global::Java.Lang.Object) tag).Handle); + var __rm = _members.InstanceMethods.InvokeAbstractInt32Method (__id, this, __args); + var __result = __rm; + global::System.GC.KeepAlive (tag); + return __result; } // Metadata.xml XPath method reference: path="/api/package[@name='test.me']/interface[@name='TestInterface']/method[@name='append' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" diff --git a/external/Java.Interop/tools/generator/SourceWriters/BoundConstructor.cs b/external/Java.Interop/tools/generator/SourceWriters/BoundConstructor.cs index 7f333f17c17..4f8fb2f352b 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/BoundConstructor.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/BoundConstructor.cs @@ -74,9 +74,13 @@ protected override void WriteBody (CodeWriter writer) foreach (var prep in constructor.Parameters.GetCallPrep (opt)) writer.WriteLine (prep); - writer.WriteLine ("try {"); + var needsFinally = SourceWriterExtensions.HasCallCleanup (constructor.Parameters, opt); + + if (needsFinally) { + writer.WriteLine ("try {"); + writer.Indent (); + } - writer.Indent (); WriteParamterListCallArgs (writer, constructor.Parameters, false, opt); writer.WriteLine ("var __r = _members.InstanceMethods.StartCreateInstance (__id, ((object) this).GetType (){0});", constructor.Parameters.GetCallArgs (opt, invoker: false)); if (opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1) { @@ -85,21 +89,21 @@ protected override void WriteBody (CodeWriter writer) writer.WriteLine ("SetHandle (__r.Handle, JniHandleOwnership.TransferLocalRef);"); } writer.WriteLine ("_members.InstanceMethods.FinishCreateInstance (__id, this{0});", constructor.Parameters.GetCallArgs (opt, invoker: false)); - writer.Unindent (); - - writer.WriteLine ("} finally {"); - writer.Indent (); - var call_cleanup = constructor.Parameters.GetCallCleanup (opt); - foreach (string cleanup in call_cleanup) - writer.WriteLine (cleanup); + if (needsFinally) { + writer.Unindent (); + writer.WriteLine ("} finally {"); + writer.Indent (); - foreach (var p in constructor.Parameters.Where (para => para.ShouldGenerateKeepAlive ())) - writer.WriteLine ($"global::System.GC.KeepAlive ({opt.GetSafeIdentifier (p.Name)});"); + SourceWriterExtensions.WriteCallCleanup (writer, constructor.Parameters, opt); - writer.Unindent (); + SourceWriterExtensions.WriteKeepAlive (writer, constructor.Parameters, opt); - writer.WriteLine ("}"); + writer.Unindent (); + writer.WriteLine ("}"); + } else { + SourceWriterExtensions.WriteKeepAlive (writer, constructor.Parameters, opt); + } } void WriteParamterListCallArgs (CodeWriter writer, ParameterList parameters, bool invoker, CodeGenerationOptions opt) diff --git a/external/Java.Interop/tools/generator/SourceWriters/BoundFieldAsProperty.cs b/external/Java.Interop/tools/generator/SourceWriters/BoundFieldAsProperty.cs index 4bd7b0f7af4..6f731f8ce61 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/BoundFieldAsProperty.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/BoundFieldAsProperty.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -152,9 +151,21 @@ protected override void WriteSetterBody (CodeWriter writer) } } - writer.WriteLine ("try {"); + var needsFinally = field.Symbol.IsArray + ? opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 + : SourceWriterExtensions.HasCallCleanup (field.SetParameters, opt) || + (field.SetParameters.HasCleanup && !have_prep && opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1); + var needsKeepAlive = opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1 && + field.Symbol.JniName != null && + field.Symbol.JniName.Length > 1 && + (field.Symbol.JniName [0] == 'L' || field.Symbol.JniName [0] == '['); + + if (needsFinally) { + writer.WriteLine ("try {"); + writer.Write ("\t"); + } - writer.Write ($"\t_members.{indirect}.SetValue (__id{(field.IsStatic ? "" : ", this")}, "); + writer.Write ($"_members.{indirect}.SetValue (__id{(field.IsStatic ? "" : ", this")}, "); if (opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1) { if (invokeType != "Object" || have_prep) { @@ -170,32 +181,26 @@ protected override void WriteSetterBody (CodeWriter writer) writer.WriteLine ($"{(invokeType != "Object" ? arg : "new JniObjectReference (" + arg + ")")});"); } - writer.WriteLine ("} finally {"); - writer.Indent (); + if (needsFinally) { + writer.WriteLine ("} finally {"); + writer.Indent (); - if (field.Symbol.IsArray) { - if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) { + if (field.Symbol.IsArray) { writer.WriteLine ($"global::Android.Runtime.JNIEnv.DeleteLocalRef ({arg});"); - } - } else { - foreach (var cleanup in field.SetParameters.GetCallCleanup (opt)) - writer.WriteLine (cleanup); - if (field.SetParameters.HasCleanup && !have_prep) { - if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) { + } else { + SourceWriterExtensions.WriteCallCleanup (writer, field.SetParameters, opt); + if (!have_prep && opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1) writer.WriteLine ($"global::Android.Runtime.JNIEnv.DeleteLocalRef ({arg});"); - } } - } - if (opt.CodeGenerationTarget == CodeGenerationTarget.JavaInterop1 && - field.Symbol.JniName != null && - field.Symbol.JniName.Length > 1 && - (field.Symbol.JniName[0] == 'L' || field.Symbol.JniName[0] == '[')) { + if (needsKeepAlive) + writer.WriteLine ("GC.KeepAlive (value);"); + + writer.Unindent (); + writer.WriteLine ("}"); + } else if (needsKeepAlive) { writer.WriteLine ($"GC.KeepAlive (value);"); } - - writer.Unindent (); - writer.WriteLine ("}"); } } } diff --git a/external/Java.Interop/tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs b/external/Java.Interop/tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs index f9f8e77e2a8..1dac710403d 100644 --- a/external/Java.Interop/tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs +++ b/external/Java.Interop/tools/generator/SourceWriters/Extensions/SourceWriterExtensions.cs @@ -238,30 +238,113 @@ public static void AddMethodBody (List body, Method method, CodeGenerati foreach (string prep in method.Parameters.GetCallPrep (opt)) body.Add (prep); - body.Add ("try {"); + var hasKeepAlive = HasKeepAlive (method.Parameters); + var needsFinally = HasCallCleanup (method.Parameters, opt); + var needsTry = needsFinally || method.IsCompatVirtualMethod; - AddMethodBodyTryBlock (body, method, opt, members); + if (needsTry) + body.Add ("try {"); + + AddMethodBodyTryBlock (body, method, opt, members, deferReturn: !needsFinally && hasKeepAlive, indent: needsTry); if (method.IsCompatVirtualMethod) { + if (!needsFinally) { + AddKeepAlive (body, method.Parameters, opt, "\t"); + + if (!method.IsVoid && hasKeepAlive) + body.Add ("\treturn __result;"); + } + body.Add ("}"); body.Add ("catch (Java.Lang.NoSuchMethodError) {"); + + if (!needsFinally) + AddKeepAlive (body, method.Parameters, opt, "\t"); + body.Add (" throw new Java.Lang.AbstractMethodError (__id);"); } - body.Add ("} finally {"); + if (needsFinally) { + body.Add ("} finally {"); + + AddCallCleanup (body, method.Parameters, opt, "\t"); + + AddKeepAlive (body, method.Parameters, opt, "\t"); + + body.Add ("}"); + } else if (method.IsCompatVirtualMethod) { + body.Add ("}"); + } else { + AddKeepAlive (body, method.Parameters, opt); + + if (!method.IsVoid && hasKeepAlive) + body.Add ("return __result;"); + } + } + + public static void WriteKeepAlive (CodeWriter writer, ParameterList parameters, CodeGenerationOptions opt) + { + for (var i = 0; i < parameters.Count; i++) { + var parameter = parameters [i]; + if (parameter.ShouldGenerateKeepAlive ()) + writer.WriteLine ($"global::System.GC.KeepAlive ({opt.GetSafeIdentifier (parameter.Name)});"); + } + } + + public static bool HasCallCleanup (ParameterList parameters, CodeGenerationOptions opt) + { + for (var i = 0; i < parameters.Count; i++) { + var parameter = parameters [i]; + if (parameter.NeedsPrep && parameter.GetPostCall (opt).Length > 0) + return true; + } + return false; + } - foreach (string cleanup in method.Parameters.GetCallCleanup (opt)) - body.Add ("\t" + cleanup); + public static void WriteCallCleanup (CodeWriter writer, ParameterList parameters, CodeGenerationOptions opt) + { + for (var i = 0; i < parameters.Count; i++) { + var parameter = parameters [i]; + if (!parameter.NeedsPrep) + continue; + foreach (var statement in parameter.GetPostCall (opt)) + writer.WriteLine (statement); + } + } - foreach (var p in method.Parameters.Where (para => para.ShouldGenerateKeepAlive ())) - body.Add ($"\tglobal::System.GC.KeepAlive ({opt.GetSafeIdentifier (p.Name)});"); + static bool HasKeepAlive (ParameterList parameters) + { + for (var i = 0; i < parameters.Count; i++) { + if (parameters [i].ShouldGenerateKeepAlive ()) + return true; + } + return false; + } - body.Add ("}"); + static void AddCallCleanup (List body, ParameterList parameters, CodeGenerationOptions opt, string indentation) + { + for (var i = 0; i < parameters.Count; i++) { + var parameter = parameters [i]; + if (!parameter.NeedsPrep) + continue; + foreach (var statement in parameter.GetPostCall (opt)) + body.Add (indentation + statement); + } } - public static void AddMethodBodyTryBlock (List body, Method method, CodeGenerationOptions opt, string members = "_members") + static void AddKeepAlive (List body, ParameterList parameters, CodeGenerationOptions opt, string indentation = "") { - AddParameterListCallArgs (body, method.Parameters, opt); + for (var i = 0; i < parameters.Count; i++) { + var parameter = parameters [i]; + if (parameter.ShouldGenerateKeepAlive ()) + body.Add ($"{indentation}global::System.GC.KeepAlive ({opt.GetSafeIdentifier (parameter.Name)});"); + } + } + + public static void AddMethodBodyTryBlock (List body, Method method, CodeGenerationOptions opt, string members = "_members", bool deferReturn = false, bool indent = true) + { + AddParameterListCallArgs (body, method.Parameters, opt, indent); + var indentation = indent ? "\t" : ""; var invokeType = JavaInteropCodeGenerator.GetInvokeType (method.RetVal.CallMethodPrefix); @@ -279,27 +362,29 @@ public static void AddMethodBodyTryBlock (List body, Method method, Code var this_param = method.IsStatic ? $"__id{call_args}" : $"__id, this{call_args}"; // Example: var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, __args); - body.Add ($"\t{return_var}{members}.{method_type}.Invoke{virt_type}{invokeType}Method ({this_param});"); + body.Add ($"{indentation}{return_var}{members}.{method_type}.Invoke{virt_type}{invokeType}Method ({this_param});"); if (!method.IsVoid) { var r = "__rm"; if (opt.CodeGenerationTarget != CodeGenerationTarget.JavaInterop1 && invokeType == "Object") { r += ".Handle"; } - body.Add ($"\treturn {method.RetVal.ReturnCast}{method.RetVal.FromNative (opt, r, true, false) + opt.GetNullForgiveness (method.RetVal)};"); + body.Add ($"{indentation}{(deferReturn ? "var __result = " : "return ")}{method.RetVal.ReturnCast}{method.RetVal.FromNative (opt, r, true, false) + opt.GetNullForgiveness (method.RetVal)};"); } } - public static void AddParameterListCallArgs (List body, ParameterList parameters, CodeGenerationOptions opt) + public static void AddParameterListCallArgs (List body, ParameterList parameters, CodeGenerationOptions opt, bool indent = true) { if (parameters.Count == 0) return; - body.Add ($"\tJniArgumentValue* __args = stackalloc JniArgumentValue [{parameters.Count}];"); + var indentation = indent ? "\t" : ""; + + body.Add ($"{indentation}JniArgumentValue* __args = stackalloc JniArgumentValue [{parameters.Count}];"); for (var i = 0; i < parameters.Count; ++i) { var p = parameters [i]; - body.Add ($"\t__args [{i}] = new JniArgumentValue ({p.GetCall (opt)});"); + body.Add ($"{indentation}__args [{i}] = new JniArgumentValue ({p.GetCall (opt)});"); } }