[Octave-patch-tracker] [patch #9059] reformatting ov-java.cc?

[Ernst Reissner]

Follow-up Comment #1, patch #9059 (project octave):

Ok, the same again with proper formatting: 

++
octave_value
octave_java::do_javaMethod (void *jni_env_arg, 
                            const std::string& name,
                            const octave_value_list& args)
{
#if defined (HAVE_JAVA)

  octave_value retval;

  JNIEnv *jni_env = TO_JNIENV (jni_env_arg);

  if (jni_env)
    {
      jobjectArray_ref arg_objs (jni_env), arg_types (jni_env);
       if (oct2javaType (jni_env, args, arg_objs, arg_types))
        {
          jclass_ref helperClass (jni_env, 
                                  find_octave_class (jni_env, 
                                                    
"org/octave/ClassHelper"));
          jmethodID mID = jni_env
            ->GetStaticMethodID (helperClass, 
                                 "invokeMethod",
                                 // parameter types 
                                 "(Ljava/lang/Object;Ljava/lang/String;" 
                                 "[Ljava/lang/Object;[Ljava/lang/Class;)" 
                                 "Ljava/lang/Object;");
          jstring_ref methName (jni_env, jni_env->NewStringUTF (name.c_str
()));
          jobject resObj = jni_env
            ->CallStaticObjectMethod(helperClass, 
                                     mID, 
                                     to_java (), 
                                     jstring (methName), 
                                     jobjectArray (arg_objs), 
                                     jobjectArray (arg_types));
          // FIXME: why array???? bug? 
           jobjectArray_ref resObjArr (jni_env, 
                                      reinterpret_cast<jobjectArray>
(resObj));
           retval = resObjArr
            ? java2octType (jni_env, resObjArr)
            : check_exception (jni_env);
         } // if (oct2javaType 

      octave_set_default_fpucw ();
    } // if (jni_env)

  return retval;

#else

  octave_unused_parameter (jni_env_arg);
  octave_unused_parameter (name);
  octave_unused_parameter (args);

  // This shouldn't happen because construction of octave_java
  // objects is supposed to be impossible if Java is not available.

  panic_impossible ();

#endif
}
--

    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/patch/?9059>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/