Finish refactoring.

Author: jpobst

src/Java.Interop.Tools.JavaCallableWrappers/Adapters/CecilImporter.cs

@@ -2,7 +2,7 @@
 
 namespace Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
 
-class CallableWrapperApplicationConstructor
+public class CallableWrapperApplicationConstructor
 {
 	public string Name { get; set; }
 

src/Java.Interop.Tools.JavaCallableWrappers/CallableWrapperMembers/CallableWrapperApplicationConstructor.cs

@@ -2,7 +2,7 @@
 
 namespace Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
 
-class CallableWrapperConstructor : CallableWrapperMethod
+public class CallableWrapperConstructor : CallableWrapperMethod
 {
 	public bool CannotRegisterInStaticConstructor { get; set; }
 	public string? PartialAssemblyQualifiedName { get; set; }
@@ -19,8 +19,8 @@ public override void Generate (TextWriter sw, CallableWrapperWriterOptions optio
 		//        This does NOT currently allow creating managed types from Java.
 		sw.WriteLine ();
 
-		if (Annotations is not null)
-			sw.WriteLine (Annotations);
+		foreach (var annotation in Annotations)
+			annotation.Generate (sw, "", options);
 
 		sw.Write ("\tpublic ");
 		sw.Write (Name);

src/Java.Interop.Tools.JavaCallableWrappers/CallableWrapperMembers/CallableWrapperConstructor.cs

@@ -1,15 +1,16 @@
+using System.Collections.Generic;
 using System.IO;
 
 namespace Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
 
-class CallableWrapperField
+public class CallableWrapperField
 {
 	public string FieldName { get; set; }
 	public string TypeName { get; set; }
 	public string Visibility { get; set; }
 	public bool IsStatic { get; set; }
 	public string InitializerName { get; set; }
-	public string? Annotations { get; set; }
+	public List<CallableWrapperTypeAnnotation> Annotations { get; } = new List<CallableWrapperTypeAnnotation> ();
 
 	public CallableWrapperField (string fieldName, string typeName, string visibility, string initializerName)
 	{
@@ -23,8 +24,8 @@ public void Generate (TextWriter sw, CallableWrapperWriterOptions options)
 	{
 		sw.WriteLine ();
 
-		if (Annotations is not null)
-			sw.WriteLine (Annotations);
+		foreach (var annotation in Annotations)
+			annotation.Generate (sw, "", options);
 
 		sw.Write ("\t");
 		sw.Write (Visibility);

src/Java.Interop.Tools.JavaCallableWrappers/CallableWrapperMembers/CallableWrapperField.cs

@@ -1,9 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 
 namespace Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
 
-class CallableWrapperMethod
+public class CallableWrapperMethod
 {
 	public string Name { get; set; }
 	public string Method { get; set; }
@@ -12,16 +13,17 @@ class CallableWrapperMethod
 	public string? JavaNameOverride { get; set; }
 	public string? Params { get; set; }
 	public string? Retval { get; set; }
-	public string? ThrowsDeclaration { get; set; }
 	public string? JavaAccess { get; set; }
 	public bool IsExport { get; set; }
 	public bool IsStatic { get; set; }
-	public bool IsDynamicallyRegistered { get; set; }
+	public bool IsDynamicallyRegistered { get; set; } = true;
 	public string []? ThrownTypeNames { get; set; }
-	public string? Annotations { get; set; }
 	public string? SuperCall { get; set; }
 	public string? ActivateCall { get; set; }
 	public string JavaName => JavaNameOverride ?? Name;
+	public List<CallableWrapperTypeAnnotation> Annotations { get; } = new List<CallableWrapperTypeAnnotation> ();
+
+	public string? ThrowsDeclaration => ThrownTypeNames?.Length > 0 ? $" throws {string.Join (", ", ThrownTypeNames)}" : null;
 
 	public CallableWrapperMethod (string name, string method, string jniSignature)
 	{
@@ -34,8 +36,8 @@ public virtual void Generate (TextWriter sw, CallableWrapperWriterOptions option
 	{
 		sw.WriteLine ();
 
-		if (Annotations is not null)
-			sw.WriteLine (Annotations);
+		foreach (var annotation in Annotations)
+			annotation.Generate (sw, "", options);
 
 		sw.Write ("\t");
 
@@ -58,7 +60,7 @@ public virtual void Generate (TextWriter sw, CallableWrapperWriterOptions option
 		sw.WriteLine ("\t{");
 
 #if MONODROID_TIMING
-		sw.WriteLine ("\t\tandroid.util.Log.i(\"MonoDroid-Timing\", \"{0}.{1}: time: \"+java.lang.System.currentTimeMillis());", name, method.Name);
+		sw.WriteLine ("\t\tandroid.util.Log.i(\"MonoDroid-Timing\", \"{0}.{1}: time: \"+java.lang.System.currentTimeMillis());", Name, Method);
 #endif
 
 		sw.Write ("\t\t");

src/Java.Interop.Tools.JavaCallableWrappers/CallableWrapperMembers/CallableWrapperMethod.cs

@@ -4,20 +4,27 @@
 
 namespace Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
 
-class CallableWrapperType
+public class CallableWrapperType
 {
 	public string Name { get; set; }
 	public string Package { get; set; }
 	public bool IsAbstract { get; set; }
 	public string? ApplicationJavaClass { get; set; }
-	public bool HasDynamicallyRegisteredMethods { get; set; }
 	public bool GenerateOnCreateOverrides { get; set; }
+	/// <summary>
+	/// The Java source code to be included in Instrumentation.onCreate
+	///
+	/// Originally came from MonoRuntimeProvider.java delimited by:
+	/// // Mono Runtime Initialization {{{
+	/// // }}}
+	/// </summary>
 	public string? MonoRuntimeInitialization { get; set; }
 	public string? ExtendsType { get; set; }
 	public CallableWrapperApplicationConstructor? ApplicationConstructor { get; set; }
 	public bool IsApplication { get; set; }
 	public bool IsInstrumentation { get; set; }
 	public string PartialAssemblyQualifiedName { get; set; }
+	public bool HasExport { get; set; }
 
 	public List<CallableWrapperTypeAnnotation> Annotations { get; } = new List<CallableWrapperTypeAnnotation> ();
 	public List<string> ImplementedInterfaces { get; } = new List<string> ();
@@ -59,8 +66,7 @@ public CallableWrapperType (string name, string package, string partialAssemblyQ
 	//
 	//    private native void n_onCreate (android.os.Bundle bundle);
 	// }
-
-	public void Generate (TextWriter writer, CallableWrapperWriterOptions options, bool isNested)
+	public void Generate (TextWriter writer, CallableWrapperWriterOptions options, bool isNested = false)
 	{
 		if (!isNested && !string.IsNullOrEmpty (Package)) {
 			writer.WriteLine ("package " + Package + ";");
@@ -80,7 +86,7 @@ public void Generate (TextWriter writer, CallableWrapperWriterOptions options, b
 		GenerateFooter (writer, options);
 	}	
 
-	public void GenerateHeader (TextWriter sw, CallableWrapperWriterOptions options)
+	void GenerateHeader (TextWriter sw, CallableWrapperWriterOptions options)
 	{
 		sw.WriteLine ();
 
@@ -90,7 +96,13 @@ public void GenerateHeader (TextWriter sw, CallableWrapperWriterOptions options)
 
 		sw.WriteLine ("public " + (IsAbstract ? "abstract " : "") + "class " + Name);
 
-		sw.WriteLine ("\textends " + ExtendsType);
+		var extends = ExtendsType;
+
+		// Do this check here rather than the constructor because it can be set after the constructor is called
+		if (extends == "android.app.Application" && ApplicationJavaClass != null && !string.IsNullOrEmpty (ApplicationJavaClass))
+			extends = ApplicationJavaClass;
+
+		sw.WriteLine ("\textends " + extends);
 
 		sw.WriteLine ("\timplements");
 		sw.Write ("\t\t");
@@ -114,7 +126,7 @@ public void GenerateHeader (TextWriter sw, CallableWrapperWriterOptions options)
 		sw.WriteLine ("{");
 	}
 
-	public void GenerateInfrastructure (TextWriter writer, CallableWrapperWriterOptions options)
+	void GenerateInfrastructure (TextWriter writer, CallableWrapperWriterOptions options)
 	{
 		var needCtor = false;
 
@@ -147,7 +159,7 @@ public void GenerateInfrastructure (TextWriter writer, CallableWrapperWriterOpti
 		}
 	}
 
-	public void GenerateBody (TextWriter sw, CallableWrapperWriterOptions options)
+	void GenerateBody (TextWriter sw, CallableWrapperWriterOptions options)
 	{
 		foreach (var ctor in Constructors)
 			ctor.Generate (sw, options);
@@ -187,7 +199,7 @@ public void GenerateBody (TextWriter sw, CallableWrapperWriterOptions options)
 		sw.WriteLine ("\t}");
 	}
 
-	public void GenerateFooter (TextWriter sw, CallableWrapperWriterOptions options)
+	void GenerateFooter (TextWriter sw, CallableWrapperWriterOptions options)
 	{
 		sw.WriteLine ("}");
 	}
@@ -216,7 +228,7 @@ void WriteInstrumentationOnCreate (TextWriter sw, CallableWrapperWriterOptions o
 		sw.WriteLine ("\t{");
 
 #if MONODROID_TIMING
-		sw.WriteLine ("\t\tandroid.util.Log.i(\"MonoDroid-Timing\", \"{0}.onCreate(Bundle): time: \"+java.lang.System.currentTimeMillis());", name);
+		sw.WriteLine ("\t\tandroid.util.Log.i(\"MonoDroid-Timing\", \"{0}.onCreate(Bundle): time: \"+java.lang.System.currentTimeMillis());", Name);
 		sw.WriteLine ();
 #endif
 
@@ -282,6 +294,9 @@ void GenerateRegisterType (TextWriter sw, CallableWrapperType self, string field
 		}
 	}
 
+	// If there are no methods, we need to generate "empty" registration because of backward compatibility
+	public bool HasDynamicallyRegisteredMethods => Methods.Count == 0 || Methods.Any (sig => sig.IsDynamicallyRegistered);
+
 	/// <summary>
 	/// Returns a destination file path based on the package name of this Java type
 	/// </summary>

src/Java.Interop.Tools.JavaCallableWrappers/CallableWrapperMembers/CallableWrapperType.cs

@@ -4,7 +4,7 @@
 
 namespace Java.Interop.Tools.JavaCallableWrappers.CallableWrapperMembers;
 
-class CallableWrapperTypeAnnotation
+public class CallableWrapperTypeAnnotation
 {
 	public string Name { get; set; }
 	public List<KeyValuePair<string, string>> Properties { get; } = new ();

src/Java.Interop.Tools.JavaCallableWrappers/CallableWrapperMembers/CallableWrapperTypeAnnotation.cs

@@ -4,7 +4,7 @@
 
 namespace Java.Interop.Tools.JavaCallableWrappers;
 
-class CallableWrapperWriterOptions
+public class CallableWrapperWriterOptions
 {
 	public JavaPeerStyle CodeGenerationTarget { get; set; }
 }