Rename Context -> JniUnoEnvironmentData

Change-Id: I97879d250ed0ed20d5e129ff3af6dbc2f5759078

4 files changed, 33 insertions, 28 deletions

diff --git a/bridges/source/jni_uno/jni_bridge.cxx b/bridges/source/jni_uno/jni_bridge.cxx
index 809eb3b96c90..a3ffe01afde6 100644
--- a/bridges/source/jni_uno/jni_bridge.cxx
+++ b/bridges/source/jni_uno/jni_bridge.cxx
@@ -84,7 +84,8 @@ void SAL_CALL Mapping_map_to_uno(
                 static_cast< Mapping const * >( mapping )->m_bridge;
             JNI_guarded_context jni(
                 bridge->m_jni_info,
-                (static_cast<jni_uno::Context *>(bridge->m_java_env->pContext)
+                (static_cast<jni_uno::JniUnoEnvironmentData *>(
+                    bridge->m_java_env->pContext)
                  ->machine));
 
             JNI_interface_type_info const * info =
@@ -135,7 +136,7 @@ void SAL_CALL Mapping_map_to_java(
                     static_cast< Mapping const * >( mapping )->m_bridge;
                 JNI_guarded_context jni(
                     bridge->m_jni_info,
-                    (static_cast<jni_uno::Context *>(
+                    (static_cast<jni_uno::JniUnoEnvironmentData *>(
                         bridge->m_java_env->pContext)
                      ->machine));
                 jni->DeleteGlobalRef( *ppJavaI );
@@ -148,7 +149,8 @@ void SAL_CALL Mapping_map_to_java(
                 static_cast< Mapping const * >( mapping )->m_bridge;
             JNI_guarded_context jni(
                 bridge->m_jni_info,
-                (static_cast<jni_uno::Context *>(bridge->m_java_env->pContext)
+                (static_cast<jni_uno::JniUnoEnvironmentData *>(
+                    bridge->m_java_env->pContext)
                  ->machine));
 
             JNI_interface_type_info const * info =
@@ -234,7 +236,8 @@ Bridge::Bridge(
 {
     // bootstrapping bridge jni_info
     m_jni_info = JNI_info::get_jni_info(
-        static_cast<jni_uno::Context *>(m_java_env->pContext)->machine);
+        static_cast<jni_uno::JniUnoEnvironmentData *>(m_java_env->pContext)
+        ->machine);
 
     assert(m_java_env != 0);
     assert(m_uno_env != 0);
@@ -412,17 +415,18 @@ using namespace ::jni_uno;
 extern "C" {
 
 void SAL_CALL java_env_dispose(uno_Environment * env) {
-    jni_uno::Context * context = static_cast<jni_uno::Context *>(env->pContext);
+    auto * envData
+        = static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext);
     jobject async;
     {
-        osl::MutexGuard g(context->mutex);
-        async = context->asynchronousFinalizer;
-        context->asynchronousFinalizer = nullptr;
+        osl::MutexGuard g(envData->mutex);
+        async = envData->asynchronousFinalizer;
+        envData->asynchronousFinalizer = nullptr;
     }
     if (async != nullptr) {
         try {
             jvmaccess::VirtualMachine::AttachGuard g(
-                context->machine->getVirtualMachine());
+                envData->machine->getVirtualMachine());
             JNIEnv * jniEnv = g.getEnvironment();
             jclass cl = jniEnv->FindClass(
                 "com/sun/star/lib/util/AsynchronousFinalizer");
@@ -453,7 +457,7 @@ void SAL_CALL java_env_dispose(uno_Environment * env) {
 
 void SAL_CALL java_env_disposing(uno_Environment * env) {
     java_env_dispose(env);
-    delete static_cast<jni_uno::Context *>(env->pContext);
+    delete static_cast<jni_uno::JniUnoEnvironmentData *>(env->pContext);
 }
 
 #ifdef DISABLE_DYNLOADING
@@ -464,15 +468,15 @@ void SAL_CALL java_env_disposing(uno_Environment * env) {
 SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_env )
     SAL_THROW_EXTERN_C()
 {
-    java_env->pContext = new jni_uno::Context(
+    auto * envData = new jni_uno::JniUnoEnvironmentData(
         static_cast<jvmaccess::UnoVirtualMachine *>(java_env->pContext));
+    java_env->pContext = envData;
     java_env->dispose = java_env_dispose;
     java_env->environmentDisposing = java_env_disposing;
     java_env->pExtEnv = 0; // no extended support
     try {
         jvmaccess::VirtualMachine::AttachGuard g(
-            static_cast<jni_uno::Context *>(java_env->pContext)->machine
-            ->getVirtualMachine());
+            envData->machine->getVirtualMachine());
         JNIEnv * jniEnv = g.getEnvironment();
         jclass cl = jniEnv->FindClass(
             "com/sun/star/lib/util/AsynchronousFinalizer");
@@ -499,9 +503,7 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * java_e
                         SAL_WARN("bridges", "exception in NewGlobalRef");
                             //TODO: report failure
                     } else {
-                        (static_cast<jni_uno::Context *>(java_env->pContext)->
-                         asynchronousFinalizer)
-                            = o;
+                        envData->asynchronousFinalizer = o;
                     }
                 }
             }
diff --git a/bridges/source/jni_uno/jni_bridge.h b/bridges/source/jni_uno/jni_bridge.h
index 7c5bf379a301..9328c6723862 100644
--- a/bridges/source/jni_uno/jni_bridge.h
+++ b/bridges/source/jni_uno/jni_bridge.h
@@ -36,8 +36,8 @@
 namespace jni_uno
 {
 
-struct Context: boost::noncopyable {
-    explicit Context(
+struct JniUnoEnvironmentData: boost::noncopyable {
+    explicit JniUnoEnvironmentData(
         rtl::Reference<jvmaccess::UnoVirtualMachine> const & theMachine):
         machine(theMachine), asynchronousFinalizer(nullptr)
     {}
diff --git a/bridges/source/jni_uno/jni_java2uno.cxx b/bridges/source/jni_uno/jni_java2uno.cxx
index 086399e26dd0..62098798cc48 100644
--- a/bridges/source/jni_uno/jni_java2uno.cxx
+++ b/bridges/source/jni_uno/jni_java2uno.cxx
@@ -69,11 +69,11 @@ jobject Bridge::map_to_java(
         args2[ 4 ].l = info->m_type;
         args2[ 5 ].l = jo_oid.get();
         args2[ 6 ].l = info->m_proxy_ctor;
-        jni_uno::Context * context = static_cast<jni_uno::Context *>(
+        auto * envData = static_cast<jni_uno::JniUnoEnvironmentData *>(
             m_java_env->pContext);
         {
-            osl::MutexGuard g(context->mutex);
-            args2[ 7 ].l = context->asynchronousFinalizer;
+            osl::MutexGuard g(envData->mutex);
+            args2[ 7 ].l = envData->asynchronousFinalizer;
         }
         jo_iface = jni->CallStaticObjectMethodA(
             m_jni_info->m_class_JNI_proxy,
@@ -379,8 +379,8 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_dispatch_1call(
     JNI_context jni(
         jni_info, jni_env,
         static_cast< jobject >(
-            static_cast<Context *>(bridge->m_java_env->pContext)->machine
-            ->getClassLoader()));
+            static_cast<JniUnoEnvironmentData *>(bridge->m_java_env->pContext)
+            ->machine->getClassLoader()));
 
     OUString method_name;
 
@@ -626,8 +626,8 @@ JNICALL Java_com_sun_star_bridges_jni_1uno_JNI_1proxy_finalize__J(
     JNI_context jni(
         jni_info, jni_env,
         static_cast< jobject >(
-            static_cast<Context *>(bridge->m_java_env->pContext)->machine
-            ->getClassLoader()));
+            static_cast<JniUnoEnvironmentData *>(bridge->m_java_env->pContext)
+            ->machine->getClassLoader()));
 
     uno_Interface * pUnoI = reinterpret_cast< uno_Interface * >(
         jni->GetLongField(
diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx
index c50be5de9a37..8058550ec2eb 100644
--- a/bridges/source/jni_uno/jni_uno2java.cxx
+++ b/bridges/source/jni_uno/jni_uno2java.cxx
@@ -128,7 +128,8 @@ void Bridge::call_java(
     assert( function_pos_offset == 0 || function_pos_offset == 1 );
 
     JNI_guarded_context jni(
-        m_jni_info, static_cast<Context *>(m_java_env->pContext)->machine);
+        m_jni_info,
+        static_cast<JniUnoEnvironmentData *>(m_java_env->pContext)->machine);
 
     // assure fully initialized iface_td:
     ::com::sun::star::uno::TypeDescription iface_holder;
@@ -528,7 +529,8 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy )
     {
         JNI_guarded_context jni(
             bridge->m_jni_info,
-            static_cast<Context *>(bridge->m_java_env->pContext)->machine);
+            (static_cast<JniUnoEnvironmentData *>(bridge->m_java_env->pContext)
+             ->machine));
 
         jni->DeleteGlobalRef( that->m_javaI );
         jni->DeleteGlobalRef( that->m_jo_oid );
@@ -672,7 +674,8 @@ void SAL_CALL UNO_proxy_dispatch(
                     JNI_info const * jni_info = bridge->m_jni_info;
                     JNI_guarded_context jni(
                         jni_info,
-                        (static_cast<Context *>(bridge->m_java_env->pContext)
+                        (static_cast<JniUnoEnvironmentData *>(
+                            bridge->m_java_env->pContext)
                          ->machine));
 
                     JNI_interface_type_info const * info =