X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=33226894c7c6a8ef18bd3e71a182543be1fcca0c;hb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;hp=29f5632664a55f1069473879b0e7c28cbb69118c;hpb=13953b6236c6b5de369e3598358d833e07328508;p=jalview.git diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java index 29f5632..3322689 100755 --- a/src/jalview/io/FileLoader.java +++ b/src/jalview/io/FileLoader.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -277,7 +277,7 @@ public class FileLoader implements Runnable .println("IMPLEMENTATION ERROR: Cannot read consecutive Jalview XML projects from a stream."); // We read the data anyway - it might make sense. } - alignFrame = new Jalview2XML(raiseGUI).LoadJalviewAlign(file); + alignFrame = new Jalview2XML(raiseGUI).loadJalviewAlign(file); } else { @@ -332,13 +332,7 @@ public class FileLoader implements Runnable } if (viewport != null) { - // TODO: create undo object for this JAL-1101 - for (int i = 0; i < al.getHeight(); i++) - { - viewport.getAlignment().addSequence(al.getSequenceAt(i)); - } - viewport.firePropertyChange("alignment", null, viewport - .getAlignment().getSequences()); + viewport.addAlignment(al, title); } else { @@ -355,8 +349,7 @@ public class FileLoader implements Runnable } if (source instanceof HtmlFile) { - ((HtmlFile) source).LoadAlignmentFeatures(alignFrame -); + ((HtmlFile) source).LoadAlignmentFeatures(alignFrame); } if (raiseGUI)