REload from URL

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 9e0bae6..be46dfa 100755 (executable)
--- 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 (executable)
--- a/src/jalview/gui/Jalview2XML_V1.java
+++ b/src/jalview/gui/Jalview2XML_V1.java
@@ -132,7 +132,7 @@ public class Jalview2XML_V1
 \r
                     object = (JalviewModel) object.unmarshal(in);\r
 \r
-                    af = LoadFromObject(object);\r
+                    af = LoadFromObject(object, file);\r
                     entryCount++;\r
                 }\r
             }\r
@@ -164,7 +164,7 @@ public class Jalview2XML_V1
         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
@@ -268,6 +268,8 @@ public class Jalview2XML_V1
 \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