Skip to content
Snippets Groups Projects
Commit bc4636e7 authored by tjc's avatar tjc
Browse files

use getAllFeatures()

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@2402 ee4ac58c-ac51-4696-9907-e4b3aa274f04
parent 54dce76b
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java,v 1.9 2005-04-19 14:49:47 tjc Exp $ * $Header: //tmp/pathsoft/artemis/uk/ac/sanger/artemis/io/SimpleDocumentEntry.java,v 1.10 2005-04-20 14:54:28 tjc Exp $
*/ */
package uk.ac.sanger.artemis.io; package uk.ac.sanger.artemis.io;
...@@ -37,7 +37,7 @@ import java.util.Enumeration; ...@@ -37,7 +37,7 @@ import java.util.Enumeration;
* This class contains the methods common to all DocumentEntry objects. * This class contains the methods common to all DocumentEntry objects.
* *
* @author Kim Rutherford <kmr@sanger.ac.uk> * @author Kim Rutherford <kmr@sanger.ac.uk>
* @version $Id: SimpleDocumentEntry.java,v 1.9 2005-04-19 14:49:47 tjc Exp $ * @version $Id: SimpleDocumentEntry.java,v 1.10 2005-04-20 14:54:28 tjc Exp $
**/ **/
abstract public class SimpleDocumentEntry abstract public class SimpleDocumentEntry
...@@ -118,7 +118,6 @@ abstract public class SimpleDocumentEntry ...@@ -118,7 +118,6 @@ abstract public class SimpleDocumentEntry
LineGroup new_line_group; LineGroup new_line_group;
Vector gff_regions = null;
boolean isGFF = false; boolean isGFF = false;
while((new_line_group = while((new_line_group =
...@@ -137,13 +136,7 @@ abstract public class SimpleDocumentEntry ...@@ -137,13 +136,7 @@ abstract public class SimpleDocumentEntry
(SimpleDocumentFeature)new_line_group; (SimpleDocumentFeature)new_line_group;
if(new_line_group instanceof GFFStreamFeature) if(new_line_group instanceof GFFStreamFeature)
{
isGFF = true; isGFF = true;
if(gff_regions == null)
gff_regions = new Vector();
gff_regions.add(new_feature);
}
// try several times because adding the Feature may cause more than // try several times because adding the Feature may cause more than
// one exception // one exception
...@@ -240,7 +233,8 @@ abstract public class SimpleDocumentEntry ...@@ -240,7 +233,8 @@ abstract public class SimpleDocumentEntry
// adjust coordinates of features // adjust coordinates of features
if(isGFF) if(isGFF)
{ {
Enumeration gff_features = gff_regions.elements(); FeatureVector gff_regions = getAllFeatures();
Enumeration gff_features = gff_regions.elements();
while(gff_features.hasMoreElements()) while(gff_features.hasMoreElements())
{ {
GFFStreamFeature feature = (GFFStreamFeature)gff_features.nextElement(); GFFStreamFeature feature = (GFFStreamFeature)gff_features.nextElement();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment