Skip to content

[api-xml-adjuster] api-O.xml.in will have <typeParameters> in <constructor> #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2017
Merged

[api-xml-adjuster] api-O.xml.in will have <typeParameters> in <constructor> #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApi.XmlModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down Expand Up @@ -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 ()
{
Expand Down Expand Up @@ -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; }
}
Expand Down
6 changes: 3 additions & 3 deletions src/Xamarin.Android.Tools.ApiXmlAdjuster/JavaApiXmlLoaderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down