[Java.Interop.Tools.JavaTypeSystem] Add 'annotated-visibility' for types.

Author: jpobst

src/Java.Interop.Tools.JavaTypeSystem/Adapters/JavaXmlApiExporter.cs

@@ -58,15 +58,15 @@ public static void Save (JavaTypeCollection types, XmlWriter writer)
 		static void SaveType (JavaTypeModel type, XmlWriter writer)
 		{
 			if (type is JavaClassModel cls)
-				SaveType (type, writer, "class", XmlConvert.ToString (cls.IsAbstract), cls.BaseType, cls.BaseTypeGeneric, cls.BaseTypeJni);
+				SaveType (type, writer, "class", XmlConvert.ToString (cls.IsAbstract), cls.BaseType, cls.BaseTypeGeneric, cls.BaseTypeJni, cls.AnnotatedVisibility);
 			else
-				SaveType (type, writer, "interface", "true", null, null, null);
+				SaveType (type, writer, "interface", "true", null, null, null, type.AnnotatedVisibility);
 
 			foreach (var nested in type.NestedTypes)
 				SaveType (nested, writer);
 		}
 
-		static void SaveType (JavaTypeModel cls, XmlWriter writer, string elementName, string abs, string? ext, string? extgen, string? jniExt)
+		static void SaveType (JavaTypeModel cls, XmlWriter writer, string elementName, string abs, string? ext, string? extgen, string? jniExt, string annotatedVisibility)
 		{
 			writer.WriteStartElement (elementName);
 
@@ -80,6 +80,7 @@ static void SaveType (JavaTypeModel cls, XmlWriter writer, string elementName, s
 			writer.WriteAttributeString ("static", XmlConvert.ToString (cls.IsStatic));
 			writer.WriteAttributeString ("visibility", cls.Visibility);
 			writer.WriteAttributeStringIfValue ("jni-signature", cls.ExtendedJniSignature);
+			writer.WriteAttributeStringIfValue ("annotated-visibility", annotatedVisibility);
 
 			if (cls.PropertyBag.TryGetValue ("merge.SourceFile", out var source))
 				writer.WriteAttributeString ("merge.SourceFile", source);

src/Java.Interop.Tools.JavaTypeSystem/Adapters/JavaXmlApiImporter.cs

@@ -113,7 +113,8 @@ public static JavaClassModel ParseClass (JavaPackage package, XElement element)
 				javaDeprecated: element.XGetAttribute ("deprecated"),
 				javaStatic: element.XGetAttributeAsBool ("static"),
 				jniSignature: element.XGetAttribute ("jni-signature"),
-				baseTypeJni: element.XGetAttribute ("jni-extends")
+				baseTypeJni: element.XGetAttribute ("jni-extends"),
+				annotatedVisibility: element.XGetAttribute ("annotated-visibility")
 			);
 
 			if (element.XGetAttribute ("merge.SourceFile") is string source && source.HasValue ())
@@ -151,8 +152,9 @@ public static JavaInterfaceModel ParseInterface (JavaPackage package, XElement e
 			var deprecated = element.XGetAttribute ("deprecated");
 			var is_static = element.XGetAttribute ("static") == "true";
 			var jni_signature = element.XGetAttribute ("jni-signature");
+			var annotated_visibility = element.XGetAttribute ("annotated-visibility");
 
-			var model = new JavaInterfaceModel (package, nested_name, visibility, deprecated, is_static, jni_signature);
+			var model = new JavaInterfaceModel (package, nested_name, visibility, deprecated, is_static, jni_signature, annotated_visibility);
 
 			if (element.XGetAttribute ("merge.SourceFile") is string source && source.HasValue ())
 				model.PropertyBag.Add ("merge.SourceFile", source);

src/Java.Interop.Tools.JavaTypeSystem/Adapters/ManagedApiImporter.cs

@@ -114,7 +114,8 @@ static bool ShouldImport (TypeDefinition td)
 				javaDeprecated: obs_attr != null ? "deprecated" : "not-deprecated",
 				javaStatic: false,
 				jniSignature: FormatJniSignature (package, nested_name),
-				baseTypeJni: base_jni.HasValue () ? $"L{base_jni};" : string.Empty
+				baseTypeJni: base_jni.HasValue () ? $"L{base_jni};" : string.Empty,
+				annotatedVisibility: string.Empty
 			); ;
 
 			ParseImplementedInterfaces (type, model);
@@ -144,7 +145,8 @@ static bool ShouldImport (TypeDefinition td)
 				javaVisibility: type.IsPublic || type.IsNestedPublic ? "public" : "protected internal",
 				javaDeprecated: obs_attr != null ? "deprecated" : "not-deprecated",
 				javaStatic: false,
-				jniSignature: FormatJniSignature (package, nested_name)
+				jniSignature: FormatJniSignature (package, nested_name),
+				annotatedVisibility: ""
 			);
 
 			ParseImplementedInterfaces (type, model);

