Guarding fixes and don't default NRT to on.

Author: jpobst

tools/generator/CodeGeneratorOptions.cs

@@ -173,8 +173,6 @@ public static CodeGeneratorOptions Parse (string[] args)
 				return null;
 			}
 
-			opts.SupportNullableReferenceTypes = true;
-
 			return opts;
 		}
 

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

@@ -78,7 +78,7 @@ public string GetGenericType (Dictionary<string, string> mappings)
 
 		public string FromNative (CodeGenerationOptions opt, string var_name, bool owned)
 		{
-			return String.Format ("({0}[]?) JNIEnv.GetArray ({1}, {2}, typeof ({3}))", opt.GetOutputName (ElementType), var_name, owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer", opt.GetOutputName (sym.FullName));
+			return String.Format ("({0}[]{4}) JNIEnv.GetArray ({1}, {2}, typeof ({3}))", opt.GetOutputName (ElementType), var_name, owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer", opt.GetOutputName (sym.FullName), opt.NullableOperator);
 		}
 
 		public string ToNative (CodeGenerationOptions opt, string var_name, Dictionary<string, string> mappings = null)
@@ -117,7 +117,7 @@ public string[] PostCall (CodeGenerationOptions opt, string var_name)
 
 		public string[] PreCallback (CodeGenerationOptions opt, string var_name, bool owned)
 		{
-			return new string[] { String.Format ("var {1} = ({0}[]?) JNIEnv.GetArray ({2}, JniHandleOwnership.DoNotTransfer, typeof ({3}));", opt.GetOutputName (ElementType), opt.GetSafeIdentifier (var_name), opt.GetSafeIdentifier (TypeNameUtilities.GetNativeName (var_name)), opt.GetOutputName (sym.FullName)) };
+			return new string[] { String.Format ("var {1} = ({0}[]{4}) JNIEnv.GetArray ({2}, JniHandleOwnership.DoNotTransfer, typeof ({3}));", opt.GetOutputName (ElementType), opt.GetSafeIdentifier (var_name), opt.GetSafeIdentifier (TypeNameUtilities.GetNativeName (var_name)), opt.GetOutputName (sym.FullName), opt.NullableOperator) };
 		}
 
 		public string[] PreCall (CodeGenerationOptions opt, string var_name)

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

@@ -27,7 +27,7 @@ public string GetGenericType (Dictionary<string, string> mappings)
 		public string FromNative (CodeGenerationOptions opt, string var_name, bool owned)
 		{
 			if (IsArray)
-				return String.Format ("({0}[]?) JNIEnv.GetArray ({1}, {2}, typeof ({0}))", opt.GetOutputName (enum_type), var_name, owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer");
+				return String.Format ("({0}[]{3}) JNIEnv.GetArray ({1}, {2}, typeof ({0}))", opt.GetOutputName (enum_type), var_name, owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer", opt.NullableOperator);
 			else
 				return String.Format ("({0}) {1}", opt.GetOutputName (enum_type), var_name);
 		}