git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1831 update all maxItems annotation to the max value for a 32-bit signed binary...
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLite.java
diff --git
a/src/jalview/bin/JalviewLite.java
b/src/jalview/bin/JalviewLite.java
index
c0a8d73
..
8a9c54b
100644
(file)
--- a/
src/jalview/bin/JalviewLite.java
+++ b/
src/jalview/bin/JalviewLite.java
@@
-69,7
+69,6
@@
import java.util.List;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.StringTokenizer;
import java.util.Vector;
-import netscape.javascript.JSException;
import netscape.javascript.JSObject;
/**
import netscape.javascript.JSObject;
/**
@@
-847,7
+846,7
@@
public class JalviewLite extends Applet implements
*/
public AlignFrame loadAlignment(String text, String title)
{
*/
public AlignFrame loadAlignment(String text, String title)
{
- Alignment al = null;
+ AlignmentI al = null;
String format = new IdentifyFile().Identify(text,
AppletFormatAdapter.PASTE);
String format = new IdentifyFile().Identify(text,
AppletFormatAdapter.PASTE);
@@
-1242,7
+1241,7
@@
public class JalviewLite extends Applet implements
String file = "No file";
String file = "No file";
- String file2 = "No file";
+ String file2 = null;
Button launcher = new Button(
MessageManager.getString("label.start_jalview"));
Button launcher = new Button(
MessageManager.getString("label.start_jalview"));
@@
-1459,7
+1458,10
@@
public class JalviewLite extends Applet implements
file = data.toString();
}
}
file = data.toString();
}
}
- file2 = getParameter("file2");
+ if (TRUE.equalsIgnoreCase(getParameter("enableSplitFrame")))
+ {
+ file2 = getParameter("file2");
+ }
embedded = TRUE.equalsIgnoreCase(getParameter("embedded"));
if (embedded)
embedded = TRUE.equalsIgnoreCase(getParameter("embedded"));
if (embedded)
@@
-1530,7
+1532,7
@@
public class JalviewLite extends Applet implements
{
notFailed = true;
}
{
notFailed = true;
}
- } catch (JSException jsex)
+ } catch (Exception jsex)
{
System.err.println("Attempt " + tries
+ " to access LiveConnect javascript failed.");
{
System.err.println("Attempt " + tries
+ " to access LiveConnect javascript failed.");