diff --git a/uk/ac/sanger/artemis/editor/DataViewInternalFrame.java b/uk/ac/sanger/artemis/editor/DataViewInternalFrame.java index 49edca40ba184f0c8b532a42d7e9bbb2165f8967..703206daced6ff8500f5335e2a0de0b8d11546ee 100644 --- a/uk/ac/sanger/artemis/editor/DataViewInternalFrame.java +++ b/uk/ac/sanger/artemis/editor/DataViewInternalFrame.java @@ -273,9 +273,9 @@ public class DataViewInternalFrame extends JInternalFrame if(line.startsWith("/similarity=")) { if(note == null) - note = new StringBuffer("\n/note=\"Similar to"); + note = new StringBuffer("\n/note=\"Similar to "); else - note.append(", and to"); + note.append(", and to "); StringTokenizer tok = new StringTokenizer(line,";"); String type = tok.nextToken(); @@ -290,11 +290,18 @@ public class DataViewInternalFrame extends JInternalFrame // ind1 = id.indexOf(":"); id = id.substring(ind1+1).trim(); - note.append(tok.nextToken()); + String next = tok.nextToken().trim(); + if(next.endsWith(".")) + next = next.substring(0,next.length()-1); + + note.append(next); note.append(tok.nextToken().toLowerCase()); - note.append(" "+id); String length = tok.nextToken().trim(); + if(!length.startsWith("length")) + note.append(" "+length.toLowerCase()); + note.append(" "+id); + while(!length.startsWith("length")) length = tok.nextToken().trim(); diff --git a/uk/ac/sanger/artemis/editor/HitInfo.java b/uk/ac/sanger/artemis/editor/HitInfo.java index 9ca862816b92e8f32a60df5e863009ec3213094b..b1c5f3889c2e93a8e274c41e57929e8baa0195ef 100644 --- a/uk/ac/sanger/artemis/editor/HitInfo.java +++ b/uk/ac/sanger/artemis/editor/HitInfo.java @@ -160,7 +160,8 @@ public class HitInfo return; ind1 = ind2; - ind2 = header.indexOf("(",ind1); + ind2 = header.lastIndexOf("("); + if(ind2 > -1) desc = ""; // desc = header.substring(ind1,ind2).trim(); @@ -174,6 +175,7 @@ public class HitInfo else return; + StringTokenizer tok = new StringTokenizer(header.substring(ind2+1)); try {