diff --git a/uk/ac/sanger/artemis/io/GFFDocumentEntry.java b/uk/ac/sanger/artemis/io/GFFDocumentEntry.java index e473c1a769434032425f55ddc1b2e0f32cadd40a..e341789093c12bcc2c820a5b56e0d595b711200c 100644 --- a/uk/ac/sanger/artemis/io/GFFDocumentEntry.java +++ b/uk/ac/sanger/artemis/io/GFFDocumentEntry.java @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/GFFDocumentEntry.java,v 1.34 2006-08-17 13:20:25 tjc Exp $ + * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/GFFDocumentEntry.java,v 1.35 2006-11-21 16:34:51 tjc Exp $ */ package uk.ac.sanger.artemis.io; @@ -30,7 +30,6 @@ import uk.ac.sanger.artemis.util.*; import java.io.IOException; import java.util.Hashtable; import java.util.Enumeration; -import java.util.Set; import java.util.Vector; import java.sql.Timestamp; @@ -38,7 +37,7 @@ import java.sql.Timestamp; * A DocumentEntry that can read an GFF entry from a Document. * * @author Kim Rutherford - * @version $Id: GFFDocumentEntry.java,v 1.34 2006-08-17 13:20:25 tjc Exp $ + * @version $Id: GFFDocumentEntry.java,v 1.35 2006-11-21 16:34:51 tjc Exp $ **/ public class GFFDocumentEntry extends SimpleDocumentEntry @@ -382,8 +381,14 @@ public class GFFDocumentEntry extends SimpleDocumentEntry { final GFFStreamFeature this_feature = (GFFStreamFeature)v_exons.get(j); - - int rank = this_feature.getFeature_relationship_rank(); + + Integer rank; + Qualifier rankQualifier = + this_feature.getQualifierByName("feature_relationship_rank"); + if(rankQualifier == null) + rank = new Integer(0); + else + rank = new Integer((String)(rankQualifier.getValues().get(0))); // use the most current lastmodified datestamp if(this_feature.getLastModified() != null && @@ -407,7 +412,7 @@ public class GFFDocumentEntry extends SimpleDocumentEntry { String id = (String)(id_qualifier.getValues()).elementAt(0); id_range_store.put(id, new_range); - feature_relationship_rank_store.put(id, new Integer(rank)); + feature_relationship_rank_store.put(id, rank); } diff --git a/uk/ac/sanger/artemis/io/GFFStreamFeature.java b/uk/ac/sanger/artemis/io/GFFStreamFeature.java index c8bb170ba51266e30b3851ee8c2112bcca8e5fc9..4665f785058ef67046658319b07aad1baf56b792 100644 --- a/uk/ac/sanger/artemis/io/GFFStreamFeature.java +++ b/uk/ac/sanger/artemis/io/GFFStreamFeature.java @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/GFFStreamFeature.java,v 1.43 2006-08-07 14:57:10 tjc Exp $ + * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/GFFStreamFeature.java,v 1.44 2006-11-21 16:34:51 tjc Exp $ */ package uk.ac.sanger.artemis.io; @@ -40,7 +40,7 @@ import java.text.SimpleDateFormat; * A StreamFeature that thinks it is a GFF feature. * * @author Kim Rutherford - * @version $Id: GFFStreamFeature.java,v 1.43 2006-08-07 14:57:10 tjc Exp $ + * @version $Id: GFFStreamFeature.java,v 1.44 2006-11-21 16:34:51 tjc Exp $ **/ public class GFFStreamFeature extends SimpleDocumentFeature @@ -64,9 +64,7 @@ public class GFFStreamFeature extends SimpleDocumentFeature private boolean visible = true; - /** feature_relationship.rank */ - private int feature_relationship_rank; - /** combined rank store for exons */ + /** combined feature_relationship.rank store for exons */ private Hashtable feature_relationship_rank_store; /** @@ -831,12 +829,12 @@ public class GFFStreamFeature extends SimpleDocumentFeature final String this_token = decode(att_val_list.substring(ind_start, ind_end).trim()); ind_start = ind_end+1; - if(this_token.startsWith("feature_relationship_rank=")) + /*if(this_token.startsWith("feature_relationship_rank=")) { setFeature_relationship_rank( Integer.parseInt(this_token.substring(26)) ); continue; - } + }*/ int index_of_first_space = this_token.indexOf(" "); @@ -1003,14 +1001,5 @@ public class GFFStreamFeature extends SimpleDocumentFeature { this.visible = visible; } - - public int getFeature_relationship_rank() - { - return feature_relationship_rank; - } - public void setFeature_relationship_rank(int feature_relationship_rank) - { - this.feature_relationship_rank = feature_relationship_rank; - } }