From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 13 Nov 2006 17:46:44 +0000 (+0000)
Subject: REload from URL
X-Git-Tag: Release_2_2~124
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8c0e6138df69c25d3411cb23a03554bb0cbdd53f;hp=7f7fc2e5533f7b00c86465f964e37c55bcf12fd7;p=jalview.git

REload from URL
---

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(