\r
import java.awt.*;\r
import java.awt.event.*;\r
-import jalview.appletgui.TreePanel;\r
\r
\r
/**\r
\r
file = getParameter("file");\r
\r
+ if(file==null)\r
+ {\r
+ //Maybe the sequences are added as parameters\r
+ StringBuffer data = new StringBuffer("PASTE");\r
+ int i=1;\r
+ while( (file=getParameter("sequence"+i))!=null)\r
+ {\r
+ data.append(file.toString()+"\n");\r
+ i++;\r
+ }\r
+ if(data.length()>5)\r
+ file = data.toString();\r
+ }\r
+\r
final JalviewLite applet = this;\r
if(getParameter("embedded")!=null\r
&& getParameter("embedded").equalsIgnoreCase("true"))\r
JalviewLite _applet)\r
{\r
file = _file;\r
- if(inArchive(file))\r
+ if(file.startsWith("PASTE"))\r
+ {\r
+ file = file.substring(5);\r
+ protocol = AppletFormatAdapter.PASTE;\r
+ }\r
+ else if(inArchive(file))\r
protocol = AppletFormatAdapter.CLASSLOADER;\r
else\r
{\r
file,\r
embedded);\r
\r
+ if(protocol==jalview.io.AppletFormatAdapter.PASTE)\r
+ currentAlignFrame.setTitle("Sequences from "+getDocumentBase());\r
+\r
initialAlignFrame = currentAlignFrame;\r
\r
currentAlignFrame.statusBar.setText("Successfully loaded file " + file);\r
\r
\r
- String treeFile = applet.getParameter("treeFile");\r
+ String treeFile = applet.getParameter("tree");\r
+ if(treeFile==null)\r
+ applet.getParameter("treeFile");\r
if (treeFile != null)\r
{\r
try\r
if( !inArchive(param) )\r
param = addProtocol( param );\r
\r
- currentAlignFrame.parseFeaturesFile(param);\r
+ currentAlignFrame.parseFeaturesFile(param, protocol);\r
+ }\r
+\r
+ param = getParameter("showFeatureSettings");\r
+ if(param !=null && param.equalsIgnoreCase("true"))\r
+ {\r
+ currentAlignFrame.viewport.showSequenceFeatures(true);\r
+ currentAlignFrame.featureSettings_actionPerformed();\r
}\r
\r
param = getParameter("annotations");\r
if( !inArchive(param) )\r
param = addProtocol( param );\r
\r
- new AnnotationReader().readAnnotationFile(\r
+ new AnnotationFile().readAnnotationFile(\r
currentAlignFrame.viewport.getAlignment(),\r
param);\r
\r
currentAlignFrame.alignPanel.fontChanged();\r
+ currentAlignFrame.alignPanel.setScrollValues(0,0);\r
+\r
+ }\r
+\r
+ param = getParameter("jnetfile");\r
+ if (param != null)\r
+ {\r
+ try\r
+ {\r
+ if (inArchive(param))\r
+ protocol = AppletFormatAdapter.CLASSLOADER;\r
+ else\r
+ {\r
+ protocol = AppletFormatAdapter.URL;\r
+ param = addProtocol(param);\r
+ }\r
+\r
+ jalview.io.JPredFile predictions = new jalview.io.JPredFile(\r
+ param, protocol);\r
+ new JnetAnnotationMaker().add_annotation(predictions,\r
+ currentAlignFrame.viewport.getAlignment(),\r
+ 0,false); // do not add sequence profile from concise output\r
+ currentAlignFrame.alignPanel.fontChanged();\r
+ currentAlignFrame.alignPanel.setScrollValues(0, 0);\r
+ } catch (Exception ex) {\r
+ ex.printStackTrace();\r
+ }\r
}\r
\r
\r