git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Output to text window added
[jalview.git]
/
src
/
jalview
/
datamodel
/
HistoryItem.java
diff --git
a/src/jalview/datamodel/HistoryItem.java
b/src/jalview/datamodel/HistoryItem.java
index
0520bc0
..
09e87f3
100755
(executable)
--- a/
src/jalview/datamodel/HistoryItem.java
+++ b/
src/jalview/datamodel/HistoryItem.java
@@
-75,7
+75,9
@@
public class HistoryItem
SequenceI seq = al.getSequenceAt(i);
\r
sequences.addElement(seq);
\r
alignIndex.addElement(i + "");
\r
SequenceI seq = al.getSequenceAt(i);
\r
sequences.addElement(seq);
\r
alignIndex.addElement(i + "");
\r
- seqAsString.addElement(seq.getSequence().toString());
\r
+ seqAsString.addElement(seq.getStart()
\r
+ +" "+seq.getEnd()
\r
+ +" "+seq.getSequence().toString());
\r
}
\r
\r
if(alignment.getHiddenSequences()!=null
\r
}
\r
\r
if(alignment.getHiddenSequences()!=null
\r
@@
-115,22
+117,23
@@
public class HistoryItem
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
-
\r
+ StringTokenizer st;
\r
for (int i = 0; i < sequences.size(); i++)
\r
{
\r
SequenceI restore = (SequenceI) sequences.elementAt(i);
\r
\r
for (int i = 0; i < sequences.size(); i++)
\r
{
\r
SequenceI restore = (SequenceI) sequences.elementAt(i);
\r
\r
+
\r
if (restore.getLength() == 0)
\r
{
\r
//This is for edits which remove all residues in a sequence
\r
if (restore.getLength() == 0)
\r
{
\r
//This is for edits which remove all residues in a sequence
\r
- restore.setSequence(seqAsString.elementAt(i).toString());
\r
alignment.getSequences().insertElementAt(restore,
\r
Integer.parseInt(alignIndex.elementAt(i).toString()));
\r
}
\r
alignment.getSequences().insertElementAt(restore,
\r
Integer.parseInt(alignIndex.elementAt(i).toString()));
\r
}
\r
- else
\r
- {
\r
- restore.setSequence(seqAsString.elementAt(i).toString());
\r
- }
\r
+
\r
+ st = new StringTokenizer(seqAsString.elementAt(i).toString());
\r
+ restore.setStart(Integer.parseInt(st.nextToken()));
\r
+ restore.setEnd(Integer.parseInt(st.nextToken()));
\r
+ restore.setSequence(st.nextToken());
\r
}
\r
\r
if(hiddenSeqs!=null)
\r
}
\r
\r
if(hiddenSeqs!=null)
\r