New JNI bindings

jni/JniCallbacks.h

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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/>.
  */
 
 #ifndef JNICALLBACKS_H

[Felix Dahlke, 2014/03/28 11:27:18]

We also typically use underscores for word separation, but not fully
consistently, so nevermind.

 #define JNICALLBACKS_H
 
 #include <AdblockPlus.h>
 #include "Utils.h"
 #include "JniJsValue.h"
 
 class JniCallbackBase
 {
 public:
   JniCallbackBase(JNIEnv* env, jobject callbackObject);
   virtual ~JniCallbackBase();
   void LogException(JNIEnv* env, jthrowable throwable) const;
   void CheckAndLogJavaException(JNIEnv* env) const;
 
   JavaVM* GetJavaVM() const
   {
     return javaVM;
   }
 
   jobject GetCallbackObject() const
   {
-    return callbackObject->get();
+    return callbackObject->Get();
   }
 
 private:
   JavaVM* javaVM;
   JniGlobalReference<jobject>::Ptr callbackObject;
   JniGlobalReference<jclass>::Ptr exceptionLoggerClass;
 };
 
 class JniEventCallback : public JniCallbackBase
 {
 public:
   JniEventCallback(JNIEnv* env, jobject callbackObject);
-  virtual ~JniEventCallback();
   void Callback(AdblockPlus::JsValueList& params);
 };
 
 class JniUpdaterCallback : public JniCallbackBase
 {
 public:
   JniUpdaterCallback(JNIEnv* env, jobject callbackObject);
-  virtual ~JniUpdaterCallback();
   void Callback(const std::string& arg);
 };
 
 class JniFilterChangeCallback : public JniCallbackBase
 {
 public:
   JniFilterChangeCallback(JNIEnv* env, jobject callbackObject);
-  virtual ~JniFilterChangeCallback();
   void Callback(const std::string& arg, const AdblockPlus::JsValuePtr jsValue);
 };
 
 class JniLogSystemCallback : public JniCallbackBase, public AdblockPlus::LogSystem
 {
 public:
   JniLogSystemCallback(JNIEnv* env, jobject callbackObject);
-  virtual ~JniLogSystemCallback();
   void operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, const std::string& source);
 
 private:
   JniGlobalReference<jclass>::Ptr logLevelClass;
 };
 
 class JniWebRequest : public JniCallbackBase, public AdblockPlus::WebRequest
 {
 public:
   JniWebRequest(JNIEnv* env, jobject callbackObject);
-  virtual ~JniWebRequest();
   AdblockPlus::ServerResponse GET(const std::string& url, const AdblockPlus::HeaderList& requestHeaders) const;
 
 private:
   jobject NewTuple(JNIEnv* env, const std::string& a, const std::string& b) const;
 
   JniGlobalReference<jclass>::Ptr tupleClass;
   JniGlobalReference<jclass>::Ptr serverResponseClass;
 };
 
 #endif /* JNICALLBACKS_H */