Each hierarchy element is passed a GeneratorContext instance

This makes it possible to put java-to-managed name translation in the name
translation provider, as previously intended, thus making the code
programming language-independent

Author: grendello

src/Java.Interop.Bindings/Compiler/GeneratorContext.cs

@@ -73,15 +73,14 @@ public GeneratorContext (FormattingCodeGenerator codeGenerator, Encoding fileEnc
 			CodeGenerator = codeGenerator ?? throw new ArgumentNullException (nameof (codeGenerator));
 			OutputPathProvider = new DefaultOutputPathProvider (this);
 			FileEncoding = fileEncoding ?? Encoding.UTF8;
-			HierarchyBuilder = new XamarinAndroidHierarchy ();
+			HierarchyBuilder = new XamarinAndroidHierarchy (this);
+			NameTranslationProvider = new XamarinNameTranslationProvider ();
 		}
 
 		internal void AssertSaneEnvironment ()
 		{
-			/*
 			if (NameTranslationProvider == null)
 				throw new InvalidOperationException ("Name translation provider not defined");
-				*/
 
 			if (OutputPathProvider == null)
 				throw new InvalidOperationException ("Output path provider not defined");

src/Java.Interop.Bindings/Compiler/Hierarchy.cs

@@ -51,6 +51,9 @@ public class Hierarchy : HierarchyBase
 		public IList<HierarchyNamespace> Namespaces => namespaces;
 		protected HierarchyIndex TypeIndex { get; } = new HierarchyIndex ();
 
+		public Hierarchy (GeneratorContext context) : base (context)
+		{}
+
 		public void Build (IList<ApiElement> rawElements)
 		{ 
 			if (rawElements == null || rawElements.Count == 0)
@@ -550,29 +553,29 @@ protected virtual void Process (ApiEnum apiEnum)
 			HierarchyBase ret = null;
 
 			if (type == typeof (HierarchyNamespace))
-				ret = new HierarchyNamespace (parent as Hierarchy);
+				ret = new HierarchyNamespace (Context, parent as Hierarchy);
 			else if (type == typeof (HierarchyClass))
-				ret = new HierarchyClass (parent as HierarchyNamespace);
+				ret = new HierarchyClass (Context, parent as HierarchyNamespace);
 			else if (type == typeof (HierarchyImplements))
-				ret = new HierarchyImplements (parent as HierarchyObject);
+				ret = new HierarchyImplements (Context, parent as HierarchyObject);
 			else if (type == typeof (HierarchyMethod))
-				ret = new HierarchyMethod (parent as HierarchyObject);
+				ret = new HierarchyMethod (Context, parent as HierarchyObject);
 			else if (type == typeof (HierarchyConstructor))
-				ret = new HierarchyConstructor (parent as HierarchyObject);
+				ret = new HierarchyConstructor (Context, parent as HierarchyObject);
 			else if (type == typeof (HierarchyException))
-				ret = new HierarchyException (parent as HierarchyMethod);
+				ret = new HierarchyException (Context, parent as HierarchyMethod);
 			else if (type == typeof (HierarchyTypeParameter))
-				ret = new HierarchyTypeParameter (parent as HierarchyElement);
+				ret = new HierarchyTypeParameter (Context, parent as HierarchyElement);
 			else if (type == typeof (HierarchyTypeParameterGenericConstraint))
-				ret = new HierarchyTypeParameterGenericConstraint (parent as HierarchyTypeParameter);
+				ret = new HierarchyTypeParameterGenericConstraint (Context, parent as HierarchyTypeParameter);
 			else if (type == typeof (HierarchyMethodParameter))
-				ret = new HierarchyMethodParameter (parent as HierarchyMethod);
+				ret = new HierarchyMethodParameter (Context, parent as HierarchyMethod);
 			else if (type == typeof (HierarchyField))
-				ret = new HierarchyField (parent as HierarchyObject);
+				ret = new HierarchyField (Context, parent as HierarchyObject);
 			else if (type == typeof (HierarchyInterface))
-				ret = new HierarchyInterface (parent as HierarchyNamespace);
+				ret = new HierarchyInterface (Context, parent as HierarchyNamespace);
 			else if (type == typeof (HierarchyEnum))
-				ret = new HierarchyEnum (parent as Hierarchy);
+				ret = new HierarchyEnum (Context, parent as Hierarchy);
 			else
 				throw new InvalidOperationException ($"Unsupported hierarchy element type {type}");
 

src/Java.Interop.Bindings/Compiler/HierarchyBase.cs

@@ -32,63 +32,23 @@ namespace Java.Interop.Bindings.Compiler
 {
 	public abstract class HierarchyBase
 	{
+		public GeneratorContext Context { get; }
+
 		// Intended for types that aren't in API.xml and yet are needed for other types to work, for instance
 		// the IJavaObject interface (which is defined in Xamarin.Android's runtime)
 		public bool IgnoreForCodeGeneration { get; set; }
 
 		// Whether the instance was created based on API description
 		public bool IsBoundAPI { get; protected set; }
 
-		// If a Java name has a dot in it, preserve the dots when converting to managed name
-		protected bool PreserveDotsInJavaNameTranslation { get; set; }
-
-		// This is a hack used by the old generator - it uppercases a symbol segment if it consists only of two
-		// characters
-		protected bool UpperCaseTwoLetterSegments { get; set; } = true;
-
-		public HierarchyBase ()
+		protected HierarchyBase (GeneratorContext context)
 		{
+			Context = context ?? throw new ArgumentNullException (nameof (context));
 		}
 
 		protected string JavaNameToManagedName (string javaName)
 		{
-			if (String.IsNullOrEmpty (javaName))
-				throw new ArgumentException ("must not be null or empty", nameof (javaName));
-
-			if (javaName.Length == 1)
-				return UpperFirst (javaName);
-
-			int dot = javaName.IndexOf ('.');
-			if (dot >= 0) {
-				var segments = new List <string> ();
-				foreach (string s in javaName.Split ('.')) {
-					if (UpperCaseTwoLetterSegments && s.Length == 2)
-						segments.Add (s.ToUpper ());
-					else
-						segments.Add (UpperFirst (s));
-				}
-				javaName = String.Join (PreserveDotsInJavaNameTranslation ? "." : String.Empty, segments);
-			} else if (javaName.Length == 2)
-				javaName = javaName.ToUpper ();
-
-			return EnsureValidIdentifier (UpperFirst (javaName));
-
-			string UpperFirst (string s)
-			{
-				char first = Char.ToUpper (s [0]);
-				if (s.Length > 1)
-					return $"{first}{s.Substring (1)}";
-				return first.ToString ();
-			}
-		}
-
-		protected virtual string EnsureValidIdentifier (string identifier)
-		{
-			if (String.IsNullOrEmpty (identifier))
-				throw new InvalidOperationException ($".NET identifier must not be null or empty");
-
-			// TODO: implement full validation (check for VALID characters)
-			return identifier;
+			return Context.NameTranslationProvider.Translate (javaName);
 		}
 
 		protected TApiElement EnsureApiElementType <TApiElement> (ApiElement apiElement) where TApiElement: ApiElement

src/Java.Interop.Bindings/Compiler/HierarchyClass.cs

@@ -40,7 +40,7 @@ public class HierarchyClass : HierarchyObject
 		public string ExtendsGenericAware { get; set; }
 		public bool Obfuscated { get; set; }
 
-		public HierarchyClass (HierarchyElement parent) : base (parent)
+		public HierarchyClass (GeneratorContext context, HierarchyElement parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyConstructor.cs

@@ -29,7 +29,7 @@ namespace Java.Interop.Bindings.Compiler
 {
 	public class HierarchyConstructor : HierarchyMethod
 	{
-		public HierarchyConstructor (HierarchyObject parent) : base (parent)
+		public HierarchyConstructor (GeneratorContext context, HierarchyObject parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyElement.cs

@@ -64,7 +64,7 @@ public abstract class HierarchyElement : HierarchyBase//, IEquatable <HierarchyE
 
 		public bool UseGlobal { get; set; } = false;
 
-		protected HierarchyElement (HierarchyBase parent) 
+		protected HierarchyElement (GeneratorContext context, HierarchyBase parent) : base (context)
 		{
 			Parent = parent ?? throw new ArgumentNullException (nameof (parent));
 			IsBoundAPI = false;
@@ -109,7 +109,7 @@ protected string GetManagedName ()
 		{
 			if (String.IsNullOrEmpty (ManagedName))
 				return JavaNameToManagedName (Name);
-			return EnsureValidIdentifier (ManagedName);
+			return Context.NameTranslationProvider.EnsureValidIdentifier (ManagedName);
 		}
 
 		protected void EnsureName ()

src/Java.Interop.Bindings/Compiler/HierarchyEnum.cs

@@ -35,7 +35,7 @@ public class HierarchyEnum : HierarchyObject
 
 		protected ApiEnum ApiEnum => apiEnum;
 
-		public HierarchyEnum (HierarchyBase parent) : base (parent)
+		public HierarchyEnum (GeneratorContext context, HierarchyBase parent) : base (context, parent)
 		{
 			DoNotAddBaseTypes = true;
 		}

src/Java.Interop.Bindings/Compiler/HierarchyException.cs

@@ -37,7 +37,7 @@ public class HierarchyException : HierarchyElement
 		public string Type { get; set; }
 		public string TypeGenericAware { get; set; }
 
-		public HierarchyException (HierarchyBase parent) : base (parent)
+		public HierarchyException (GeneratorContext context, HierarchyBase parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyExternalTypeReference.cs

@@ -31,7 +31,7 @@ public class HierarchyExternalTypeReference : HierarchyElement
 	{
 		public bool IsManaged { get; }
 
-		public HierarchyExternalTypeReference (HierarchyBase parent, string typeName, bool isManaged = false) : base (parent)
+		public HierarchyExternalTypeReference (GeneratorContext context, HierarchyBase parent, string typeName, bool isManaged = false) : base (context, parent)
 		{
 			if (String.IsNullOrEmpty (nameof (typeName)))
 				throw new ArgumentException ("must not be null or empty", nameof (typeName));

src/Java.Interop.Bindings/Compiler/HierarchyField.cs

@@ -45,7 +45,7 @@ public class HierarchyField : HierarchyTypeMember
 		public string Value { get; set; }
 		public bool Volatile { get; set; }
 
-		public HierarchyField (HierarchyObject parent) : base (parent)
+		public HierarchyField (GeneratorContext context, HierarchyObject parent) : base (context, parent)
 		{ }
 
 		public override void Init (ApiElement apiElement)

src/Java.Interop.Bindings/Compiler/HierarchyImplements.cs

@@ -36,7 +36,7 @@ public class HierarchyImplements : HierarchyElement
 		protected ApiImplements ApiImplements => apiImplements;
 		public string JniType { get; set; }
 
-		public HierarchyImplements (HierarchyBase parent) : base (parent)
+		public HierarchyImplements (GeneratorContext context, HierarchyBase parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyInterface.cs

@@ -32,7 +32,7 @@ public class HierarchyInterface : HierarchyObject
 		public HierarchyInterfaceInvoker Invoker { get; set; }
 		public bool InvokerNotNeeded { get; set; }
 
-		public HierarchyInterface (HierarchyElement parent) : base (parent)
+		public HierarchyInterface (GeneratorContext context, HierarchyElement parent) : base (context, parent)
 		{}
 	}
 }

src/Java.Interop.Bindings/Compiler/HierarchyInterfaceInvoker.cs

@@ -34,7 +34,7 @@ public class HierarchyInterfaceInvoker : HierarchyClass
 	{
 		HierarchyInterface InvokedInterface { get; }
 
-		public HierarchyInterfaceInvoker (HierarchyElement parent, HierarchyInterface invokedInterface) : base (parent)
+		public HierarchyInterfaceInvoker (GeneratorContext context, HierarchyElement parent, HierarchyInterface invokedInterface) : base (context, parent)
 		{
 			InvokedInterface = invokedInterface ?? throw new ArgumentNullException (nameof (invokedInterface));
 		}

src/Java.Interop.Bindings/Compiler/HierarchyMethod.cs

@@ -50,7 +50,7 @@ public class HierarchyMethod : HierarchyTypeMember
 		public bool IsBridge { get; set; }
 		public bool IsSynthetic { get; set; }
 
-		public HierarchyMethod (HierarchyObject parent) : base (parent)
+		public HierarchyMethod (GeneratorContext context, HierarchyObject parent) : base (context, parent)
 		{ }
 
 		public override void Init (ApiElement apiElement)

src/Java.Interop.Bindings/Compiler/HierarchyMethodParameter.cs

@@ -36,7 +36,7 @@ public class HierarchyMethodParameter : HierarchyElement
 		protected ApiMethodParameter ApiMethodParameter => apiMethodParameter;
 		public string JniType { get; set; }
 
-		public HierarchyMethodParameter (HierarchyBase parent) : base (parent)
+		public HierarchyMethodParameter (GeneratorContext context, HierarchyBase parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyNamespace.cs

@@ -36,9 +36,9 @@ public class HierarchyNamespace : HierarchyElement
 		protected ApiNameSpace ApiNameSpace => apiNameSpace;
 		public string JniName { get; set; }
 
-		public HierarchyNamespace (Hierarchy parent) : base (parent)
+		public HierarchyNamespace (GeneratorContext context, Hierarchy parent) : base (context, parent)
 		{
-			PreserveDotsInJavaNameTranslation = true;
+			Context.NameTranslationProvider.PreserveDotsInJavaNameTranslation = true;
 		}
 
 		public override void Init (ApiElement apiElement)

src/Java.Interop.Bindings/Compiler/HierarchyObject.cs

@@ -47,7 +47,7 @@ public abstract class HierarchyObject : HierarchyElement
 
 		public IList<HierarchyObject> BaseTypes => baseTypes;
 
-		protected HierarchyObject (HierarchyBase parent) : base (parent)
+		protected HierarchyObject (GeneratorContext context, HierarchyBase parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyType.cs

@@ -33,7 +33,7 @@ public class HierarchyType : HierarchyBase
 		public string ManagedName { get; internal set; }
 		public HierarchyTypeKind Kind { get; }
 
-		public HierarchyType (string name, HierarchyTypeKind kind)
+		public HierarchyType (GeneratorContext context, string name, HierarchyTypeKind kind) : base (context)
 		{
 			if (String.IsNullOrEmpty (name))
 				throw new ArgumentException ("must not be null or empty", nameof (name));

src/Java.Interop.Bindings/Compiler/HierarchyTypeMember.cs

@@ -38,7 +38,7 @@ public abstract class HierarchyTypeMember : HierarchyElement
 		public bool Static { get; set; }
 		public ApiVisibility Visibility { get; set; }
 
-		public HierarchyTypeMember (HierarchyObject parent) : base (parent)
+		public HierarchyTypeMember (GeneratorContext context, HierarchyObject parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyTypeParameter.cs

@@ -42,7 +42,7 @@ public class HierarchyTypeParameter : HierarchyElement
 		// public string InterfaceBounds { get; set; }
 		// public string JniInterfaceBounds { get; set; }
 
-		public HierarchyTypeParameter (HierarchyBase parent) : base (parent)
+		public HierarchyTypeParameter (GeneratorContext context, HierarchyBase parent) : base (context, parent)
 		{
 		}
 

src/Java.Interop.Bindings/Compiler/HierarchyTypeParameterGenericConstraint.cs

@@ -37,7 +37,7 @@ public class HierarchyTypeParameterGenericConstraint : HierarchyElement
 
 		public string Type { get; set; }
 
-		public HierarchyTypeParameterGenericConstraint (HierarchyBase parent) : base (parent)
+		public HierarchyTypeParameterGenericConstraint (GeneratorContext context, HierarchyBase parent) : base (context, parent)
 		{}
 
 		public override void Init (ApiElement apiElement)

src/Java.Interop.Bindings/Compiler/NameTranslationProvider.cs

@@ -1,5 +1,5 @@
 //
-// NameTranslator.cs
+// NameTranslationProvider.cs
 //
 // Author:
 //       Marek Habersack <[email protected]>
@@ -32,6 +32,9 @@ public abstract class NameTranslationProvider
 		public string Name { get; }
 		public Guid ID { get; }
 
+		// If a Java name has a dot in it, preserve the dots when converting to managed name
+		public bool PreserveDotsInJavaNameTranslation { get; set; }
+
 		protected NameTranslationProvider (string name, Guid id)
 		{
 			if (String.IsNullOrEmpty (name))
@@ -43,6 +46,24 @@ protected NameTranslationProvider (string name, Guid id)
 			ID = id;
 		}
 
+		public virtual string EnsureValidIdentifier (string identifier)
+		{
+			if (String.IsNullOrEmpty (identifier))
+				throw new InvalidOperationException ($".NET identifier must not be null or empty");
+
+			// TODO: implement full validation (check for VALID characters)
+			return identifier;
+		}
+
+		protected string UpperFirst (string s)
+		{
+			char first = Char.ToUpper (s [0]);
+			if (s.Length > 1)
+				return $"{first}{s.Substring (1)}";
+			return first.ToString ();
+		}
+
+		protected abstract string TranslateSegment (string segment);
 		public abstract string Translate (string javaName);
 	}
 }