2323
2424import org .biojava .nbio .core .exceptions .ParserException ;
2525import org .biojava .nbio .core .sequence .AccessionID ;
26- import org .biojava .nbio .core .sequence .DNASequence ;
2726import org .biojava .nbio .core .sequence .DataSource ;
2827import org .biojava .nbio .core .sequence .Strand ;
2928import org .biojava .nbio .core .sequence .location .template .AbstractLocation ;
3029import org .biojava .nbio .core .sequence .location .template .Location ;
3130import org .biojava .nbio .core .sequence .location .template .Point ;
32- import org .biojava .nbio .core .sequence .template .AbstractSequence ;
33- import org .biojava .nbio .core .sequence .template .Compound ;
3431
3532import java .util .ArrayList ;
3633import java .util .List ;
4542 * @author jgrzebyta
4643 * @author Paolo Pavan
4744 */
48- public class InsdcParser < S extends AbstractSequence < C >, C extends Compound > {
45+ public class InsdcParser {
4946
5047 private boolean isSequenceCircular ;
5148 private long sequenceLength ;
@@ -56,10 +53,6 @@ public class InsdcParser <S extends AbstractSequence<C>, C extends Compound>{
5653 * parse a location. if group(1) is null than the feature is on the positive
5754 * strand, group(2) start position, group(3) end position.
5855 */
59- // why in the location the first character was ignored?
60- //protected static final Pattern singleLocationPattern = Pattern.compile("(?:[A-Z]([A-Za-z\\.0-9_]*?):)?(<?)(\\d+)(\\.{2}|\\^)?(>?)(\\d+)?(>?)?");
61-
62- // fixed issue #254
6356 protected static final Pattern singleLocationPattern = Pattern .compile ("(?:([A-Za-z\\ .0-9_]*?):)?(<?)(\\ d+)(\\ .{2}|\\ ^)?(>?)(\\ d+)?(>?)?" );
6457 /**
6558 * Decodes a split pattern. Split patterns are a composition of multiple
@@ -95,9 +88,6 @@ public class InsdcParser <S extends AbstractSequence<C>, C extends Compound>{
9588 */
9689 protected Integer featureGlobalStart , featureGlobalEnd ;
9790
98- //private S referenceSequence = new org.biojava.nbio.core.sequence.DNASequence();
99- private AbstractSequence referenceSequence = new DNASequence ();
100-
10191 enum complexFeaturesAppendEnum {
10292
10393 FLATTEN , HIERARCHICAL ;
@@ -165,7 +155,6 @@ private List<Location> parseLocationString(String string, int versus) throws Par
165155 Matcher m ;
166156 List <Location > boundedLocationsCollection = new ArrayList <Location >();
167157
168- //String[] tokens = string.split(locationSplitPattern);
169158 List <String > tokens = splitString (string );
170159 for (String t : tokens ) {
171160 m = genbankSplitPattern .matcher (t );
0 commit comments