From f679765cb36b8c3889cd0fa7ab7d7923844d0827 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 30 Nov 2015 09:51:08 +0000 Subject: [PATCH] JAL-652 refactored to remove one method --- src/jalview/analysis/SequenceIdMatcher.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/jalview/analysis/SequenceIdMatcher.java b/src/jalview/analysis/SequenceIdMatcher.java index 35a72e3..f7c7cb4 100755 --- a/src/jalview/analysis/SequenceIdMatcher.java +++ b/src/jalview/analysis/SequenceIdMatcher.java @@ -304,7 +304,7 @@ public class SequenceIdMatcher } if (s instanceof SeqIdName) { - return this.equals((SeqIdName) s); + return this.equals(((SeqIdName) s).id); } else { @@ -332,25 +332,8 @@ public class SequenceIdMatcher * todo: (JBPNote) Set separator characters appropriately * * @param s - * SeqIdName * @return boolean */ - public boolean equals(SeqIdName s) - { - // TODO: JAL-732 patch for cases when name includes a list of IDs, and the - // match contains one ID flanked - if (id.length() > s.id.length()) - { - return id.startsWith(s.id) ? (WORD_SEP.indexOf(id.charAt(s.id - .length())) > -1) : false; - } - else - { - return s.id.startsWith(id) ? (s.id.equals(id) ? true : (WORD_SEP - .indexOf(s.id.charAt(id.length())) > -1)) : false; - } - } - public boolean equals(String s) { if (id.length() > s.length()) -- 1.7.10.2