X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FMouseOverStructureListener.java;fp=src%2Fjalview%2Fjavascript%2FMouseOverStructureListener.java;h=199db46b2af510682edfea49e6ec4496ae1fd59a;hb=e411c801ba976142e207e28f196d59ab24507767;hp=176c881b36707e37de04529640852f44651a9fba;hpb=95e1400e3e807ec4eb7fb23e6d2ae2519416baa3;p=jalview.git

diff --git a/src/jalview/javascript/MouseOverStructureListener.java b/src/jalview/javascript/MouseOverStructureListener.java
index 176c881..199db46 100644
--- a/src/jalview/javascript/MouseOverStructureListener.java
+++ b/src/jalview/javascript/MouseOverStructureListener.java
@@ -32,6 +32,7 @@ import jalview.structure.StructureListener;
 import jalview.structure.StructureMapping;
 import jalview.structure.StructureMappingcommandSet;
 import jalview.structure.StructureSelectionManager;
+import jalview.util.HttpUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -105,7 +106,7 @@ public class MouseOverStructureListener extends JSFunctionExec implements
   public String resolveModelFile(String file)
   {
     // TODO reuse JalviewLite.LoadingThread.addProtocol instead
-    if (isValidUrl(file))
+    if (HttpUtils.isValidUrl(file))
     {
       return file;
     }
@@ -113,13 +114,13 @@ public class MouseOverStructureListener extends JSFunctionExec implements
     String db = jvlite.getDocumentBase().toString();
     db = db.substring(0, db.lastIndexOf("/"));
     String docBaseFile = db + "/" + file;
-    if (isValidUrl(docBaseFile))
+    if (HttpUtils.isValidUrl(docBaseFile))
     {
       return docBaseFile;
     }
 
     String cb = jvlite.getCodeBase() + file;
-    if (isValidUrl(cb))
+    if (HttpUtils.isValidUrl(cb))
     {
       return cb;
     }
@@ -127,43 +128,6 @@ public class MouseOverStructureListener extends JSFunctionExec implements
     return file;
   }
 
-  /**
-   * Returns true if it is possible to open an input stream at the given URL,
-   * else false. The input stream is closed.
-   * 
-   * @param file
-   * @return
-   */
-  private boolean isValidUrl(String file)
-  {
-    InputStream is = null;
-    try
-    {
-      is = new URL(file).openStream();
-      if (is != null)
-      {
-        return true;
-      }
-    } catch (IOException x)
-    {
-      // MalformedURLException, FileNotFoundException
-      return false;
-    } finally
-    {
-      if (is != null)
-      {
-        try
-        {
-          is.close();
-        } catch (IOException e)
-        {
-          // ignore
-        }
-      }
-    }
-    return false;
-  }
-
   @Override
   public String[] getPdbFile()
   {