X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fpacked%2FParsePackedSet.java;fp=src%2Fjalview%2Fio%2Fpacked%2FParsePackedSet.java;h=fda4faa3e30a58abecd4b6f3abae18e14cc16697;hp=a4ef77e990e1ea6021dfc303bd3d38e37ccdb6da;hb=67b3acb8df1438ef37a756c04e14f5a3b8406808;hpb=aa91e8c4561c2dd0f18760e18fb0052979733bf8 diff --git a/src/jalview/io/packed/ParsePackedSet.java b/src/jalview/io/packed/ParsePackedSet.java index a4ef77e..fda4faa 100644 --- a/src/jalview/io/packed/ParsePackedSet.java +++ b/src/jalview/io/packed/ParsePackedSet.java @@ -21,10 +21,13 @@ package jalview.io.packed; import jalview.datamodel.AlignmentI; +import jalview.io.AnnotationFile; import jalview.io.AppletFormatAdapter; +import jalview.io.FeaturesFile; import jalview.io.FileParse; import jalview.io.FormatAdapter; import jalview.io.IdentifyFile; +import jalview.io.NewickFile; import jalview.io.packed.DataProvider.JvDataType; import java.io.BufferedReader; @@ -124,7 +127,7 @@ public class ParsePackedSet br = new BufferedReader(src.getReader()); } // TODO: add columnSelection to context - if (new jalview.io.AnnotationFile().parseAnnotationFrom( + if (new AnnotationFile().parseAnnotationFrom( context.getLastAlignment(), null, br)) { context.updateSetModified(true); @@ -161,7 +164,7 @@ public class ParsePackedSet } try { - jalview.io.FeaturesFile ff = new jalview.io.FeaturesFile(src); + FeaturesFile ff = new FeaturesFile(src); context.updateSetModified(ff.parse(context.getLastAlignment(), context.featureColours, false, context.relaxedIdMatching)); } catch (Exception e) @@ -174,7 +177,7 @@ public class ParsePackedSet { try { - jalview.io.NewickFile nf = new jalview.io.NewickFile(src); + NewickFile nf = new NewickFile(src); if (!nf.isValid()) { nf.close();