From 0ab3f3db92a858c59ccd8ae7f3ed62288e39ee6f Mon Sep 17 00:00:00 2001
From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04>
Date: Tue, 21 Dec 2004 16:47:39 +0000
Subject: [PATCH] fixes to add note
git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@2151 ee4ac58c-ac51-4696-9907-e4b3aa274f04
---
.../artemis/editor/DataViewInternalFrame.java | 15 +++++++++++----
uk/ac/sanger/artemis/editor/HitInfo.java | 4 +++-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/uk/ac/sanger/artemis/editor/DataViewInternalFrame.java b/uk/ac/sanger/artemis/editor/DataViewInternalFrame.java
index 49edca40b..703206dac 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 9ca862816..b1c5f3889 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
{
--
GitLab