JAL-934 - refactor to use label font functions

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

diff --git a/src/jalview/io/AppletFormatAdapter.java b/src/jalview/io/AppletFormatAdapter.java
index b1952a9..db4b49d 100755 (executable)
--- a/src/jalview/io/AppletFormatAdapter.java
+++ b/src/jalview/io/AppletFormatAdapter.java
@@ -117,7 +117,18 @@ public class AppletFormatAdapter
   AlignFile afile = null;
 
   String inFile;
-
+  /**
+   * character used to write newlines 
+   */
+  protected String newline = System.getProperty("line.separator");
+  public void setNewlineString(String nl)
+  {
+    newline = nl;
+  }
+  public String getNewlineString()
+  {
+    return newline;
+  }
   /**
    * check that this format is valid for reading
    * 
@@ -441,7 +452,7 @@ public class AppletFormatAdapter
         throw new Exception(
                 "Implementation error: Unknown file format string");
       }
-
+      afile.setNewlineString(newline);
       afile.addJVSuffix(jvsuffix);
 
       afile.setSeqs(alignment.getSequencesArray());
@@ -463,6 +474,17 @@ public class AppletFormatAdapter
     return null;
   }
 
+  public static String checkProtocol(String file)
+  {
+    String protocol = FILE;
+    String ft = file.toLowerCase().trim();
+    if (ft.indexOf("http:") ==0 || ft.indexOf("https:") ==0 || ft.indexOf("file:") == 0)
+    {
+      protocol = URL;
+    }
+    return protocol;
+  }
+
   public static void main(String[] args)
   {
     int i = 0;