Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

src/org/adblockplus/libadblockplus/FilterEngine.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
@@ skipping 89 matching lines @@
   public void forceUpdateCheck(final UpdateCheckDoneCallback callback)
   {
     forceUpdateCheck(this.ptr, callback != null ? callback.ptr : 0);
   }
 
   public List<String> getElementHidingSelectors(final String domain)
   {
     return getElementHidingSelectors(this.ptr, domain);
   }
 
+  public void showNextNotification(final String url)
+  {
+    showNextNotification(this.ptr, url);
+  }
+
+  public void showNextNotification()
+  {
+    showNextNotification(this.ptr, null);
+  }
+
+  public void setShowNotificationCallback(final ShowNotificationCallback callback)
+  {
+    setShowNotificationCallback(this.ptr, callback.ptr);
+  }
+
+  public void removeShowNotificationCallback()
+  {
+    removeShowNotificationCallback(this.ptr);
+  }
+
   public Filter matches(final String url, final ContentType contentType, final String documentUrl)
   {
     return matches(this.ptr, url, contentType, documentUrl);
   }
 
   public Filter matches(final String url, final ContentType contentType, final String[] documentUrls)
   {
     return matches(this.ptr, url, contentType, documentUrls);
   }
 
   public JsValue getPref(final String pref)
   {
     return getPref(this.ptr, pref);
   }
 
-  public Notification getNextNotificationToShow(String url)
-  {
-    return getNextNotificationToShow(this.ptr, url);
-  }
-
-  public Notification getNextNotificationToShow()
-  {
-    return this.getNextNotificationToShow(null);
-  }
-
   public void setPref(final String pref, final JsValue value)
   {
     setPref(this.ptr, pref, value.ptr);
   }
 
   @Override
   public void dispose()
   {
     this.disposer.dispose();
   }
@@ skipping 35 matching lines @@
   private final static native void setUpdateAvailableCallback(long ptr, long filterPtr);
 
   private final static native void removeFilterChangeCallback(long ptr);
 
   private final static native void setFilterChangeCallback(long ptr, long filterPtr);
 
   private final static native void forceUpdateCheck(long ptr, long updatePtr);
 
   private final static native List<String> getElementHidingSelectors(long ptr, String domain);
 
+  private final static native void showNextNotification(long ptr, String url);
+
+  private final static native void setShowNotificationCallback(long ptr, long callbackPtr);
+
+  private final static native void removeShowNotificationCallback(long ptr);
+
   private final static native JsValue getPref(long ptr, String pref);
 
   private final static native Filter matches(long ptr, String url, ContentType contentType, String documentUrl);
 
   private final static native Filter matches(long ptr, String url, ContentType contentType, String[] documentUrls);
 
-  private final static native Notification getNextNotificationToShow(long ptr, String url);
-
   private final static native void setPref(long ptr, String pref, long valuePtr);
 
   private final static native void dtor(long ptr);
 }