refactored to decouple dependencies due to FileParse's derived classes

[jalview.git] / src / jalview / io / AppletFormatAdapter.java

diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java
index 42e881c..5eb4d2b 100755 (executable)
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -463,6 +463,17 @@ public class AppletFormatAdapter
     return null;
   }
 
+  public static String checkProtocol(String file)
+  {
+    String protocol = FILE;
+  
+    if (file.indexOf("http:") > -1 || file.indexOf("file:") > -1)
+    {
+      protocol = URL;
+    }
+    return protocol;
+  }
+
   public static void main(String[] args)
   {
     int i = 0;
@@ -597,11 +608,14 @@ public class AppletFormatAdapter
       if (!fp.isValid())
       {
         fp = null;
-      } else {
-      if (debug)
+      }
+      else
       {
-        System.out.println("Successful.");
-      }}
+        if (debug)
+        {
+          System.out.println("Successful.");
+        }
+      }
     } catch (Exception e)
     {
       if (debug)
@@ -690,4 +704,4 @@ public class AppletFormatAdapter
     }
     return null;
   }
-}
\ No newline at end of file
+}