[Gmod-apollo-cmts] CVS: apollo/src/java/jalview/datamodel FeatureBlock.java,1.14,1.15

[Mark G. <mg...@us...>]

Update of /cvsroot/gmod/apollo/src/java/jalview/datamodel
In directory sc8-pr-cvs1:/tmp/cvs-serv9285/src/java/jalview/datamodel

Modified Files:
	FeatureBlock.java 
Log Message:
Fixed jalview bug reported by Len Trigg. Feature sets with 0 length
introns were not properly merging. FeatureBlock.smerge was merging 
gaps(-) but not padding(.).



Index: FeatureBlock.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/jalview/datamodel/FeatureBlock.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FeatureBlock.java	29 Oct 2003 15:58:25 -0000	1.14
--- FeatureBlock.java	30 Oct 2003 15:28:17 -0000	1.15
***************
*** 424,429 ****
    }
  
!   /** If into has a dash where from does not, into replaces its dash with
!       froms char */
    private String smerge (String into_seq, String from_seq) {
      char [] into = into_seq.toCharArray();
--- 424,429 ----
    }
  
!   /** If into has a dash(gap) or dot(padding) where from does not, 
!       into replaces it with froms char */
    private String smerge (String into_seq, String from_seq) {
      char [] into = into_seq.toCharArray();
***************
*** 432,436 ****
  
      for (int i = 0; i < length; i++) {
!       if (into[i] == '-' && from[i] != '-')
  	into[i] = from[i];
      }
--- 432,437 ----
  
      for (int i = 0; i < length; i++) {
!       if ((into[i] == '-' && from[i] != '-') 
!           || (into[i] == '.' && from[i] != '.' ))
  	into[i] = from[i];
      }