else
{
viewport.alignment.deleteAllGroups();
- viewport.sequenceColours.clear();
+ viewport.sequenceColours=null;
while (viewport.alignment.getHeight() > 0)
{
viewport.alignment.deleteSequence(0);
}
FileLoader loader = new FileLoader();
- loader.LoadFile(viewport, fileName, "File", currentFileFormat);
+ String protocol = fileName.startsWith("http:")? "URL":"File";
+ loader.LoadFile(viewport, fileName, protocol, currentFileFormat);
}
}
\r
object = (JalviewModel) object.unmarshal(in);\r
\r
- af = LoadFromObject(object);\r
+ af = LoadFromObject(object, file);\r
entryCount++;\r
}\r
}\r
return af;\r
}\r
\r
- AlignFrame LoadFromObject(JalviewModel object)\r
+ AlignFrame LoadFromObject(JalviewModel object, String file)\r
{\r
Vector seqids = new Vector();\r
SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0);\r
\r
AlignFrame af = new AlignFrame(al, view.getWidth(), view.getHeight());\r
\r
+ af.setFileName(file, "Jalview");\r
+\r
for (int i = 0; i < JSEQ.length; i++)\r
{\r
af.viewport.setSequenceColour(\r