X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=ae5c63f883a86b951e0373b898c00101e6703577;hb=6dd554fdbf34db6b79595d5027159d20225f4894;hp=cb9d893a2296a15ef84508aa8e3ba65c7dca10aa;hpb=febd250089c9672b66d2c7a5ed0c06e0763c2233;p=jalview.git diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java index cb9d893..ae5c63f 100644 --- a/src/jalview/bin/JalviewLite.java +++ b/src/jalview/bin/JalviewLite.java @@ -20,30 +20,6 @@ */ package jalview.bin; -import java.applet.Applet; -import java.awt.Button; -import java.awt.Color; -import java.awt.Component; -import java.awt.EventQueue; -import java.awt.Font; -import java.awt.Frame; -import java.awt.Graphics; -import java.awt.event.ActionEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.Hashtable; -import java.util.List; -import java.util.StringTokenizer; -import java.util.Vector; - -import netscape.javascript.JSException; -import netscape.javascript.JSObject; - import jalview.api.StructureSelectionManagerProvider; import jalview.appletgui.AlignFrame; import jalview.appletgui.AlignViewport; @@ -72,6 +48,30 @@ import jalview.structure.SelectionListener; import jalview.structure.StructureSelectionManager; import jalview.util.MessageManager; +import java.applet.Applet; +import java.awt.Button; +import java.awt.Color; +import java.awt.Component; +import java.awt.EventQueue; +import java.awt.Font; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.Hashtable; +import java.util.List; +import java.util.StringTokenizer; +import java.util.Vector; + +import netscape.javascript.JSException; +import netscape.javascript.JSObject; + /** * Jalview Applet. Runs in Java 1.18 runtime * @@ -847,7 +847,7 @@ public class JalviewLite extends Applet implements */ public AlignFrame loadAlignment(String text, String title) { - Alignment al = null; + AlignmentI al = null; String format = new IdentifyFile().Identify(text, AppletFormatAdapter.PASTE); @@ -1242,7 +1242,7 @@ public class JalviewLite extends Applet implements String file = "No file"; - String file2 = "No file"; + String file2 = null; Button launcher = new Button( MessageManager.getString("label.start_jalview")); @@ -1459,7 +1459,7 @@ public class JalviewLite extends Applet implements file = data.toString(); } } - if ("true".equalsIgnoreCase(getParameter("enableSplitFrame"))) + if (TRUE.equalsIgnoreCase(getParameter("enableSplitFrame"))) { file2 = getParameter("file2"); }