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
frameListener must call close if AlignFrame
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLite.java
diff --git
a/src/jalview/bin/JalviewLite.java
b/src/jalview/bin/JalviewLite.java
index
f1464b6
..
1fbb82e
100755
(executable)
--- a/
src/jalview/bin/JalviewLite.java
+++ b/
src/jalview/bin/JalviewLite.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-28,6
+28,7
@@
import java.applet.*;
\r
import java.awt.*;
\r
import java.awt.event.*;
\r
\r
import java.awt.*;
\r
import java.awt.event.*;
\r
+import jalview.appletgui.FeatureSettings;
\r
\r
\r
/**
\r
\r
\r
/**
\r
@@
-46,7
+47,7
@@
public class JalviewLite extends Applet
\r
//The currentAlignFrame is static, it will change
\r
//if and when the user selects a new window
\r
\r
//The currentAlignFrame is static, it will change
\r
//if and when the user selects a new window
\r
- static AlignFrame currentAlignFrame;
\r
+ public static AlignFrame currentAlignFrame;
\r
\r
//This is the first frame to be displayed, and does not change
\r
AlignFrame initialAlignFrame;
\r
\r
//This is the first frame to be displayed, and does not change
\r
AlignFrame initialAlignFrame;
\r
@@
-177,6
+178,8
@@
public class JalviewLite extends Applet
{
\r
public void windowClosing(WindowEvent e)
\r
{
\r
{
\r
public void windowClosing(WindowEvent e)
\r
{
\r
+ if(frame instanceof AlignFrame)
\r
+ ((AlignFrame)frame).closeMenuItem_actionPerformed();
\r
if(currentAlignFrame == frame)
\r
{
\r
currentAlignFrame = null;
\r
if(currentAlignFrame == frame)
\r
{
\r
currentAlignFrame = null;
\r
@@
-277,6
+280,7
@@
public class JalviewLite extends Applet
file = _file;
\r
if(file.startsWith("PASTE"))
\r
{
\r
file = _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.PASTE;
\r
}
\r
else if(inArchive(file))
\r
@@
-307,6
+311,8
@@
public class JalviewLite extends Applet
file,
\r
embedded);
\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
\r
initialAlignFrame = currentAlignFrame;
\r
\r
@@
-315,7
+321,8
@@
public class JalviewLite extends Applet
\r
String treeFile = applet.getParameter("tree");
\r
if(treeFile==null)
\r
\r
String treeFile = applet.getParameter("tree");
\r
if(treeFile==null)
\r
- applet.getParameter("treeFile");
\r
+ treeFile = applet.getParameter("treeFile");
\r
+
\r
if (treeFile != null)
\r
{
\r
try
\r
if (treeFile != null)
\r
{
\r
try
\r
@@
-356,7
+363,7
@@
public class JalviewLite extends Applet
if(param !=null && param.equalsIgnoreCase("true"))
\r
{
\r
currentAlignFrame.viewport.showSequenceFeatures(true);
\r
if(param !=null && param.equalsIgnoreCase("true"))
\r
{
\r
currentAlignFrame.viewport.showSequenceFeatures(true);
\r
- currentAlignFrame.featureSettings_actionPerformed();
\r
+ new FeatureSettings(currentAlignFrame.alignPanel);
\r
}
\r
\r
param = getParameter("annotations");
\r
}
\r
\r
param = getParameter("annotations");
\r