[Java.Interop] Rename IJavaObject to IJavaPeerable

Fixes: #21

Xamarin.Android has an Android.Runtime.IJavaObject interface type.
While Java.Interop.IJavaObject is in a different namespace, having
identical type names still means you'd need to fully qualify or use a
`using-alias`, which is annoying.

Rename IJavaObject to IJavaPeerable, which is also somewhat in keeping
with commit 25de1f3 which renamed IJavaObject.SafeHandle to
IJavaObject.PeerReference. Now, the property is
IJavaPeerable.PeerReference, further emphasizing the nature of what
the interface represents: a wrapper of a Java-side "peer" instance.

Related (for terminology):

	http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/

Modified to be consistent with this commit/name change:

> **Peer objects**: types which implement IJavaPeerable, e.g. all
> JavaObject and JavaException subclasses. Instances of these types
> have two "halfs" a managed peer and a native peer. The managed peer
> is an instance of the C# class. The native peer is an instance of a
> Java class within JVM, and the C# IJavaPeerable.PeerReference
> property contains a JNI object reference to the native peer.

Author: jonpryor

src/Android.Interop/Java.Interop/AndroidVM.cs

@@ -44,7 +44,7 @@ internal AndroidVM (AndroidVMBuilder builder)
 			get {return current;}
 		}
 
