From 8c0e6138df69c25d3411cb23a03554bb0cbdd53f Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Mon, 13 Nov 2006 17:46:44 +0000 Subject: [PATCH] REload from URL --- src/jalview/gui/AlignFrame.java | 5 +++-- src/jalview/gui/Jalview2XML_V1.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index 9e0bae6..be46dfa 100755 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -563,7 +563,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener else { viewport.alignment.deleteAllGroups(); - viewport.sequenceColours.clear(); + viewport.sequenceColours=null; while (viewport.alignment.getHeight() > 0) { viewport.alignment.deleteSequence(0); @@ -583,7 +583,8 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener } FileLoader loader = new FileLoader(); - loader.LoadFile(viewport, fileName, "File", currentFileFormat); + String protocol = fileName.startsWith("http:")? "URL":"File"; + loader.LoadFile(viewport, fileName, protocol, currentFileFormat); } } diff --git a/src/jalview/gui/Jalview2XML_V1.java b/src/jalview/gui/Jalview2XML_V1.java index 1e479fb..491746a 100755 --- a/src/jalview/gui/Jalview2XML_V1.java +++ b/src/jalview/gui/Jalview2XML_V1.java @@ -132,7 +132,7 @@ public class Jalview2XML_V1 object = (JalviewModel) object.unmarshal(in); - af = LoadFromObject(object); + af = LoadFromObject(object, file); entryCount++; } } @@ -164,7 +164,7 @@ public class Jalview2XML_V1 return af; } - AlignFrame LoadFromObject(JalviewModel object) + AlignFrame LoadFromObject(JalviewModel object, String file) { Vector seqids = new Vector(); SequenceSet vamsasSet = object.getVamsasModel().getSequenceSet(0); @@ -268,6 +268,8 @@ public class Jalview2XML_V1 AlignFrame af = new AlignFrame(al, view.getWidth(), view.getHeight()); + af.setFileName(file, "Jalview"); + for (int i = 0; i < JSEQ.length; i++) { af.viewport.setSequenceColour( -- 1.7.10.2