X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FSequenceIdMatcher.java;fp=src%2Fjalview%2Fanalysis%2FSequenceIdMatcher.java;h=e6a48531f322ac5e80ffe03e1d18789544700216;hb=cf491d18e6affbfacfc67eda7c6bceedd457982f;hp=bedce3fd56c3834eaa5a0205a609fb7072cdcf80;hpb=5dc62d509b6d0f90f3545bf40b272390410eda45;p=jalview.git

diff --git a/src/jalview/analysis/SequenceIdMatcher.java b/src/jalview/analysis/SequenceIdMatcher.java
index bedce3f..e6a4853 100755
--- a/src/jalview/analysis/SequenceIdMatcher.java
+++ b/src/jalview/analysis/SequenceIdMatcher.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,9 +20,12 @@
  */
 package jalview.analysis;
 
-import java.util.*;
+import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.SequenceI;
 
-import jalview.datamodel.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Vector;
 
 /**
  * Routines for approximate Sequence Id resolution by name using string
@@ -258,14 +261,20 @@ public class SequenceIdMatcher
       }
     }
 
+    @Override
     public int hashCode()
     {
       return ((id.length() >= 4) ? id.substring(0, 4).hashCode() : id
               .hashCode());
     }
 
+    @Override
     public boolean equals(Object s)
     {
+      if (s == null)
+      {
+        return false;
+      }
       if (s instanceof SeqIdName)
       {
         return this.equals((SeqIdName) s);