Project refactoring: now TypeNameMappings on desktop is gone. #184
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,25 +10,33 @@ | |
| using Mono.Cecil; | ||
| using Java.Interop.Tools.Cecil; | ||
| using Android.Runtime; | ||
| using Java.Interop.Tools.JavaCallableWrappers; | ||
| #endif // HAVE_CECIL | ||
|
|
||
| namespace Java.Interop.Tools.TypeNameMappings | ||
| { | ||
|
|
||
| #if HAVE_CECIL | ||
| public | ||
| #endif | ||
| enum PackageNamingPolicy { | ||
| LowercaseHash, | ||
| Lowercase, | ||
| LowercaseWithAssemblyName, | ||
| } | ||
|
|
||
| #if HAVE_CECIL | ||
| public | ||
| #endif | ||
| class JniTypeName | ||
| { | ||
| public string Type { get; internal set; } | ||
| public bool IsKeyword { get; internal set; } | ||
| } | ||
|
|
||
| #if HAVE_CECIL | ||
| public | ||
| #endif | ||
| static class JavaNativeTypeManager { | ||
|
|
||
| public static PackageNamingPolicy PackageNamingPolicy { get; set; } | ||
|
|
@@ -143,7 +151,7 @@ public static string ToJniName (Type type) | |
| "java/lang/Object"; | ||
| } | ||
|
|
||
| static string ToJniName (Type type, ExportParameterKind exportKind) | ||
|
There was a problem hiding this comment.
There was a problem hiding this comment. This is what JNIEnv.GetJniName() does: It only references GetJniName(Type), not GetJniName(Type,ExportParameterKind). |
||
| { | ||
| if (type == null) | ||
| throw new ArgumentNullException ("type"); | ||
|
|
@@ -159,12 +167,8 @@ public static string ToJniName (Type type, ExportParameterKind exportKind) | |
| return GetSpecialExportJniType (type.FullName, exportKind); | ||
|
|
||
| return ToJniName (type, t => t.DeclaringType, t => t.Name, GetPackageName, t => { | ||
| return ToJniNameFromAttributes (t); | ||
| }, _ => false); | ||
| } | ||
|
|
||
| public static string ToJniName (string jniType, int rank) | ||
|
|
@@ -255,7 +259,6 @@ static string GetSpecialExportJniType (string typeName, ExportParameterKind expo | |
| return null; | ||
| } | ||
|
|
||
| // Keep in sync with ToJniNameFromAttributes(TypeDefinition) | ||
| public static string ToJniNameFromAttributes (Type type) | ||
| { | ||
|
|
@@ -347,7 +350,7 @@ static string GetJniTypeName<TR,TD> (TR typeRef, ExportParameterKind exportKind, | |
| return rank == 0 && pJniName.Length > 1 ? "L" + pJniName + ";" : ToJniName (pJniName, rank); | ||
| } | ||
|
|
||
| static ExportParameterKind GetExportKind (System.Reflection.ICustomAttributeProvider p) | ||
| { | ||
| foreach (ExportParameterAttribute a in p.GetCustomAttributes (typeof (ExportParameterAttribute), false)) | ||
| return a.Kind; | ||
|
|
@@ -370,7 +373,7 @@ public static string GetJniTypeName (Type typeRef) | |
| return GetJniTypeName (typeRef, ExportParameterKind.Unspecified); | ||
| } | ||
|
|
||
| internal static string GetJniTypeName (Type typeRef, ExportParameterKind exportKind) | ||
| { | ||
| return GetJniTypeName<Type,Type> (typeRef, exportKind, t => t, t => { | ||
| Type etype; | ||
|
|
@@ -385,7 +388,6 @@ static string ToJniNameWhichShouldReplaceExistingToJniName (Type type, ExportPar | |
| var ret = ToJniNameFromAttributes (type); | ||
| return ret ?? ToJniName (type, exportKind); | ||
| } | ||
|
|
||
| #if HAVE_CECIL | ||
|
|
||
|
|
@@ -401,12 +403,12 @@ internal static ExportParameterAttribute ToExportParameterAttribute (CustomAttri | |
| return new ExportParameterAttribute ((ExportParameterKind)attr.ConstructorArguments [0].Value); | ||
| } | ||
|
|
||
| public static bool IsApplication (TypeDefinition type) | ||
| { | ||
| return type.GetBaseTypes ().Any (b => b.FullName == "Android.App.Application"); | ||
| } | ||
|
|
||
| public static bool IsInstrumentation (TypeDefinition type) | ||
| { | ||
| return type.GetBaseTypes ().Any (b => b.FullName == "Android.App.Instrumentation"); | ||
| } | ||
|
|
@@ -430,7 +432,7 @@ public static string GetJniTypeName (TypeReference typeRef) | |
| return GetJniTypeName (typeRef, ExportParameterKind.Unspecified); | ||
| } | ||
|
|
||
| internal static string GetJniTypeName (TypeReference typeRef, ExportParameterKind exportKind) | ||
| { | ||
| return GetJniTypeName<TypeReference, TypeDefinition> (typeRef, exportKind, t => t.Resolve (), t => { | ||
| TypeReference etype; | ||
|
|
@@ -441,7 +443,7 @@ public static string GetJniTypeName (TypeReference typeRef, ExportParameterKind | |
|
|
||
| public static string ToCompatJniName (Mono.Cecil.TypeDefinition type) | ||
| { | ||
| return ToJniName (type, t => t.DeclaringType, t => t.Name, ToCompatPackageName, ToJniNameFromAttributes, t => IsNonStaticInnerClass (t as TypeDefinition)); | ||
| } | ||
|
|
||
| static string ToCompatPackageName (Mono.Cecil.TypeDefinition type) | ||
|
|
@@ -456,7 +458,7 @@ public static string ToJniName (Mono.Cecil.TypeDefinition type) | |
| "java/lang/Object"; | ||
| } | ||
|
|
||
| static string ToJniName (TypeDefinition type, ExportParameterKind exportKind) | ||
| { | ||
| if (type == null) | ||
| throw new ArgumentNullException ("type"); | ||
|
|
@@ -471,7 +473,7 @@ public static string ToJniName (TypeDefinition type, ExportParameterKind exportK | |
| return GetSpecialExportJniType (type.FullName, exportKind); | ||
| } | ||
|
|
||
| return ToJniName (type, t => t.DeclaringType, t => t.Name, GetPackageName, ToJniNameFromAttributes, t => IsNonStaticInnerClass (t as TypeDefinition)); | ||
| } | ||
|
|
||
| static string ToJniNameFromAttributes (TypeDefinition type) | ||
|
|
@@ -562,7 +564,7 @@ public static string GetPackageName (TypeDefinition type) | |
| } | ||
| #endif | ||
|
|
||
| static string ToJniName<T> (T type, Func<T, T> decl, Func<T, string> name, Func<T, string> ns, Func<T, string> overrideName, Func<T,bool> shouldUpdateName) | ||
| where T : class | ||
| { | ||
| var nameParts = new List<string> (); | ||
|
|
@@ -576,12 +578,9 @@ static string ToJniName<T> (T type, Func<T, T> decl, Func<T, string> name, Func< | |
| break; | ||
| } | ||
| var n = name (declType).Replace ('`', '_'); | ||
| if (shouldUpdateName (declType)) { | ||
| n = "$" + name (decl (declType)) + "_" + n; | ||
| } | ||
| nameParts.Add (n); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer to not make this
publicuntil we've turned it into an "instance" class instead of astaticclass. Could that be done first/as part of this PR?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally speaking "no", because the type is in Java.Interop.JavaCallableWrappers.dll and if that is public then the consumers (Xamarin.Android.Build.Tasks.dll, Xamarin.Android.JavadocImporter.dll, etc.) has no access to the this class.
It is NOT public in the mobile profile which is reasonable enough.