src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaBuiltInType.cs

@@ -6,7 +6,7 @@ namespace Java.Interop.Tools.JavaTypeSystem.Models
 	// Represents a Java built-in type like 'int' or 'float'
 	public class JavaBuiltInType : JavaTypeModel
 	{
-		public JavaBuiltInType (string name) : base (new JavaPackage ("", "", null), name, "public", false, true, "not deprecated", false, "") { }
+		public JavaBuiltInType (string name) : base (new JavaPackage ("", "", null), name, "public", false, true, "not deprecated", false, "", "") { }
 
 		public override void Resolve (JavaTypeCollection types, ICollection<JavaUnresolvableModel> unresolvables)
 		{

src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaClassModel.cs

@@ -15,8 +15,8 @@ public class JavaClassModel : JavaTypeModel
 		public JavaTypeReference? BaseTypeReference { get; private set; }
 		public List<JavaConstructorModel> Constructors { get; } = new List<JavaConstructorModel> ();
 
-		public JavaClassModel (JavaPackage javaPackage, string javaNestedName, string javaVisibility, bool javaAbstract, bool javaFinal, string javaBaseType, string javaBaseTypeGeneric, string javaDeprecated, bool javaStatic, string jniSignature, string baseTypeJni) :
-			base (javaPackage, javaNestedName, javaVisibility, javaAbstract, javaFinal, javaDeprecated, javaStatic, jniSignature)
+		public JavaClassModel (JavaPackage javaPackage, string javaNestedName, string javaVisibility, bool javaAbstract, bool javaFinal, string javaBaseType, string javaBaseTypeGeneric, string javaDeprecated, bool javaStatic, string jniSignature, string baseTypeJni, string annotatedVisibility) :
+			base (javaPackage, javaNestedName, javaVisibility, javaAbstract, javaFinal, javaDeprecated, javaStatic, jniSignature, annotatedVisibility)
 		{
 			BaseType = javaBaseType;
 			BaseTypeGeneric = javaBaseTypeGeneric;

src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaInterfaceModel.cs

@@ -4,8 +4,8 @@ namespace Java.Interop.Tools.JavaTypeSystem.Models
 {
 	public class JavaInterfaceModel : JavaTypeModel
 	{
-		public JavaInterfaceModel (JavaPackage javaPackage, string javaNestedName, string javaVisibility, string javaDeprecated, bool javaStatic, string jniSignature) :
-			base (javaPackage, javaNestedName, javaVisibility, false, false, javaDeprecated, javaStatic, jniSignature)
+		public JavaInterfaceModel (JavaPackage javaPackage, string javaNestedName, string javaVisibility, string javaDeprecated, bool javaStatic, string jniSignature, string annotatedVisibility) :
+			base (javaPackage, javaNestedName, javaVisibility, false, false, javaDeprecated, javaStatic, jniSignature, annotatedVisibility)
 		{
 		}
 

src/Java.Interop.Tools.JavaTypeSystem/JavaModels/JavaTypeModel.cs

@@ -17,6 +17,7 @@ public abstract class JavaTypeModel : IJavaResolvable
 		public string NestedName { get; set; }
 
 		public string Visibility { get; }
+		public string AnnotatedVisibility { get; }
 		public bool IsAbstract { get; }
 		public bool IsFinal { get; }
 		public string Deprecated { get; }
@@ -36,12 +37,13 @@ public abstract class JavaTypeModel : IJavaResolvable
 
 		public Dictionary<string, string> PropertyBag { get; } = new Dictionary<string, string> ();
 
-		protected JavaTypeModel (JavaPackage javaPackage, string javaNestedName, string javaVisibility, bool javaAbstract, bool javaFinal, string deprecated, bool javaStatic, string jniSignature)
+		protected JavaTypeModel (JavaPackage javaPackage, string javaNestedName, string javaVisibility, bool javaAbstract, bool javaFinal, string deprecated, bool javaStatic, string jniSignature, string annotatedVisibility)
 		{
 			Package = javaPackage;
 			NestedName = javaNestedName.Replace ('$', '.');
 			Name = NestedName.LastSubset ('.');
 			Visibility = javaVisibility;
+			AnnotatedVisibility = annotatedVisibility;
 			IsAbstract = javaAbstract;
 			IsFinal = javaFinal;
 			Deprecated = deprecated;