Implement comparable to find bookmark in collection.

Former-commit-id: 0a72f034d0d3020bfc43a229f426957d12733816

source/ch/cyberduck/core/AbstractHostCollection.java

@@ -209,4 +209,18 @@ protected void load(Collection<Host> c) {
         this.addAll(c);
         this.collectionLoaded();
     }
+
+    /**
+     * Search using comparator
+     *
+     * @param bookmark Bookmark to find that matches comparison
+     */
+    public boolean find(final Host bookmark) {
+        for(Host h : this) {
+            if(h.compareTo(bookmark) == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

source/ch/cyberduck/core/Host.java

@@ -33,7 +33,7 @@
 /**
  * @version $Id$
  */
-public final class Host implements Serializable {
+public final class Host implements Serializable, Comparable<Host> {
     private static final Logger log = Logger.getLogger(Host.class);
 
     /**
@@ -685,6 +685,23 @@ public int hashCode() {
         return this.getUuid().hashCode();
     }
 
+    @Override
+    public int compareTo(final Host other) {
+        if(port != other.port) {
+            return -1;
+        }
+        if(credentials != null ? !credentials.equals(other.credentials) : other.credentials != null) {
+            return -1;
+        }
+        if(hostname != null ? !hostname.equals(other.hostname) : other.hostname != null) {
+            return -1;
+        }
+        if(protocol != null ? !protocol.equals(other.protocol) : other.protocol != null) {
+            return -1;
+        }
+        return 0;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("Host{");

source/ch/cyberduck/core/importer/ThirdpartyBookmarkCollection.java

@@ -32,6 +32,7 @@
 import org.apache.log4j.Logger;
 
 import java.text.MessageFormat;
+import java.util.Iterator;
 
 /**
  * @version $Id$
@@ -72,7 +73,7 @@ public void load() {
                             log.info(String.format("Checksum changed for bookmarks file at %s", file.getAbsolute()));
                         }
                         // Should filter existing bookmarks
-                        // this.parse(file);
+                        this.parse(file);
                     }
                 }
             }
@@ -145,4 +146,19 @@ public boolean add(final Host bookmark) {
         }
         return super.add(bookmark);
     }
+
+    /**
+     * Remove all that are contained within the collection passed
+     */
+    public void filter(final AbstractHostCollection bookmarks) {
+        for(Iterator<Host> iter = this.iterator(); iter.hasNext(); ) {
+            final Host i = iter.next();
+            if(bookmarks.find(i)) {
+                if(log.isInfoEnabled()) {
+                    log.info(String.format("Remove %s from import as we found it in bookmarks", i));
+                }
+                iter.remove();
+            }
+        }
+    }
 }