Usage of new API, cleanups (reduced)

src/org/adblockplus/libadblockplus/WebRequest.java

 /*
  * 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/>.
  */
 
 package org.adblockplus.libadblockplus;
 
 import java.util.List;
 
-import com.github.rjeschke.neetutils.collections.Tuple;
 import com.github.rjeschke.neetutils.dispose.Disposable;
 import com.github.rjeschke.neetutils.dispose.Disposer;
 
 public abstract class WebRequest implements Disposable
 {
   private final Disposer disposer;
   protected final long ptr;
 
   static
   {
     System.loadLibrary("adblockplus-jni");
     registerNatives();
   }
 
   public WebRequest()
   {
     this.ptr = ctor(this);
     this.disposer = new Disposer(this, new DisposeWrapper(this.ptr));
   }
 
-  public abstract ServerResponse httpGET(String url, List<Tuple<String, String>> headers);
+  public abstract ServerResponse httpGET(String url, List<HeaderEntry> headers);
 
   @Override
   public void dispose()
   {
     this.disposer.dispose();
   }
 
   private final static class DisposeWrapper implements Disposable
   {
     private final long ptr;
 
     public DisposeWrapper(final long ptr)
     {
       this.ptr = ptr;
     }
 
     @Override
     public void dispose()
     {
       dtor(this.ptr);
     }
   }
 
   private final static native void registerNatives();
 
   private final static native long ctor(Object callbackObject);
 
   private final static native void dtor(long ptr);
 }