import java.util.*;
import javax.swing.*;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
/**
* DOCUMENT ME!
{
if (jalview.bin.Cache.vamsasJarsPresent())
{
+ setupVamsasDisconnectedGui();
VamsasMenu.setVisible(true);
- vamsasLoad.setVisible(true);
+ final Desktop us = this;
+ VamsasMenu.addMenuListener(new MenuListener() {
+ // this listener remembers when the menu was first selected, and
+ // doesn't rebuild the session list until it has been cleared and
+ // reselected again.
+ boolean refresh=true;
+ public void menuCanceled(MenuEvent e)
+ {
+ refresh=true;
+ }
+
+ public void menuDeselected(MenuEvent e)
+ {
+ refresh = true;
+ }
+
+ public void menuSelected(MenuEvent e)
+ {
+ if (refresh)
+ {
+ us.buildVamsasStMenu();
+ refresh=false;
+ }
+ }
+ });
+ vamsasStart.setVisible(true);
}
}
}
jalview.gui.VamsasApplication v_client = null;
- public void vamsasLoad_actionPerformed(ActionEvent e)
+ public void vamsasImport_actionPerformed(ActionEvent e)
+ {
+ if (v_client==null)
+ {
+ // Load and try to start a session.
+ JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+ getProperty("LAST_DIRECTORY"));
+
+ chooser.setFileView(new JalviewFileView());
+ chooser.setDialogTitle("Open a saved VAMSAS session");
+ chooser.setToolTipText("select a vamsas session to be opened as a new vamsas session.");
+
+ int value = chooser.showOpenDialog(this);
+
+ if (value == JalviewFileChooser.APPROVE_OPTION)
+ {
+ try {
+ v_client = new jalview.gui.VamsasApplication(this,
+ chooser.getSelectedFile());
+ } catch (Exception ex)
+ {
+ jalview.bin.Cache.log.error("New vamsas session from existing session file failed:",ex);
+ return;
+ }
+ setupVamsasConnectedGui();
+ v_client.initial_update(); // TODO: thread ?
+ }
+ }else {
+ jalview.bin.Cache.log.error("Implementation error - load session from a running session is not supported.");
+ }
+ }
+
+ public void vamsasStart_actionPerformed(ActionEvent e)
{
if (v_client == null)
{
*
*/
v_client = new VamsasApplication(this);
- vamsasLoad.setText("Session Update");
- vamsasStop.setVisible(true);
- v_client.initial_update();
+ setupVamsasConnectedGui();
+ v_client.initial_update(); // TODO: thread ?
}
else
{
// store current data in session.
- v_client.push_update();
+ v_client.push_update(); // TODO: thread
}
}
+ protected void setupVamsasConnectedGui()
+ {
+ vamsasStart.setText("Session Update");
+ vamsasSave.setVisible(true);
+ vamsasStop.setVisible(true);
+ vamsasImport.setVisible(true);
+ }
+ protected void setupVamsasDisconnectedGui()
+ {
+ vamsasSave.setVisible(false);
+ vamsasStop.setVisible(false);
+ vamsasImport.setVisible(true);
+ vamsasStart.setText("New Vamsas Session...");
+ }
+
public void vamsasStop_actionPerformed(ActionEvent e)
{
if (v_client != null)
{
v_client.end_session();
v_client = null;
- this.vamsasStop.setVisible(false);
- this.vamsasLoad.setText("Start Vamsas Session...");
+ setupVamsasDisconnectedGui();
}
}
+ protected void buildVamsasStMenu()
+ {
+ if (v_client == null)
+ {
+ String[] sess = null;
+ try
+ {
+ sess = VamsasApplication.getSessionList();
+ } catch (Exception e)
+ {
+ jalview.bin.Cache.log.warn(
+ "Problem getting current sessions list.", e);
+ sess = null;
+ }
+ if (sess != null)
+ {
+ jalview.bin.Cache.log.debug("Got current sessions list: "
+ + sess.length + " entries.");
+ VamsasStMenu.removeAll();
+ for (int i = 0; i < sess.length; i++)
+ {
+ JMenuItem sessit = new JMenuItem();
+ sessit.setText(sess[i]);
+ sessit.setToolTipText("Connect to session " + sess[i]);
+ final Desktop dsktp = this;
+ final String mysesid = sess[i];
+ sessit.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ if (dsktp.v_client == null)
+ {
+ dsktp.v_client = new VamsasApplication(dsktp, mysesid);
+ dsktp.setupVamsasConnectedGui();
+ dsktp.v_client.initial_update();
+ }
+ };
+ });
+ VamsasStMenu.add(sessit);
+ }
+ VamsasStMenu.setVisible(true);
+ }
+ else
+ {
+ jalview.bin.Cache.log.debug("No current vamsas sessions.");
+ VamsasStMenu.removeAll();
+ VamsasStMenu.setVisible(false);
+ }
+ } else {
+ // Not interested in the content. Just hide ourselves.
+ VamsasStMenu.setVisible(false);
+ }
+ }
public void vamsasSave_actionPerformed(ActionEvent e)
{
if (v_client != null)
{
jalview.bin.Cache.log.debug("Setting gui for Vamsas update " +
(b ? "in progress" : "finished"));
- vamsasLoad.setVisible(!b);
+ vamsasStart.setVisible(!b);
vamsasStop.setVisible(!b);
-
+ vamsasSave.setVisible(!b);
}
public JInternalFrame[] getAllFrames()
private static uk.ac.vamsas.client.IClientFactory getClientFactory() throws IOException {
return new uk.ac.vamsas.client.simpleclient.SimpleClientFactory();
}
+ /**
+ * Start a new vamsas session
+ * @param jdesktop
+ */
public VamsasApplication(Desktop jdesktop)
{
this.jdesktop = jdesktop;
initClientSession(null);
}
/**
+ * init a connection to the session at the given url
+ * @param jdesktop
+ * @param sessionUrl
+ */
+ public VamsasApplication(Desktop jdesktop, String sessionUrl)
+ {
+ this.jdesktop = jdesktop;
+ initClientSession(sessionUrl);
+ }
+ /**
* @throws IOException or other if clientfactory instantiation failed.
* @return list of current sessions or null if no session exists.
*/
uk.ac.vamsas.client.IClientFactory clientfactory = getClientFactory();
if (sess==null)
{
- vclient = clientfactory.getIClient(app);
+ vclient = clientfactory.getNewSessionIClient(app);
}
else
{
user = vclient.getUserHandle();
- } catch (NoDefaultSessionException e)
- {
- return false;
- }
+ }
catch (Exception e)
{
jalview.bin.Cache.log.error("Couldn't instantiate vamsas client !",e);
import java.awt.*;
import java.awt.event.*;
+
import javax.swing.*;
/**
JMenu FileMenu = new JMenu();
JMenu HelpMenu = new JMenu();
protected JMenu VamsasMenu = new JMenu();
+ protected JMenu VamsasStMenu = new JMenu();
JMenuItem inputLocalFileMenuItem = new JMenuItem();
JMenuItem inputURLMenuItem = new JMenuItem();
JMenuItem inputTextboxMenuItem = new JMenuItem();
JMenuItem saveState = new JMenuItem();
JMenuItem loadState = new JMenuItem();
JMenu inputMenu = new JMenu();
- protected JMenuItem vamsasLoad = new JMenuItem();
+ protected JMenuItem vamsasStart = new JMenuItem();
+ protected JMenuItem vamsasImport = new JMenuItem();
+ protected JMenuItem vamsasSave = new JMenuItem();
JMenuItem inputSequence = new JMenuItem();
protected JMenuItem vamsasStop = new JMenuItem();
JMenuItem closeAll = new JMenuItem();
HelpMenu.setText("Help");
VamsasMenu.setText("Vamsas");
VamsasMenu.setToolTipText("Share data with other vamsas applications.");
+ VamsasStMenu.setText("Connect to");
+ VamsasStMenu.setToolTipText("Join an existing vamsas session");
inputLocalFileMenuItem.setText("from File");
inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke(
java.awt.event.KeyEvent.VK_O,
}
});
inputMenu.setText("Input Alignment");
- vamsasLoad.setText("Start Vamsas Session...");
- vamsasLoad.setVisible(false);
- vamsasLoad.addActionListener(new ActionListener()
+ vamsasStart.setText("New Vamsas Session...");
+ vamsasStart.setVisible(false);
+ vamsasStart.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ vamsasStart_actionPerformed(e);
+ }
+ });
+ vamsasImport.setText("Load Vamsas Session...");
+ vamsasImport.setVisible(false);
+ vamsasImport.addActionListener(new ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ vamsasImport_actionPerformed(e);
+ }
+ });
+ vamsasSave.setText("Save Vamsas Session...");
+ vamsasSave.setVisible(false);
+ vamsasSave.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
{
- vamsasLoad_actionPerformed(e);
+ vamsasSave_actionPerformed(e);
}
});
inputSequence.setText("Fetch Sequence(s)...");
FileMenu.add(quit);
HelpMenu.add(aboutMenuItem);
HelpMenu.add(documentationMenuItem);
- VamsasMenu.add(vamsasLoad);
+ VamsasMenu.add(VamsasStMenu);
+ VamsasStMenu.setVisible(false);
+ VamsasMenu.add(vamsasStart);
+ VamsasMenu.add(vamsasImport);
+ VamsasMenu.add(vamsasSave);
VamsasMenu.add(vamsasStop);
toolsMenu.add(preferences);
inputMenu.add(inputLocalFileMenuItem);
// inputMenu.add(vamsasLoad);
}
+ protected void vamsasStMenu_actionPerformed()
+ {
+ }
+
+ public void vamsasSave_actionPerformed(ActionEvent e)
+ {
+ }
+
/**
* DOCUMENT ME!
*
{
}
- public void vamsasLoad_actionPerformed(ActionEvent e)
+ public void vamsasStart_actionPerformed(ActionEvent e)
{
}
{
}
+
+ private void vamsasImport_actionPerformed(ActionEvent e)
+ {
+ }
}
git://source.jalview.org / jalview.git / commitdiff