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
Format changes
[jalview.git]
/
src
/
jalview
/
commands
/
RemoveGapColCommand.java
diff --git
a/src/jalview/commands/RemoveGapColCommand.java
b/src/jalview/commands/RemoveGapColCommand.java
index
5bf5b61
..
2c3aced
100644
(file)
--- a/
src/jalview/commands/RemoveGapColCommand.java
+++ b/
src/jalview/commands/RemoveGapColCommand.java
@@
-22,6
+22,7
@@
import jalview.datamodel.*;
\r
public class RemoveGapColCommand extends EditCommand
\r
{
\r
\r
public class RemoveGapColCommand extends EditCommand
\r
{
\r
+ int columnsDeleted;
\r
public RemoveGapColCommand(String description,
\r
SequenceI[] seqs,
\r
int start, int end, char gapChar)
\r
public RemoveGapColCommand(String description,
\r
SequenceI[] seqs,
\r
int start, int end, char gapChar)
\r
@@
-31,12
+32,12
@@
public class RemoveGapColCommand extends EditCommand
int j, jSize = seqs.length;
\r
\r
int startCol = -1, endCol = -1;
\r
int j, jSize = seqs.length;
\r
\r
int startCol = -1, endCol = -1;
\r
- int deletedCols = 0;
\r
+ columnsDeleted=0;
\r
\r
edits = new Edit[0];
\r
\r
boolean delete = true;
\r
\r
edits = new Edit[0];
\r
\r
boolean delete = true;
\r
- for (int i = start; i < end; i++)
\r
+ for (int i = start; i <= end; i++)
\r
{
\r
delete = true;
\r
\r
{
\r
delete = true;
\r
\r
@@
-63,12
+64,12
@@
public class RemoveGapColCommand extends EditCommand
if (!delete && startCol > -1)
\r
{
\r
this.appendEdit(DELETE_GAP, seqs,
\r
if (!delete && startCol > -1)
\r
{
\r
this.appendEdit(DELETE_GAP, seqs,
\r
- startCol - deletedCols,
\r
+ startCol - columnsDeleted,
\r
endCol - startCol,
\r
gapChar,
\r
false);
\r
\r
endCol - startCol,
\r
gapChar,
\r
false);
\r
\r
- deletedCols += (endCol - startCol);
\r
+ columnsDeleted += (endCol - startCol);
\r
startCol = -1;
\r
endCol = -1;
\r
}
\r
startCol = -1;
\r
endCol = -1;
\r
}
\r
@@
-78,14
+79,25
@@
public class RemoveGapColCommand extends EditCommand
{
\r
//This is for empty columns at the
\r
//end of the alignment
\r
{
\r
//This is for empty columns at the
\r
//end of the alignment
\r
+
\r
this.appendEdit(DELETE_GAP, seqs,
\r
this.appendEdit(DELETE_GAP, seqs,
\r
- startCol - deletedCols,
\r
- end-startCol+1,
\r
+ startCol - columnsDeleted,
\r
+ end - startCol +1,
\r
gapChar,
\r
false);
\r
gapChar,
\r
false);
\r
+
\r
+ columnsDeleted += (end - startCol +1);
\r
}
\r
\r
}
\r
\r
+
\r
performEdit(0);
\r
}
\r
\r
performEdit(0);
\r
}
\r
\r
+ public int getSize()
\r
+ {
\r
+ //We're interested in the number of columns deleted,
\r
+ //Not the number of sequence edits.
\r
+ return columnsDeleted;
\r
+ }
\r
+
\r
}
\r
}
\r