/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
import jalview.api.AlignViewportI;
import jalview.api.AlignmentViewPanel;
import jalview.bin.Cache;
+import jalview.bin.Jalview;
import jalview.io.FileLoader;
import jalview.io.FormatAdapter;
import jalview.io.IdentifyFile;
import jalview.structure.StructureSelectionManager;
import jalview.util.ImageMaker;
import jalview.util.MessageManager;
+import jalview.util.Platform;
import jalview.viewmodel.AlignmentViewport;
import jalview.ws.params.ParamManager;
static final int yOffset = 30;
- private static final int THREE = 3;
-
private static AlignFrame currentAlignFrame;
public static jalview.ws.jws1.Discoverer discoverer;
delegate.openFrame(f);
}
+ @Override
public void resizeFrame(JComponent f, int newX, int newY, int newWidth,
int newHeight)
{
- Rectangle b = desktop.getBounds();
if (newY < 0)
{
newY = 0;
boolean showjconsole = jalview.bin.Cache.getDefault(
"SHOW_JAVA_CONSOLE", false);
desktop = new MyDesktopPane(selmemusage);
+ if (Platform.isAMac())
+ {
+ desktop.setDoubleBuffered(false);
+ }
showMemusage.setSelected(selmemusage);
desktop.setBackground(Color.white);
getContentPane().setLayout(new BorderLayout());
public void run()
{
Cache.log.debug("Filechooser init thread started.");
- JalviewFileChooser chooser = new JalviewFileChooser(
+ new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
jalview.io.AppletFormatAdapter.READABLE_EXTENSIONS,
jalview.io.AppletFormatAdapter.READABLE_FNAMES,
});
}
+ @Override
protected void showNews_actionPerformed(ActionEvent e)
{
showNews(showNews.isSelected());
@Override
public void run()
{
- long instance = System.currentTimeMillis();
+ long now = System.currentTimeMillis();
Desktop.instance.setProgressBar(
- MessageManager.getString("status.refreshing_news"),
- instance);
+ MessageManager.getString("status.refreshing_news"), now);
jvnews.refreshNews();
- Desktop.instance.setProgressBar(null, instance);
+ Desktop.instance.setProgressBar(null, now);
jvnews.showNews();
}
}).start();
frame.setResizable(resizable);
frame.setMaximizable(resizable);
frame.setIconifiable(resizable);
- frame.setFrameIcon(null);
-
+ if (Platform.isAMac())
+ {
+ frame.setIconifiable(false);
+ frame.setFrameIcon(null);
+ // frame.setDesktopIcon(null);
+ frame.setDoubleBuffered(false);
+ }
if (frame.getX() < 1 && frame.getY() < 1)
{
frame.setLocation(xOffset * openFrameCount, yOffset
{
}
+ @Override
public void dropActionChanged(DropTargetDragEvent evt)
{
}
* @param e
* DOCUMENT ME!
*/
+ @Override
public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport)
{
JalviewFileChooser chooser = new JalviewFileChooser(
* @param e
* DOCUMENT ME!
*/
+ @Override
public void inputURLMenuItem_actionPerformed(AlignViewport viewport)
{
// This construct allows us to have a wider textfield
{
JOptionPane.showInternalMessageDialog(Desktop.desktop,
MessageManager.formatMessage("label.couldnt_locate",
- new Object[]
- { url }), MessageManager
+ new Object[] { url }), MessageManager
.getString("label.url_not_found"),
JOptionPane.WARNING_MESSAGE);
}
/**
- * DOCUMENT ME!
+ * Opens the CutAndPaste window for the user to paste an alignment in to
*
- * @param e
- * DOCUMENT ME!
+ * @param viewPanel
+ * - if not null, the pasted alignment is added to the current
+ * alignment; if null, to a new alignment window
*/
- public void inputTextboxMenuItem_actionPerformed(AlignViewport viewport)
+ @Override
+ public void inputTextboxMenuItem_actionPerformed(
+ AlignmentViewPanel viewPanel)
{
CutAndPasteTransfer cap = new CutAndPasteTransfer();
-// cap.setForInput(viewport.getAlignPanel());
- cap.setForInput(null);
+ cap.setForInput(viewPanel);
Desktop.addInternalFrame(cap,
MessageManager.getString("label.cut_paste_alignmen_file"),
true, 600, 500);
/*
* Exit the program
*/
+ @Override
public void quit()
{
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
* @param e
* DOCUMENT ME!
*/
+ @Override
public void aboutMenuItem_actionPerformed(ActionEvent e)
{
// StringBuffer message = getAboutMessage(false);
* @param e
* DOCUMENT ME!
*/
+ @Override
public void documentationMenuItem_actionPerformed(ActionEvent e)
{
try
}
}
+ @Override
public void closeAll_actionPerformed(ActionEvent e)
{
JInternalFrame[] frames = desktop.getAllFrames();
if (v_client != null)
{
// TODO clear binding to vamsas document objects on close_all
+ }
+ /*
+ * reset state of singleton objects as appropriate (clear down session state
+ * when all windows are closed)
+ */
+ StructureSelectionManager ssm = StructureSelectionManager
+ .getStructureSelectionManager(this);
+ if (ssm != null)
+ {
+ ssm.resetAll();
}
}
+ @Override
public void raiseRelated_actionPerformed(ActionEvent e)
{
reorderAssociatedWindows(false, false);
}
+ @Override
public void minimizeAssociated_actionPerformed(ActionEvent e)
{
reorderAssociatedWindows(true, false);
* @seejalview.jbgui.GDesktop#garbageCollect_actionPerformed(java.awt.event.
* ActionEvent)
*/
+ @Override
protected void garbageCollect_actionPerformed(ActionEvent e)
{
// We simply collect the garbage
* jalview.jbgui.GDesktop#showMemusage_actionPerformed(java.awt.event.ActionEvent
* )
*/
+ @Override
protected void showMemusage_actionPerformed(ActionEvent e)
{
desktop.showMemoryUsage(showMemusage.isSelected());
* jalview.jbgui.GDesktop#showConsole_actionPerformed(java.awt.event.ActionEvent
* )
*/
+ @Override
protected void showConsole_actionPerformed(ActionEvent e)
{
showConsole(showConsole.isSelected());
* @param e
* DOCUMENT ME!
*/
+ @Override
protected void preferences_actionPerformed(ActionEvent e)
{
new Preferences();
* @param e
* DOCUMENT ME!
*/
+ @Override
public void saveState_actionPerformed(ActionEvent e)
{
JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
- { "jvp" }, new String[]
- { "Jalview Project" }, "Jalview Project");
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+ new String[] { "jvp" }, new String[] { "Jalview Project" },
+ "Jalview Project");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager.getString("label.save_state"));
{
public void run()
{
-
+ // TODO: refactor to Jalview desktop session controller action.
setProgressBar(MessageManager.formatMessage(
- "label.saving_jalview_project", new Object[]
- { choice.getName() }), choice.hashCode());
+ "label.saving_jalview_project",
+ new Object[] { choice.getName() }), choice.hashCode());
jalview.bin.Cache.setProperty("LAST_DIRECTORY",
choice.getParent());
// TODO catch and handle errors for savestate
ex);
JOptionPane.showMessageDialog(me, MessageManager.formatMessage(
"label.error_whilst_saving_current_state_to",
- new Object[]
- { choice.getName() }), MessageManager
+ new Object[] { choice.getName() }), MessageManager
.getString("label.couldnt_save_project"),
JOptionPane.WARNING_MESSAGE);
}
* @param e
* DOCUMENT ME!
*/
+ @Override
public void loadState_actionPerformed(ActionEvent e)
{
JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
- { "jvp", "jar" }, new String[]
- { "Jalview Project", "Jalview Project (old)" },
- "Jalview Project");
+ jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] {
+ "jvp", "jar" }, new String[] { "Jalview Project",
+ "Jalview Project (old)" }, "Jalview Project");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager.getString("label.restore_state"));
{
public void run()
{
- setProgressBar(MessageManager.formatMessage(
- "label.loading_jalview_project", new Object[]
- { choice }), choice.hashCode());
+ setProgressBar(
+ MessageManager.formatMessage(
+ "label.loading_jalview_project",
+ new Object[] { choice }), choice.hashCode());
try
{
new Jalview2XML().loadJalviewAlign(choice);
JOptionPane.showMessageDialog(Desktop.desktop, MessageManager
.formatMessage(
"label.error_whilst_loading_project_from",
- new Object[]
- { choice }), MessageManager
+ new Object[] { choice }), MessageManager
.getString("label.couldnt_load_project"),
JOptionPane.WARNING_MESSAGE);
}
}
}
+ @Override
public void inputSequence_actionPerformed(ActionEvent e)
{
new SequenceFetcher(this);
if (fileLoadingCount == 0)
{
fileLoadingPanels.add(addProgressPanel(MessageManager.formatMessage(
- "label.loading_file", new Object[]
- { fileName })));
+ "label.loading_file", new Object[] { fileName })));
}
fileLoadingCount++;
}
{
for (AlignmentPanel ap : af.alignPanels)
{
- if (alignmentId==null || alignmentId.equals(ap.av.getSequenceSetId()))
+ if (alignmentId == null
+ || alignmentId.equals(ap.av.getSequenceSetId()))
{
aps.add(ap);
}
for (AlignFrame afr : frames)
{
- if (sequenceSetId==null || afr.getViewport().getSequenceSetId().equals(sequenceSetId))
+ if (sequenceSetId == null
+ || afr.getViewport().getSequenceSetId()
+ .equals(sequenceSetId))
{
if (afr.alignPanels != null)
{
jalview.gui.VamsasApplication v_client = null;
+ @Override
public void vamsasImport_actionPerformed(ActionEvent e)
{
if (v_client == null)
Desktop.desktop,
MessageManager.formatMessage(
"label.couldnt_import_as_vamsas_session",
- new Object[]
- { fle }),
+ new Object[] { fle }),
MessageManager
.getString("label.vamsas_document_import_failed"),
JOptionPane.ERROR_MESSAGE);
}
setProgressBar(MessageManager.formatMessage(
- "status.importing_vamsas_session_from", new Object[]
- { file.getName() }), file.hashCode());
+ "status.importing_vamsas_session_from",
+ new Object[] { file.getName() }), file.hashCode());
try
{
v_client = new jalview.gui.VamsasApplication(this, file, null);
} catch (Exception ex)
{
setProgressBar(MessageManager.formatMessage(
- "status.importing_vamsas_session_from", new Object[]
- { file.getName() }), file.hashCode());
+ "status.importing_vamsas_session_from",
+ new Object[] { file.getName() }), file.hashCode());
jalview.bin.Cache.log.error(
"New vamsas session from existing session file failed:", ex);
return false;
setupVamsasConnectedGui();
v_client.initial_update(); // TODO: thread ?
setProgressBar(MessageManager.formatMessage(
- "status.importing_vamsas_session_from", new Object[]
- { file.getName() }), file.hashCode());
+ "status.importing_vamsas_session_from",
+ new Object[] { file.getName() }), file.hashCode());
return v_client.inSession();
}
return (v_client.inSession());
}
+ @Override
public void vamsasStart_actionPerformed(ActionEvent e)
{
if (v_client == null)
.getString("label.new_vamsas_session"));
}
+ @Override
public void vamsasStop_actionPerformed(ActionEvent e)
{
if (v_client != null)
JMenuItem sessit = new JMenuItem();
sessit.setText(sess[i]);
sessit.setToolTipText(MessageManager.formatMessage(
- "label.connect_to_session", new Object[]
- { sess[i] }));
+ "label.connect_to_session", new Object[] { sess[i] }));
final Desktop dsktp = this;
final String mysesid = sess[i];
sessit.addActionListener(new ActionListener()
}
}
+ @Override
public void vamsasSave_actionPerformed(ActionEvent e)
{
if (v_client != null)
JalviewFileChooser chooser = new JalviewFileChooser(
jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
{ "vdj" }, // TODO: VAMSAS DOCUMENT EXTENSION is VDJ
- new String[]
- { "Vamsas Document" }, "Vamsas Document");
+ new String[] { "Vamsas Document" }, "Vamsas Document");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
{
java.io.File choice = chooser.getSelectedFile();
JPanel progpanel = addProgressPanel(MessageManager.formatMessage(
- "label.saving_vamsas_doc", new Object[]
- { choice.getName() }));
+ "label.saving_vamsas_doc",
+ new Object[] { choice.getName() }));
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice.getParent());
String warnmsg = null;
String warnttl = null;
showMemoryUsage(showMemoryUsage);
}
- public void showMemoryUsage(boolean showMemoryUsage)
+ public void showMemoryUsage(boolean showMemory)
{
- this.showMemoryUsage = showMemoryUsage;
- if (showMemoryUsage)
+ this.showMemoryUsage = showMemory;
+ if (showMemory)
{
Thread worker = new Thread(this);
worker.start();
}
}
+ @Override
public void paintComponent(Graphics g)
{
if (showMemoryUsage && g != null && df != null)
{
g.drawString(MessageManager.formatMessage(
"label.memory_stats",
- new Object[]
- { df.format(totalFreeMemory), df.format(maxMemory),
- df.format(percentUsage) }), 10,
+ new Object[] { df.format(totalFreeMemory),
+ df.format(maxMemory), df.format(percentUsage) }), 10,
getHeight() - fm.getHeight());
}
}
{
public void actionPerformed(ActionEvent e)
{
- groovyShell_actionPerformed(e);
+ groovyShell_actionPerformed();
}
});
toolsMenu.add(groovyShell);
*/
public static AlignFrame[] getAlignFrames()
{
+ if (Jalview.isHeadlessMode())
+ {
+ // Desktop.desktop is null in headless mode
+ return new AlignFrame[] { currentAlignFrame };
+ }
+
JInternalFrame[] frames = Desktop.desktop.getAllFrames();
if (frames == null)
/**
* Add Groovy Support to Jalview
*/
- public void groovyShell_actionPerformed(ActionEvent e)
+ public void groovyShell_actionPerformed()
{
// use reflection to avoid creating compilation dependency.
if (!jalview.bin.Cache.groovyJarsPresent())
"groovy.ui.Console");
Constructor<?> gccons = gcClass.getConstructor();
java.lang.reflect.Method setvar = gcClass.getMethod("setVariable",
- new Class[]
- { String.class, Object.class });
+ new Class[] { String.class, Object.class });
java.lang.reflect.Method run = gcClass.getMethod("run");
Object gc = gccons.newInstance();
- setvar.invoke(gc, new Object[]
- { "Jalview", this });
+ setvar.invoke(gc, new Object[] { "Jalview", this });
run.invoke(gc);
} catch (Exception ex)
{
if (progressBars.get(new Long(id)) != null)
{
- JPanel progressPanel = progressBars.remove(new Long(id));
+ JPanel panel = progressBars.remove(new Long(id));
if (progressBarHandlers.contains(new Long(id)))
{
progressBarHandlers.remove(new Long(id));
}
- removeProgressPanel(progressPanel);
+ removeProgressPanel(panel);
}
else
{
{
handler.cancelActivity(id);
us.setProgressBar(MessageManager.formatMessage(
- "label.cancelled_params", new Object[]
- { ((JLabel) progressPanel.getComponent(0)).getText() }),
- id);
+ "label.cancelled_params",
+ new Object[] { ((JLabel) progressPanel.getComponent(0))
+ .getText() }), id);
}
});
progressPanel.add(cancel, BorderLayout.EAST);
}
/**
- * This will return the first AlignFrame holding the given viewport instance. It
- * will break if there are more than one AlignFrames viewing a particular av.
+ * This will return the first AlignFrame holding the given viewport instance.
+ * It will break if there are more than one AlignFrames viewing a particular
+ * av.
*
* @param viewport
* @return alignFrame for viewport
{
if (desktop != null)
{
- AlignmentPanel[] aps = getAlignmentPanels(viewport
- .getSequenceSetId());
+ AlignmentPanel[] aps = getAlignmentPanels(viewport.getSequenceSetId());
for (int panel = 0; aps != null && panel < aps.length; panel++)
{
if (aps[panel] != null && aps[panel].av == viewport)
if (progress != null)
{
progress.setProgressBar(MessageManager.formatMessage(
- "status.opening_params", new Object[]
- { url }), this.hashCode());
+ "status.opening_params", new Object[] { url }), this
+ .hashCode());
}
jalview.util.BrowserLauncher.openURL(url);
} catch (Exception ex)
}
/**
- * Explode the views in the given frame into separate AlignFrame windows.
+ * Explode the views in the given SplitFrame into separate SplitFrame windows.
+ * This respects (remembers) any previous 'exploded geometry' i.e. the size
+ * and location last time the view was expanded (if any). However it does not
+ * remember the split pane divider location - this is set to match the
+ * 'exploding' frame.
*
* @param sf
*/
* AlignmentPanel objects, including their AlignmentViewports, so the
* cdna/protein relationships between the viewports is carried over to the
* new split frames.
+ *
+ * explodedGeometry holds the (x, y) position of the previously exploded
+ * SplitFrame, and the (width, height) of the AlignFrame component
*/
AlignmentPanel topPanel = (AlignmentPanel) topPanels.get(i);
AlignFrame newTopFrame = new AlignFrame(topPanel);
- newTopFrame.setSize(new Dimension(AlignFrame.DEFAULT_WIDTH,
- AlignFrame.DEFAULT_HEIGHT));
+ newTopFrame.setSize(oldTopFrame.getSize());
newTopFrame.setVisible(true);
+ Rectangle geometry = ((AlignViewport) topPanel.getAlignViewport())
+ .getExplodedGeometry();
+ if (geometry != null)
+ {
+ newTopFrame.setSize(geometry.getSize());
+ }
+
AlignmentPanel bottomPanel = (AlignmentPanel) bottomPanels.get(i);
AlignFrame newBottomFrame = new AlignFrame(bottomPanel);
- newBottomFrame.setSize(new Dimension(AlignFrame.DEFAULT_WIDTH,
- AlignFrame.DEFAULT_HEIGHT));
+ newBottomFrame.setSize(oldBottomFrame.getSize());
newBottomFrame.setVisible(true);
+ geometry = ((AlignViewport) bottomPanel.getAlignViewport())
+ .getExplodedGeometry();
+ if (geometry != null)
+ {
+ newBottomFrame.setSize(geometry.getSize());
+ }
+
topPanel.av.setGatherViewsHere(false);
bottomPanel.av.setGatherViewsHere(false);
JInternalFrame splitFrame = new SplitFrame(newTopFrame,
newBottomFrame);
- // either panel may hold previous exploded frame geometry
- Rectangle geometry = ((AlignViewport) topPanel.getAlignViewport())
- .getExplodedGeometry();
if (geometry != null)
{
- splitFrame.setBounds(geometry);
+ splitFrame.setLocation(geometry.getLocation());
}
Desktop.addInternalFrame(splitFrame, sf.getTitle(), -1, -1);
}
*/
public void gatherViews(GSplitFrame source)
{
+ /*
+ * special handling of explodedGeometry for a view within a SplitFrame: - it
+ * holds the (x, y) position of the enclosing SplitFrame, and the (width,
+ * height) of the AlignFrame component
+ */
AlignFrame myTopFrame = (AlignFrame) source.getTopFrame();
AlignFrame myBottomFrame = (AlignFrame) source.getBottomFrame();
- myTopFrame.viewport.setExplodedGeometry(source.getBounds());
- myBottomFrame.viewport.setExplodedGeometry(source.getBounds());
+ myTopFrame.viewport.setExplodedGeometry(new Rectangle(source.getX(),
+ source.getY(), myTopFrame.getWidth(), myTopFrame.getHeight()));
+ myBottomFrame.viewport.setExplodedGeometry(new Rectangle(source.getX(),
+ source.getY(), myBottomFrame.getWidth(), myBottomFrame
+ .getHeight()));
myTopFrame.viewport.setGatherViewsHere(true);
myBottomFrame.viewport.setGatherViewsHere(true);
String topViewId = myTopFrame.viewport.getSequenceSetId();
String bottomViewId = myBottomFrame.viewport.getSequenceSetId();
-
+
JInternalFrame[] frames = desktop.getAllFrames();
for (JInternalFrame frame : frames)
{
gatherThis = true;
topPanel.av.setGatherViewsHere(false);
bottomPanel.av.setGatherViewsHere(false);
- // both panels refer to the same split frame geometry
- Rectangle position = sf.getBounds();
- topPanel.av.setExplodedGeometry(position);
- bottomPanel.av.setExplodedGeometry(position);
+ topPanel.av.setExplodedGeometry(new Rectangle(sf.getLocation(),
+ topFrame.getSize()));
+ bottomPanel.av.setExplodedGeometry(new Rectangle(sf
+ .getLocation(), bottomFrame.getSize()));
myTopFrame.addAlignmentPanel(topPanel, false);
myBottomFrame.addAlignmentPanel(bottomPanel, false);
}
}
-
+
if (gatherThis)
{
topFrame.getAlignPanels().clear();
}
- // public static AlignFrame getCurrentAlignFrame()
- // {
- // return currentAlignFrame;
- // }
- //
- // public static void setCurrentAlignFrame(AlignFrame currentAlignFrame)
- // {
- // Desktop.currentAlignFrame = currentAlignFrame;
- // }
+ public static AlignFrame getCurrentAlignFrame()
+ {
+ return currentAlignFrame;
+ }
+ public static void setCurrentAlignFrame(AlignFrame currentAlignFrame)
+ {
+ Desktop.currentAlignFrame = currentAlignFrame;
+ }
}