[Java.Interop] Change grouping of the JNIEnv functions.

Fixes: #22

Alter the JNIEnv function pointer grouping to more closely match the
current JNI documentation:

	http://docs.oracle.com/javase/8/docs/technotes/guides/jni/spec/functions.html

In particular, previously there was a JniEnvironment.Members class
which contained all field and method-related functionality. This type
has been split up into InstanceFields, InstanceMethods, StaticFields,
and StaticMethods types.

Author: jonpryor

samples/Hello/Program.cs

@@ -29,7 +29,7 @@ public static unsafe void Main (string[] args)
 				int i = m.CallVirtualInt32Method (o);
 				Console.WriteLine ("java.lang.Object={0}", o);
 				Console.WriteLine ("hashcode={0}", i);
-				JniEnvironment.Handles.Dispose (ref o);
+				JniEnvironment.References.Dispose (ref o);
 				t.Dispose ();
 				// var o = JniTypes.FindClass ("java/lang/Object");
 				/*

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

@@ -17,7 +17,7 @@ public AndroidVMBuilder ()
 			NewObjectRequired   = ((int) Android.OS.Build.VERSION.SdkInt) <= 10;
 			using (var env = new JniEnvironment (JNIEnv.Handle)) {
 				IntPtr vm;
-				int r = JniEnvironment.Handles.GetJavaVM (out vm);
+				int r = JniEnvironment.References.GetJavaVM (out vm);
 				if (r < 0)
 					throw new InvalidOperationException ("JNIEnv::GetJavaVM() returned: " + r);
 				InvocationPointer    = vm;
@@ -49,10 +49,10 @@ protected override bool TryGC (IJavaPeerable value, ref JniObjectReference handl
 			if (!handle.IsValid)
 				return true;
 			var wgref = handle.NewWeakGlobalRef ();
-			JniEnvironment.Handles.Dispose (ref handle);
+			JniEnvironment.References.Dispose (ref handle);
 			Java.Lang.Runtime.GetRuntime ().Gc ();
 			handle = wgref.NewGlobalRef ();
-			JniEnvironment.Handles.Dispose (ref wgref);
+			JniEnvironment.References.Dispose (ref wgref);
 			return handle.IsValid;
 		}
 

src/Android.Interop/Tests/TestsSample.cs

@@ -56,11 +56,11 @@ unsafe TimeSpan GetJIMethodCallTiming ()
 				var sw = Stopwatch.StartNew ();
 				for (int i = 0; i < Unified_ToString_Iterations; ++i) {
 					var r = t.CallVirtualObjectMethod (o);
-					JniEnvironment.Handles.Dispose (ref r);
+					JniEnvironment.References.Dispose (ref r);
 				}
 				sw.Stop ();
 
-				JniEnvironment.Handles.Dispose (ref o);
+				JniEnvironment.References.Dispose (ref o);
 				return sw.Elapsed;
 			}
 		}
@@ -106,7 +106,7 @@ unsafe void GetJICallObjectMethodAndDeleteLocalRefTimings (
 				var t = k.GetInstanceMethod ("toString", "()Ljava/lang/String;");
 
 				var r = t.CallVirtualObjectMethod (o);
-				JniEnvironment.Handles.Dispose (ref r);
+				JniEnvironment.References.Dispose (ref r);
 
 				var rs = new JniObjectReference [MaxLocalRefs];
 
@@ -119,7 +119,7 @@ unsafe void GetJICallObjectMethodAndDeleteLocalRefTimings (
 
 				sw.Restart ();
 				for (int i = 0; i < rs.Length; ++i) {
-					JniEnvironment.Handles.Dispose (ref rs [i]);
+					JniEnvironment.References.Dispose (ref rs [i]);
 				}
 				sw.Stop ();
 				disposeTime   = sw.Elapsed;

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

@@ -177,7 +177,7 @@ public  void    Cleanup (object value)
 		{
 			if (cleanup != null && obj != null)
 				cleanup (obj, value);
-			JniEnvironment.Handles.Dispose (ref lref);
+			JniEnvironment.References.Dispose (ref lref);
 		}
 	}
 }

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

@@ -191,10 +191,10 @@ List<JavaConstructorInfo> LookupConstructors ()
 						var ctor    = JniEnvironment.Arrays.GetObjectArrayElement (ctors, i);
 						var m       = new JavaConstructorInfo (Members, ctor);
 						constructors.Add (m);
-						JniEnvironment.Handles.Dispose (ref ctor);
+						JniEnvironment.References.Dispose (ref ctor);
 					}
 				} finally {
-					JniEnvironment.Handles.Dispose (ref ctors);
+					JniEnvironment.References.Dispose (ref ctors);
 				}
 
 				return constructors;
@@ -231,10 +231,10 @@ Dictionary<string, List<JavaFieldInfo>> LookupFields ()
 							overloads.Add (new JavaFieldInfo (Members, name + "\u0000" + info.JniTypeReference, isStatic));
 						}
 
-						JniEnvironment.Handles.Dispose (ref field);
+						JniEnvironment.References.Dispose (ref field);
 					}
 				} finally {
-					JniEnvironment.Handles.Dispose (ref fields);
+					JniEnvironment.References.Dispose (ref fields);
 				}
 
 				return this.fields;
@@ -271,10 +271,10 @@ Dictionary<string, List<JavaMethodInfo>> LookupMethods ()
 							ReturnType  = rt,
 						};
 						overloads.Add (m);
-						JniEnvironment.Handles.Dispose (ref method);
+						JniEnvironment.References.Dispose (ref method);
 					}
 				} finally {
-					JniEnvironment.Handles.Dispose (ref methods);
+					JniEnvironment.References.Dispose (ref methods);
 				}
 
 				return this.methods;

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

@@ -141,7 +141,7 @@ void SetStaticValue (object value)
 				try {
 					members.StaticFields.SetValue (JniSignature, lref);
 				} finally {
-					JniEnvironment.Handles.Dispose (ref lref);
+					JniEnvironment.References.Dispose (ref lref);
 				}
 				return;
 			default:
@@ -167,7 +167,7 @@ void SetInstanceValue (IJavaPeerable self, object value)
 				try {
 					members.InstanceFields.SetValue (JniSignature, self, lref);
 				} finally {
-					JniEnvironment.Handles.Dispose (ref lref);
+					JniEnvironment.References.Dispose (ref lref);
 				}
 				return;
 			default:

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

@@ -52,7 +52,7 @@ protected override void Dispose (bool disposing)
 				return;
 
 			var pr          = PeerReference;
-			JniEnvironment.Handles.Dispose (ref pr);
+			JniEnvironment.References.Dispose (ref pr);
 			PeerReference   = pr;
 
 			members     = null;
@@ -62,7 +62,7 @@ protected override void Dispose (bool disposing)
 
 			for (int i = 0; i < arguments.Count; ++i) {
 				var a = arguments [i];
-				JniEnvironment.Handles.Dispose (ref a);
+				JniEnvironment.References.Dispose (ref a);
 				arguments [i] = a;
 			}
 			arguments   = null;
@@ -94,11 +94,11 @@ public void LookupArguments ()
 						sb.Append (JniEnvironment.Types.GetJniTypeNameFromClass (p));
 						arguments.Add (p.NewGlobalRef ());
 					} finally {
-						JniEnvironment.Handles.Dispose (ref p);
+						JniEnvironment.References.Dispose (ref p);
 					}
 				}
 			} finally {
-				JniEnvironment.Handles.Dispose (ref parameters);
+				JniEnvironment.References.Dispose (ref parameters);
 			}
 			sb.Append (")").Append (JniReturnType);
 			JniSignature    = sb.ToString ();

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

@@ -282,7 +282,7 @@ protected virtual Expression GetMarshalToJniExpression (Type sourceType, Express
 			} },
 			{ typeof (IJavaPeerable), new MarshalInfo {
 					FromJni = (vm, t, p) => GetThis (vm, t, p),
-					ToJni   = p => Expression.Call (F<IJavaPeerable, IntPtr> (JniEnvironment.Handles.NewReturnToJniRef).Method, p)
+					ToJni   = p => Expression.Call (F<IJavaPeerable, IntPtr> (JniEnvironment.References.NewReturnToJniRef).Method, p)
 			} },
 		};
 

src/Java.Interop.Export/Tests/Java.Interop/ExportedMemberBuilderTest.cs

@@ -344,7 +344,7 @@ public void CreateMarshalFromJniMethodExpression_FuncIJavaObject ()
 		__jvm = JniEnvironment.Current.JavaVM;
 		__this = __jvm.GetObject<ExportTest>(__context);
 		__mret = __this.FuncIJavaObject();
-		__jret = Handles.NewReturnToJniRef(__mret);
+		__jret = References.NewReturnToJniRef(__mret);
 		return __jret;
 	}
 	catch (Exception __e)

src/Java.Interop/Java.Interop.csproj

@@ -43,7 +43,7 @@
     <Compile Include="Java.Interop\JniInstanceMethodID.cs" />
     <Compile Include="Java.Interop\JniEnvironment.cs" />
     <Compile Include="Java.Interop\JniEnvironment.g.cs" />
-    <Compile Include="Java.Interop\JniEnvironment.Handles.cs" />
+    <Compile Include="Java.Interop\JniEnvironment.References.cs" />
     <Compile Include="Java.Interop\JniEnvironment.Strings.cs" />
     <Compile Include="Java.Interop\JniEnvironment.Types.cs" />
     <Compile Include="Java.Interop\JniPeerMembers.cs" />