From b52fa0043005ab1419e1d4972b35776201f16abb Mon Sep 17 00:00:00 2001
From: Atsushi Eno <atsushieno@gmail.com>
Date: Thu, 23 Mar 2017 02:43:46 +0900
Subject: [PATCH] [api-xml-adjuster] api-O.xml.in will have <typeParameters> in
 <constructor>.

It is because some types have Class<T> as some arguments to the contructor
and to resolve that T the API describes it.
---
 .../JavaApi.XmlModel.cs                                   | 8 ++++----
 .../JavaApiXmlLoaderExtensions.cs                         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs
index c6fc86961..3f838518a 100644
--- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs
+++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs
@@ -198,6 +198,7 @@ protected JavaMethodBase (JavaType parent)
 
 		public IList<JavaParameter> Parameters { get; set; }
 		public IList<JavaException> Exceptions { get; set; }
+		public JavaTypeParameters TypeParameters { get; set; }
 		
 		public bool ExtendedBridge { get; set; }
 		public string ExtendedJniReturn { get; set; }
@@ -246,8 +247,7 @@ public JavaMethod (JavaType parent)
 		public bool Native { get; set; }
 		public string Return { get; set; }
 		public bool Synchronized { get; set; }
-		public JavaTypeParameters TypeParameters { get; set; }
-		
+
 		// Content of this value is not stable.
 		public override string ToString ()
 		{
@@ -287,14 +287,14 @@ public JavaTypeParameters (JavaType parent)
 			TypeParameters = new List<JavaTypeParameter> ();
 		}
 		
-		public JavaTypeParameters (JavaMethod parent)
+		public JavaTypeParameters (JavaMethodBase parent)
 		{
 			ParentMethod = parent;
 			TypeParameters = new List<JavaTypeParameter> ();
 		}
 		
 		public JavaType ParentType { get; set; }
-		public JavaMethod ParentMethod { get; set; }
+		public JavaMethodBase ParentMethod { get; set; }
 		
 		public IList<JavaTypeParameter> TypeParameters { get; set; }
 	}
diff --git a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
index 69d78b4e0..60dc9c11a 100644
--- a/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
+++ b/src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
@@ -237,10 +237,10 @@ static void LoadMethodBase (this JavaMethodBase methodBase, string elementName,
 						break;
 					if (reader.NodeType != XmlNodeType.Element)
 						throw XmlUtil.UnexpectedElementOrContent (elementName, reader, "parameter");
-					if (method != null && reader.LocalName == "typeParameters") {
-						var tp = new JavaTypeParameters (method);
+					if (reader.LocalName == "typeParameters") {
+						var tp = new JavaTypeParameters (methodBase);
 						tp.Load (reader);
-						method.TypeParameters = tp;
+						methodBase.TypeParameters = tp;
 					} else if (reader.LocalName == "parameter") {
 						var p = new JavaParameter (methodBase);
 						p.Load (reader);