Various fixes.

Author: jpobst

tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceProperties.txt

@@ -5,7 +5,7 @@ int Count {
 	[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
 }
 
-java.lang.String Key {
+string Key {
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
 	[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
 	// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt

@@ -39,7 +39,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 		[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
 	}
 
-	java.lang.String Key {
+	string Key {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
 		[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDeclaration.txt

@@ -9,7 +9,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 		[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
 	}
 
-	java.lang.String Key {
+	string Key {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
 		[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt

@@ -39,7 +39,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 		[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
 	}
 
-	java.lang.String Key {
+	string Key {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
 		[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDeclaration.txt

@@ -9,7 +9,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
 		[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
 	}
 
-	java.lang.String Key {
+	string Key {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
 		[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt

@@ -41,7 +41,7 @@ public partial interface IMyInterface : IJavaObject {
 		[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
 	}
 
-	java.lang.String Key {
+	string Key {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
 		[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceDeclaration.txt

@@ -9,7 +9,7 @@ public partial interface IMyInterface : IJavaObject {
 		[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
 	}
 
-	java.lang.String Key {
+	string Key {
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
 		[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
 		// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs

@@ -835,7 +835,7 @@ public void WriteInterfaceInvoker (InterfaceGen @interface, string indent)
 			writer.WriteLine ("{0}internal partial class {1}Invoker : global::Java.Lang.Object, {1} {{", indent, @interface.Name);
 			writer.WriteLine ();
 			WriteInterfaceInvokerHandle (@interface, indent + "\t", @interface.Name + "Invoker");
-			writer.WriteLine ("{0}\t{1}IntPtr class_ref;", indent, opt.BuildingCoreAssembly ? "" : "");
+			writer.WriteLine ("{0}\t{1}IntPtr class_ref;", indent, opt.BuildingCoreAssembly ? "new " : "");
 			writer.WriteLine ();
 			writer.WriteLine ("{0}\tpublic static {1}{2} GetObject (IntPtr handle, JniHandleOwnership transfer)", indent, @interface.Name, opt.NullableOperator);
 			writer.WriteLine ("{0}\t{{", indent);
@@ -1352,7 +1352,7 @@ public void WriteMethodExtensionOverload (Method method, string indent, string s
 			if (!method.CanHaveStringOverload)
 				return;
 
-			string ret = opt.GetTypeReferenceName (method.RetVal).Replace ("Java.Lang.ICharSequence", "string");
+			string ret = opt.GetTypeReferenceName (method.RetVal).Replace ("Java.Lang.ICharSequence", "string").Replace ("global::string", "string");
 			writer.WriteLine ();
 
 			var parameters = method.GetSignature (opt).Replace ("Java.Lang.ICharSequence", "string").Replace ("global::string", "string");

tools/generator/Java.Interop.Tools.Generator.ObjectModel/ClassGen.cs

@@ -130,8 +130,6 @@ public override string FromNative (CodeGenerationOptions opt, string varname, bo
 		public override void Generate (CodeGenerationOptions opt, GenerationInfo gen_info)
 		{
 			using (var sw = gen_info.OpenStream (opt.GetFileName (FullName))) {
-				sw.WriteLine ("#nullable enable");
-				sw.WriteLine ();
 				sw.WriteLine ("using System;");
 				sw.WriteLine ("using System.Collections.Generic;");
 				sw.WriteLine ("using Android.Runtime;");
@@ -178,8 +176,6 @@ public static void GenerateTypeRegistrations (CodeGenerationOptions opt, Generat
 					v.Add (new KeyValuePair<string, string> (reg.Key, reg.Value));
 				}
 
-				sw.WriteLine ("#nullable enable");
-				sw.WriteLine ();
 				sw.WriteLine ("using System;");
 				sw.WriteLine ("using System.Collections.Generic;");
 				sw.WriteLine ("using Android.Runtime;");

tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs

@@ -353,8 +353,6 @@ protected void GenerateAnnotationAttribute (CodeGenerationOptions opt, Generatio
 				var localFullName = Namespace + (Namespace.Length > 0 ? "." : string.Empty) + attrClassNameBase;
 
 				using (var sw = gen_info.OpenStream (opt.GetFileName (localFullName))) {
-					sw.WriteLine ("#nullable enable");
-					sw.WriteLine ();
 					sw.WriteLine ("using System;");
 					sw.WriteLine ();
 					sw.WriteLine ("namespace {0} {{", Namespace);
@@ -711,13 +709,13 @@ public string [] PreCallback (CodeGenerationOptions opt, string var_name, bool o
 			var rgm = this as IRequireGenericMarshal;
 
 			return new string []{
-				string.Format ("{0} {1} = global::Java.Lang.Object.GetObject<{4}> ({2}, {3});",
+				string.Format ("{0} {1} = {5}global::Java.Lang.Object.GetObject<{4}> ({2}, {3});",
 					       "var",
 					       opt.GetSafeIdentifier (var_name),
 					       opt.GetSafeIdentifier (TypeNameUtilities.GetNativeName (var_name)),
 					       owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer",
-					       opt.GetOutputName (rgm != null ? (rgm.GetGenericJavaObjectTypeOverride () ?? FullName) : FullName))//,
-					       //rgm != null ? "(" + opt.GetOutputName (FullName) + ")" : string.Empty)
+					       opt.GetOutputName (rgm != null ? (rgm.GetGenericJavaObjectTypeOverride () ?? FullName) : FullName),
+					       rgm != null ? "(" + opt.GetOutputName (FullName) + ")" : string.Empty)
 			};
 		}
 

tools/generator/Java.Interop.Tools.Generator.ObjectModel/InterfaceGen.cs

@@ -78,8 +78,6 @@ public override void FixupAccessModifiers (CodeGenerationOptions opt)
 		public override void Generate (CodeGenerationOptions opt, GenerationInfo gen_info)
 		{
 			using (var sw = gen_info.OpenStream (opt.GetFileName (FullName))) {
-				sw.WriteLine ("#nullable enable");
-				sw.WriteLine ();
 				sw.WriteLine ("using System;");
 				sw.WriteLine ("using System.Collections.Generic;");
 				sw.WriteLine ("using Android.Runtime;");

tools/generator/Java.Interop.Tools.Generator.ObjectModel/Symbols/GenericTypeParameter.cs

@@ -72,7 +72,7 @@ public string GetObjectHandleProperty (string variable)
 
 		public string FromNative (CodeGenerationOptions opt, string varname, bool owned)
 		{
-			return String.Format ("global::Java.Lang.Object.GetObject<{2}> ({0}, {1})", varname, owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer", opt.GetOutputName (FullName));
+			return String.Format ("({0}) global::Java.Lang.Object.GetObject<{3}> ({1}, {2})", type, varname, owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer", opt.GetOutputName (FullName));
 		}
 
 		public string GetGenericType (Dictionary<string, string> mappings)