Skip to content

Commit 4218831

Browse files
jpobstjpobst
committed
Various fixes.
1 parent 758b0df commit 4218831

File tree

12 files changed

+13
-21
lines changed

12 files changed

+13
-21
lines changed

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/Common/WriteInterfaceProperties.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ int Count {
55
[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
66
}
77

8-
java.lang.String Key {
8+
string Key {
99
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
1010
[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
1111
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterface.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
3939
[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
4040
}
4141

42-
java.lang.String Key {
42+
string Key {
4343
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
4444
[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
4545
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/JavaInterop1/WriteInterfaceDeclaration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
99
[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
1010
}
1111

12-
java.lang.String Key {
12+
string Key {
1313
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
1414
[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
1515
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterface.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
3939
[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
4040
}
4141

42-
java.lang.String Key {
42+
string Key {
4343
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
4444
[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
4545
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XAJavaInterop1/WriteInterfaceDeclaration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public partial interface IMyInterface : IJavaObject, IJavaPeerable {
99
[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
1010
}
1111

12-
java.lang.String Key {
12+
string Key {
1313
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
1414
[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
1515
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterface.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public partial interface IMyInterface : IJavaObject {
4141
[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
4242
}
4343

44-
java.lang.String Key {
44+
string Key {
4545
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
4646
[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
4747
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

‎tests/generator-Tests/Unit-Tests/CodeGeneratorExpectedResults/XamarinAndroid/WriteInterfaceDeclaration.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public partial interface IMyInterface : IJavaObject {
99
[Register ("set_Count", "(I)V", "Getset_Count_IHandler:java.code.IMyInterfaceInvoker, ")] set;
1010
}
1111

12-
java.lang.String Key {
12+
string Key {
1313
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='get_Key' and count(parameter)=0]"
1414
[Register ("get_Key", "()Ljava/lang/String;", "Getget_KeyHandler:java.code.IMyInterfaceInvoker, ")] get;
1515
// Metadata.xml XPath method reference: path="/api/package[@name='java.code']/interface[@name='IMyInterface']/method[@name='set_Key' and count(parameter)=1 and parameter[1][@type='java.lang.String']]"

‎tools/generator/Java.Interop.Tools.Generator.CodeGeneration/CodeGenerator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -835,7 +835,7 @@ public void WriteInterfaceInvoker (InterfaceGen @interface, string indent)
835835
writer.WriteLine ("{0}internal partial class {1}Invoker : global::Java.Lang.Object, {1} {{", indent, @interface.Name);
836836
writer.WriteLine ();
837837
WriteInterfaceInvokerHandle (@interface, indent + "\t", @interface.Name + "Invoker");
838-
writer.WriteLine ("{0}\t{1}IntPtr class_ref;", indent, opt.BuildingCoreAssembly ? "" : "");
838+
writer.WriteLine ("{0}\t{1}IntPtr class_ref;", indent, opt.BuildingCoreAssembly ? "new " : "");
839839
writer.WriteLine ();
840840
writer.WriteLine ("{0}\tpublic static {1}{2} GetObject (IntPtr handle, JniHandleOwnership transfer)", indent, @interface.Name, opt.NullableOperator);
841841
writer.WriteLine ("{0}\t{{", indent);
@@ -1352,7 +1352,7 @@ public void WriteMethodExtensionOverload (Method method, string indent, string s
13521352
if (!method.CanHaveStringOverload)
13531353
return;
13541354

1355-
string ret = opt.GetTypeReferenceName (method.RetVal).Replace ("Java.Lang.ICharSequence", "string");
1355+
string ret = opt.GetTypeReferenceName (method.RetVal).Replace ("global::Java.Lang.ICharSequence", "string");
13561356
writer.WriteLine ();
13571357

13581358
var parameters = method.GetSignature (opt).Replace ("Java.Lang.ICharSequence", "string").Replace ("global::string", "string");

‎tools/generator/Java.Interop.Tools.Generator.ObjectModel/ClassGen.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ public override string FromNative (CodeGenerationOptions opt, string varname, bo
130130
public override void Generate (CodeGenerationOptions opt, GenerationInfo gen_info)
131131
{
132132
using (var sw = gen_info.OpenStream (opt.GetFileName (FullName))) {
133-
sw.WriteLine ("#nullable enable");
134-
sw.WriteLine ();
135133
sw.WriteLine ("using System;");
136134
sw.WriteLine ("using System.Collections.Generic;");
137135
sw.WriteLine ("using Android.Runtime;");
@@ -178,8 +176,6 @@ public static void GenerateTypeRegistrations (CodeGenerationOptions opt, Generat
178176
v.Add (new KeyValuePair<string, string> (reg.Key, reg.Value));
179177
}
180178

181-
sw.WriteLine ("#nullable enable");
182-
sw.WriteLine ();
183179
sw.WriteLine ("using System;");
184180
sw.WriteLine ("using System.Collections.Generic;");
185181
sw.WriteLine ("using Android.Runtime;");

‎tools/generator/Java.Interop.Tools.Generator.ObjectModel/GenBase.cs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,6 @@ protected void GenerateAnnotationAttribute (CodeGenerationOptions opt, Generatio
353353
var localFullName = Namespace + (Namespace.Length > 0 ? "." : string.Empty) + attrClassNameBase;
354354

355355
using (var sw = gen_info.OpenStream (opt.GetFileName (localFullName))) {
356-
sw.WriteLine ("#nullable enable");
357-
sw.WriteLine ();
358356
sw.WriteLine ("using System;");
359357
sw.WriteLine ();
360358
sw.WriteLine ("namespace {0} {{", Namespace);
@@ -711,13 +709,13 @@ public string [] PreCallback (CodeGenerationOptions opt, string var_name, bool o
711709
var rgm = this as IRequireGenericMarshal;
712710

713711
return new string []{
714-
string.Format ("{0} {1} = global::Java.Lang.Object.GetObject<{4}> ({2}, {3});",
712+
string.Format ("{0} {1} = {5}global::Java.Lang.Object.GetObject<{4}> ({2}, {3});",
715713
"var",
716714
opt.GetSafeIdentifier (var_name),
717715
opt.GetSafeIdentifier (TypeNameUtilities.GetNativeName (var_name)),
718716
owned ? "JniHandleOwnership.TransferLocalRef" : "JniHandleOwnership.DoNotTransfer",
719-
opt.GetOutputName (rgm != null ? (rgm.GetGenericJavaObjectTypeOverride () ?? FullName) : FullName))//,
720-
//rgm != null ? "(" + opt.GetOutputName (FullName) + ")" : string.Empty)
717+
opt.GetOutputName (rgm != null ? (rgm.GetGenericJavaObjectTypeOverride () ?? FullName) : FullName),
718+
rgm != null ? "(" + opt.GetOutputName (FullName) + ")" : string.Empty)
721719
};
722720
}
723721

0 commit comments

Comments
 (0)