-		protected override bool TryGC (IJavaObject value, ref JniObjectReference handle)
+		protected override bool TryGC (IJavaPeerable value, ref JniObjectReference handle)
 		{
 			if (!handle.IsValid)
 				return true;

src/Java.Interop.Dynamic/Java.Interop.Dynamic/DynamicJavaClass.cs

@@ -97,7 +97,7 @@ protected override bool HasSelf {
 
 			protected override Expression GetSelf ()
 			{
-				return Expression.Constant (null, typeof (IJavaObject));
+				return Expression.Constant (null, typeof (IJavaPeerable));
 			}
 
 			public override DynamicMetaObject BindInvoke (InvokeBinder binder, DynamicMetaObject[] args)
@@ -124,7 +124,7 @@ public override DynamicMetaObject BindInvoke (InvokeBinder binder, DynamicMetaOb
 						new[]{value},
 						Expression.Condition (
 							test:       Expression.Call (Expression.Constant (klass.info), invoke.Method,
-								Expression.Constant (null, typeof (IJavaObject)), Expression.Constant (applicable), Expression.Constant (args), value),
+								Expression.Constant (null, typeof (IJavaPeerable)), Expression.Constant (applicable), Expression.Constant (args), value),
 							ifTrue:     value,
 							ifFalse:    fallback.Expression)
 				);
@@ -148,8 +148,8 @@ static JavaModifiers ()
 	struct JniArgumentMarshalInfo {
 		JValue                          jvalue;
 		JniObjectReference              lref;
-		IJavaObject                     obj;
-		Action<IJavaObject, object>     cleanup;
+		IJavaPeerable                   obj;
+		Action<IJavaPeerable, object>   cleanup;
 
 		internal JniArgumentMarshalInfo (object value, Type valueType)
 		{

src/Java.Interop.Dynamic/Java.Interop.Dynamic/DynamicJavaInstance.cs

@@ -18,7 +18,7 @@ public class DynamicJavaInstance : IDynamicMetaObjectProvider, IDisposable {
 
 		JavaClassInfo   klass;
 
-		public DynamicJavaInstance (IJavaObject value)
+		public DynamicJavaInstance (IJavaPeerable value)
 		{
 			if (value == null)
 				throw new ArgumentNullException ("value");
@@ -31,7 +31,7 @@ public DynamicJavaInstance (IJavaObject value)
 
 		bool    disposed;
 
-		public  IJavaObject     Value       {get; private set;}
+		public  IJavaPeerable   Value       {get; private set;}
 
 		public void Dispose ()
 		{
@@ -45,7 +45,7 @@ protected virtual void Dispose (bool disposing)
 				return;
 
 			if (disposing) {
-				var java    = Value as IJavaObject;
+				var java    = Value as IJavaPeerable;
 				if (java != null) {
 					java.DisposeUnlessRegistered ();
 				}
@@ -85,12 +85,12 @@ protected override JniObjectReference   ConversionTarget {
 			}
 
 			protected override bool HasSelf {
-				get {return (instance.Value as IJavaObject) != null;}
+				get {return (instance.Value as IJavaPeerable) != null;}
 			}
 
 			protected override Expression GetSelf ()
 			{
-				return Expression.Constant (instance.Value as IJavaObject, typeof (IJavaObject));
+				return Expression.Constant (instance.Value as IJavaPeerable, typeof (IJavaPeerable));
 			}
 		}
 	}

src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaClassInfo.cs

@@ -288,7 +288,7 @@ static bool IsStatic (JniObjectReference member)
 			return (s & JavaModifiers.Static) == JavaModifiers.Static;
 		}
 
-		internal unsafe bool TryInvokeMember (IJavaObject self, JavaMethodBase[] overloads, DynamicMetaObject[] args, out object value)
+		internal unsafe bool TryInvokeMember (IJavaPeerable self, JavaMethodBase[] overloads, DynamicMetaObject[] args, out object value)
 		{
 			value       = null;
 			var margs   = (List<JniArgumentMarshalInfo>) null;

src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaConstructorInfo.cs

@@ -38,7 +38,7 @@ protected override string JniReturnType {
 			get {return "V";}
 		}
 
-		public override unsafe object Invoke (IJavaObject self, JValue* arguments)
+		public override unsafe object Invoke (IJavaPeerable self, JValue* arguments)
 		{
 			if (self == null) {
 				var h   = members.InstanceMethods.StartCreateInstance (JniSignature, typeof (JavaInstanceProxy), arguments);

src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaFieldInfo.cs

@@ -40,7 +40,7 @@ public override string Name {
 			}
 		}
 
-		public object GetValue (IJavaObject self)
+		public object GetValue (IJavaPeerable self)
 		{
 			AssertSelf (self);
 
@@ -49,7 +49,7 @@ public object GetValue (IJavaObject self)
 			return GetInstanceValue (self);
 		}
 
-		void AssertSelf (IJavaObject self)
+		void AssertSelf (IJavaPeerable self)
 		{
 			if (IsStatic && self != null)
 				throw new ArgumentException (
@@ -82,7 +82,7 @@ object GetStaticValue ()
 			}
 		}
 
-		object GetInstanceValue (IJavaObject self)
+		object GetInstanceValue (IJavaPeerable self)
 		{
 			var n   = GetSignatureStartIndex ();
 			switch (JniSignature [n + 1]) {
@@ -112,7 +112,7 @@ int GetSignatureStartIndex ()
 			return n;
 		}
 
-		public void SetValue (IJavaObject self, object value)
+		public void SetValue (IJavaPeerable self, object value)
 		{
 			AssertSelf (self);
 
@@ -149,7 +149,7 @@ void SetStaticValue (object value)
 			}
 		}
 
-		void SetInstanceValue (IJavaObject self, object value)
+		void SetInstanceValue (IJavaPeerable self, object value)
 		{
 			var n   = GetSignatureStartIndex ();
 			switch (JniSignature [n + 1]) {

src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaMethodBase.cs

@@ -19,7 +19,7 @@ abstract class JavaMethodBase : JavaMemberInfo {
 
 		public      abstract    bool        IsConstructor   {get;}
 
-		public      abstract unsafe object  Invoke (IJavaObject self, JValue* arguments);
+		public      abstract unsafe object  Invoke (IJavaPeerable self, JValue* arguments);
 
 		protected   abstract    string      JniReturnType   {get;}
 

src/Java.Interop.Dynamic/Java.Interop.Dynamic/JavaMethodInfo.cs

@@ -58,7 +58,7 @@ protected override string JniReturnType {
 			}
 		}
 
-		public override unsafe object Invoke (IJavaObject self, JValue* arguments)
+		public override unsafe object Invoke (IJavaPeerable self, JValue* arguments)
 		{
 			AssertSelf (self);
 
@@ -67,7 +67,7 @@ public override unsafe object Invoke (IJavaObject self, JValue* arguments)
 			return InvokeInstanceMethod (self, arguments);
 		}
 
-		void AssertSelf (IJavaObject self)
+		void AssertSelf (IJavaPeerable self)
 		{
 			if (IsStatic && self != null)
 				throw new ArgumentException (
@@ -79,7 +79,7 @@ void AssertSelf (IJavaObject self)
 						"self");
 		}
 
-		unsafe object InvokeInstanceMethod (IJavaObject self, JValue* arguments)
+		unsafe object InvokeInstanceMethod (IJavaPeerable self, JValue* arguments)
 		{
 			var e   = GetSignatureReturnTypeStartIndex ();
 			switch (JniSignature [e + 1]) {

src/Java.Interop.Dynamic/Java.Interop.Dynamic/JniMetaObject.cs

@@ -17,7 +17,7 @@ namespace Java.Interop.Dynamic {
 
 	abstract class JniMetaObject : DynamicMetaObject
 	{
-		protected   delegate    bool    TryInvokeMember     (IJavaObject self, JavaMethodBase[] overloads, DynamicMetaObject[] args, out object value);
+		protected   delegate    bool    TryInvokeMember     (IJavaPeerable self, JavaMethodBase[] overloads, DynamicMetaObject[] args, out object value);
 
 		JavaClassInfo   info;
 
@@ -73,7 +73,7 @@ public override DynamicMetaObject BindGetMember (GetMemberBinder binder)
 
 			var field = overloads.FirstOrDefault (f => f.IsStatic == true);
 
-			Func<IJavaObject, object>   getValue    = field.GetValue;
+			Func<IJavaPeerable, object>   getValue  = field.GetValue;
 
 			var e = Expression.Call (Expression.Constant (field), getValue.Method, GetSelf ());
 			return new DynamicMetaObject (e, BindingRestrictions.GetInstanceRestriction (Expression, Value));
@@ -147,7 +147,7 @@ public override DynamicMetaObject BindSetMember (SetMemberBinder binder, Dynamic
 
 			var field   = overloads.FirstOrDefault (f => f.IsStatic == true);
 
-			Action<IJavaObject, object>  setValue    = field.SetValue;
+			Action<IJavaPeerable, object>  setValue  = field.SetValue;
 			var e = Expression.Block (
 					Expression.Call (Expression.Constant (field), setValue.Method,
 						GetSelf (), Expression.Convert (value.Expression, typeof (object))),

src/Java.Interop.Export/Java.Interop/ExportedMemberBuilder.cs

@@ -260,8 +260,8 @@ protected virtual Expression GetMarshalFromJniExpression (Expression jvm, Type t
 			MarshalInfo v;
 			if (Marshalers.TryGetValue (targetType, out v))
 				return v.FromJni (jvm, targetType, jniParameter);
-			if (typeof (IJavaObject).IsAssignableFrom (targetType))
-				return Marshalers [typeof (IJavaObject)].FromJni (jvm, targetType, jniParameter);
+			if (typeof (IJavaPeerable).IsAssignableFrom (targetType))
+				return Marshalers [typeof (IJavaPeerable)].FromJni (jvm, targetType, jniParameter);
 			return null;
 		}
 
@@ -270,8 +270,8 @@ protected virtual Expression GetMarshalToJniExpression (Type sourceType, Express
 			MarshalInfo v;
 			if (Marshalers.TryGetValue (sourceType, out v))
 				return v.ToJni (managedParameter);
-			if (typeof (IJavaObject).IsAssignableFrom (sourceType))
-				return Marshalers [typeof (IJavaObject)].ToJni (managedParameter);
+			if (typeof (IJavaPeerable).IsAssignableFrom (sourceType))
+				return Marshalers [typeof (IJavaPeerable)].ToJni (managedParameter);
 			return null;
 		}
 
@@ -280,9 +280,9 @@ protected virtual Expression GetMarshalToJniExpression (Type sourceType, Express
 					FromJni = (vm, t, p) => Expression.Call (F<IntPtr, string> (JniEnvironment.Strings.ToString).Method, p),
 					ToJni   = p => Expression.Call (F<string, JniObjectReference> (JniEnvironment.Strings.NewString).Method, p)
 			} },
-			{ typeof (IJavaObject), new MarshalInfo {
+			{ typeof (IJavaPeerable), new MarshalInfo {
 					FromJni = (vm, t, p) => GetThis (vm, t, p),
-					ToJni   = p => Expression.Call (F<IJavaObject, IntPtr> (JniEnvironment.Handles.NewReturnToJniRef).Method, p)
+					ToJni   = p => Expression.Call (F<IJavaPeerable, IntPtr> (JniEnvironment.Handles.NewReturnToJniRef).Method, p)
 			} },
 		};