static final int xOffset = 30;
static final int yOffset = 30;
public static jalview.ws.Discoverer discoverer;
+
+ public static Object [] jalviewClipboard;
+
+
/**
* Creates a new Desktop object.
*/
{
Image image = null;
+
try
{
java.net.URL url = getClass().getResource("/images/logo.gif");
{
}
- setTitle("Jalview 2005");
+ setTitle("Jalview "+jalview.bin.Cache.getProperty("VERSION"));
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
desktop = new JDesktopPane();
desktop.setBackground(Color.white);
SplashScreen splash = new SplashScreen(frame, image);
frame.setContentPane(splash);
frame.setLayer(JLayeredPane.PALETTE_LAYER);
- addInternalFrame(frame, "", 750, 160, false);
frame.setLocation((int) ((getWidth() - 750) / 2),
(int) ((getHeight() - 160) / 2));
- discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
+
+ addInternalFrame(frame, "", 750, 160, false);
+
+ discoverer=new jalview.ws.Discoverer(); // Only gets started if gui is displayed.
+
}
/**
* @param w DOCUMENT ME!
* @param h DOCUMENT ME!
*/
- public static void addInternalFrame(final JInternalFrame frame,
+ public static synchronized void addInternalFrame(final JInternalFrame frame,
String title, int w, int h)
{
addInternalFrame(frame, title, w, h, true);
* @param h DOCUMENT ME!
* @param resizable DOCUMENT ME!
*/
- public static void addInternalFrame(final JInternalFrame frame,
+ public static synchronized void addInternalFrame(final JInternalFrame frame,
String title, int w, int h, boolean resizable)
{
frame.setTitle(title);
- frame.setSize(w, h);
-
+ if(frame.getWidth()<1 || frame.getHeight()<1)
+ {
+ frame.setSize(w, h);
+ }
// THIS IS A PUBLIC STATIC METHOD, SO IT MAY BE CALLED EVEN IN
// A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
// IF JALVIEW IS RUNNING HEADLESS
}
- desktop.add(frame);
openFrameCount++;
- try
- {
- frame.setSelected(true);
- }
- catch (java.beans.PropertyVetoException e)
- {
- }
-
+ frame.setVisible(true);
frame.setClosable(true);
frame.setResizable(resizable);
frame.setMaximizable(resizable);
frame.setIconifiable(resizable);
frame.setFrameIcon(null);
- frame.setLocation(xOffset * openFrameCount, yOffset * openFrameCount);
- frame.toFront();
+
+ if (frame.getX()<1 && frame.getY()<1)
+ {
+ frame.setLocation(xOffset * openFrameCount, yOffset * ((openFrameCount-1)%10)+yOffset);
+ }
final JMenuItem menuItem = new JMenuItem(title);
frame.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()
{
openFrameCount--;
windowMenu.remove(menuItem);
+ JInternalFrame itf = desktop.getSelectedFrame();
+ if (itf != null)
+ itf.requestFocus();
}
;
});
}
catch (java.beans.PropertyVetoException ex)
{
- }
- ;
+ }
}
});
- frame.setVisible(true);
windowMenu.add(menuItem);
+
+ desktop.add(frame);
+ frame.toFront();
+ try{
+ frame.setSelected(true);
+ frame.requestFocus();
+ }catch(java.beans.PropertyVetoException ve)
+ {}
}
+
/**
* DOCUMENT ME!
*
*/
public void inputURLMenuItem_actionPerformed(ActionEvent e)
{
- String url = JOptionPane.showInternalInputDialog(Desktop.desktop,
+ Object reply = JOptionPane.showInternalInputDialog(Desktop.desktop,
"Enter url of input file", "Input alignment from URL",
- JOptionPane.QUESTION_MESSAGE, null, null, "http://www.")
- .toString();
+ JOptionPane.QUESTION_MESSAGE, null, null, "http://www.");
- if (url == null)
+ if (reply == null)
{
return;
}
- if (url.trim().toLowerCase().endsWith(".jar"))
+ String url = reply.toString().trim();
+
+ if (url.toLowerCase().endsWith(".jar"))
{
jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalview");
Jalview2XML.LoadJalviewAlign(url);
javax.help.HelpSet hs = new javax.help.HelpSet(cl, url);
javax.help.HelpBroker hb = hs.createHelpBroker();
- hb.setLocation(new Point(200, 50));
- hb.setSize(new Dimension(800, 700));
hb.setCurrentID("home");
hb.setDisplayed(true);
}
}
}
+ public void vamsasLoad_actionPerformed(ActionEvent e)
+ {
+ JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.
+ getProperty("LAST_DIRECTORY"));
+
+ chooser.setFileView(new JalviewFileView());
+ chooser.setDialogTitle("Load Vamsas file");
+ chooser.setToolTipText("Import");
+
+ int value = chooser.showOpenDialog(this);
+
+ if (value == JalviewFileChooser.APPROVE_OPTION)
+ {
+ jalview.io.VamsasDatastore vs = new jalview.io.VamsasDatastore(null);
+ vs.load(
+ chooser.getSelectedFile().getAbsolutePath()
+ );
+ }
+
+ }
+
+
+ public void inputSequence_actionPerformed(ActionEvent e)
+ {
+ SequenceFetcher sf = new SequenceFetcher(null);
+ }
}