X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLite.java;h=68769761536f1f23e37a6545cdaa2f7b8a95db22;hb=03c446f178b6a0b61ad33cb219398132d640fbef;hp=a26b9d05b83c26ac560cbbeb3f33fb2dccdc5537;hpb=8f8dbc28e40a7e23e984882191ef2f9772bb1dbb;p=jalview.git diff --git a/src/jalview/bin/JalviewLite.java b/src/jalview/bin/JalviewLite.java index a26b9d0..6876976 100755 --- a/src/jalview/bin/JalviewLite.java +++ b/src/jalview/bin/JalviewLite.java @@ -45,7 +45,13 @@ public class JalviewLite extends Applet String file = "No file"; Button launcher = new Button("Start Jalview"); + //The currentAlignFrame is static, it will change + //if and when the user selects a new window static AlignFrame currentAlignFrame; + + //This is the first frame to be displayed, and does not change + AlignFrame initialAlignFrame; + boolean embedded = false; @@ -82,17 +88,13 @@ public class JalviewLite extends Applet this.setBackground(new Color(r, g, b)); file = getParameter("file"); - if(file.indexOf("://")==-1) - file = getCodeBase() + file; final JalviewLite applet = this; if(getParameter("embedded")!=null && getParameter("embedded").equalsIgnoreCase("true")) { embedded = true; - LoadingThread loader = new LoadingThread(file, - "URL", - applet); + LoadingThread loader = new LoadingThread(file, applet); loader.start(); } else if (file != null) @@ -104,7 +106,6 @@ public class JalviewLite extends Applet public void actionPerformed(ActionEvent e) { LoadingThread loader = new LoadingThread(file, - "URL", applet); loader.start(); } @@ -126,12 +127,18 @@ public class JalviewLite extends Applet System.exit(1); } - String format = jalview.io.IdentifyFile.Identify(args[0],"File"); - SequenceI[] sequences = new AppletFormatAdapter().readFile(args[0], "File", format); + String format = new jalview.io.IdentifyFile().Identify(args[0],AppletFormatAdapter.FILE); + SequenceI[] sequences = null; + try{ + sequences = new AppletFormatAdapter().readFile(args[0], AppletFormatAdapter.FILE, format); + }catch(java.io.IOException ex) + { + ex.printStackTrace(); + } if ( (sequences != null) && (sequences.length > 0)) { - AlignFrame af = new AlignFrame(new Alignment(sequences), null, args[0]); + AlignFrame af = new AlignFrame(new Alignment(sequences), null, args[0], false); af.statusBar.setText("Successfully loaded file " + args[0]); } } @@ -162,7 +169,7 @@ public class JalviewLite extends Applet currentAlignFrame = null; } lastFrameX -=40; - lastFrameY-=40; + lastFrameY -=40; frame.setMenuBar(null); frame.dispose(); } @@ -176,6 +183,23 @@ public class JalviewLite extends Applet frame.setVisible(true); } + public String getSelectedSequences() + { + StringBuffer result = new StringBuffer(""); + + if(initialAlignFrame.viewport.getSelectionGroup()!=null) + { + SequenceI[] seqs = initialAlignFrame.viewport.getSelectionGroup(). + getSequencesInOrder( + initialAlignFrame.viewport.getAlignment()); + + for (int i = 0; i < seqs.length; i++) + result.append(seqs[i].getName() + "¬"); + } + + return result.toString(); + } + public String getAlignment(String format) { return getAlignment(format, "true"); @@ -234,27 +258,40 @@ public class JalviewLite extends Applet String format; JalviewLite applet; - public LoadingThread(String file, - String protocol, - JalviewLite applet) + public LoadingThread(String _file, + JalviewLite _applet) { - this.file = file; - this.protocol = protocol; - format = jalview.io.IdentifyFile.Identify(file, "URL"); - this.applet = applet; + file = _file; + if(inArchive(file)) + protocol = AppletFormatAdapter.CLASSLOADER; + else + { + file = addProtocol(file); + protocol = AppletFormatAdapter.URL; + } + format = new jalview.io.IdentifyFile().Identify(file, protocol); + applet = _applet; } public void run() { SequenceI[] sequences = null; - sequences = new AppletFormatAdapter().readFile(file, protocol, format); - + try{ + sequences = new AppletFormatAdapter().readFile(file, protocol, + format); + }catch(java.io.IOException ex) + { + ex.printStackTrace(); + } if ((sequences != null) && (sequences.length > 0)) { currentAlignFrame = new AlignFrame(new Alignment(sequences), - applet, file); - if (embedded) - currentAlignFrame.setEmbedded(); + applet, + file, + embedded); + + + initialAlignFrame = currentAlignFrame; currentAlignFrame.statusBar.setText("Successfully loaded file " + file); @@ -262,23 +299,23 @@ public class JalviewLite extends Applet String treeFile = applet.getParameter("treeFile"); if (treeFile != null) { - if (treeFile.indexOf("://") == -1) - treeFile = getCodeBase() + treeFile; - try { - jalview.io.NewickFile fin = new jalview.io.NewickFile(applet. - getCodeBase() + treeFile, "URL"); + if(inArchive(treeFile)) + protocol = AppletFormatAdapter.CLASSLOADER; + else + { + protocol = AppletFormatAdapter.URL; + treeFile = addProtocol(treeFile); + } + + jalview.io.NewickFile fin = new jalview.io.NewickFile(treeFile, protocol); + fin.parse(); if (fin.getTree() != null) { - TreePanel tp = null; - tp = new TreePanel(currentAlignFrame.viewport, - currentAlignFrame.viewport.getAlignment().getSequences(), - fin, "FromFile", applet.getCodeBase() + treeFile); - addFrame(tp, treeFile, 600, 500); - currentAlignFrame.addTreeMenuItem(tp, treeFile); + currentAlignFrame.loadTree(fin, treeFile); } } catch (Exception ex) @@ -290,8 +327,8 @@ public class JalviewLite extends Applet String param = getParameter("features"); if (param != null) { - if (param.indexOf("://") == -1) - param = getCodeBase() + param; + if( !inArchive(param) ) + param = addProtocol( param ); currentAlignFrame.parseFeaturesFile(param); } @@ -299,28 +336,35 @@ public class JalviewLite extends Applet param = getParameter("annotations"); if (param != null) { - if (param.indexOf("://") == -1) - param = getCodeBase() + param; + if( !inArchive(param) ) + param = addProtocol( param ); new AnnotationReader().readAnnotationFile( currentAlignFrame.viewport.getAlignment(), param); currentAlignFrame.alignPanel.fontChanged(); + currentAlignFrame.alignPanel.setScrollValues(0,0); + } String pdbfile = applet.getParameter("PDBFILE"); if(pdbfile!=null) { - if(pdbfile.indexOf("://")==-1) - pdbfile = getCodeBase() + pdbfile; + if( inArchive(pdbfile) ) + protocol = AppletFormatAdapter.CLASSLOADER; + else + { + protocol = AppletFormatAdapter.URL; + pdbfile = addProtocol(pdbfile); + } String sequence = applet.getParameter("PDBSEQ"); if(sequence!=null) { - new MCview.AppletPDBViewer(pdbfile, "URL", + new MCview.AppletPDBViewer(pdbfile, protocol, (Sequence)currentAlignFrame.getAlignViewport().getAlignment().findName(sequence), currentAlignFrame.getSeqcanvas()); } @@ -334,5 +378,32 @@ public class JalviewLite extends Applet repaint(); } } + + /** + * Discovers whether the given file is in the Applet Archive + * @param file String + * @return boolean + */ + boolean inArchive(String file) + { + //This might throw a security exception in certain browsers + //Netscape Communicator for instance. + try{ + return (getClass().getResourceAsStream("/" + file) != null); + }catch(Exception ex) + { + System.out.println("Exception checking resources: "+file+" "+ex); + return false; + } + } + + String addProtocol(String file) + { + if (file.indexOf("://") == -1) + file = getCodeBase() + file; + + return file; + } + } }