Issue 4030 - Move JNI bindings into separate library project

jni/JniLogSystem.cpp

Index: jni/JniLogSystem.cpp
diff --git a/jni/JniLogSystem.cpp b/jni/JniLogSystem.cpp
deleted file mode 100644
index 002775cded976091063e50842dbf5101e6963039..0000000000000000000000000000000000000000
--- a/jni/JniLogSystem.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
- *
- * Adblock Plus is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * Adblock Plus is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "JniCallbacks.h"
-
-static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
-{
-  try
-  {
-    return JniPtrToLong(new JniLogSystemCallback(env, callbackObject));
-  }
-  CATCH_THROW_AND_RETURN(env, 0)
-}
-
-static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
-{
-  delete JniLongToTypePtr<JniLogSystemCallback>(ptr);
-}
-
-JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jobject callbackObject)
-  : JniCallbackBase(env, callbackObject), AdblockPlus::LogSystem(), logLevelClass(new JniGlobalReference<jclass>(env, env->FindClass(PKG("LogSystem$LogLevel"))))
-{
-}
-
-void JniLogSystemCallback::operator()(AdblockPlus::LogSystem::LogLevel logLevel,
-    const std::string& message, const std::string& source)
-{
-  JNIEnvAcquire env(GetJavaVM());
-
-  jmethodID method = env->GetMethodID(
-      *JniLocalReference<jclass>(*env,
-          env->GetObjectClass(GetCallbackObject())),
-      "logCallback",
-      "(" TYP("LogSystem$LogLevel") "Ljava/lang/String;Ljava/lang/String;)V");
-
-  // TODO: Set log level from Java and handle it here (to reduce C++->Java calls)
-
-  if (method)
-  {
-    const char* enumName = 0;
-
-    switch (logLevel)
-    {
-    default:
-    case AdblockPlus::LogSystem::LOG_LEVEL_TRACE:
-      enumName = "TRACE";
-      break;
-    case AdblockPlus::LogSystem::LOG_LEVEL_LOG:
-      enumName = "LOG";
-      break;
-    case AdblockPlus::LogSystem::LOG_LEVEL_INFO:
-      enumName = "INFO";
-      break;
-    case AdblockPlus::LogSystem::LOG_LEVEL_WARN:
-      enumName = "WARN";
-      break;
-    case AdblockPlus::LogSystem::LOG_LEVEL_ERROR:
-      enumName = "ERROR";
-      break;
-    }
-
-    jclass enumClass = logLevelClass->Get();
-    if (enumClass)
-    {
-      jfieldID enumField = env->GetStaticFieldID(enumClass, enumName,
-          TYP("LogSystem$LogLevel"));
-      JniLocalReference<jobject> jLogLevel(*env,
-          env->GetStaticObjectField(enumClass, enumField));
-
-      JniLocalReference<jstring> jMessage(*env,
-          env->NewStringUTF(message.c_str()));
-      JniLocalReference<jstring> jSource(*env,
-          env->NewStringUTF(source.c_str()));
-
-      env->CallVoidMethod(GetCallbackObject(), method, *jLogLevel, *jMessage,
-          *jSource);
-    }
-
-    CheckAndLogJavaException(*env);
-  }
-}
-
-static JNINativeMethod methods[] =
-{
-  { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
-  { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
-};
-
-extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_LogSystem_registerNatives(JNIEnv *env, jclass clazz)
-{
-  env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
-}