From d9b5411f1f2cd0acf62eab94188428a754094926 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Fri, 17 Dec 2004 15:14:22 +0000 Subject: [PATCH] All optionpane messages must be added to Desktop.desktop --- src/jalview/gui/Desktop.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 7a75379..889227f 100755 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -148,7 +148,7 @@ public class Desktop extends jalview.jbgui.GDesktop } else - JOptionPane.showInternalMessageDialog(this, "Couldn't open file.\n" + JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't open file.\n" + "Formats currently supported are\n" + "Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM" ,"Error loading file", @@ -158,7 +158,7 @@ public class Desktop extends jalview.jbgui.GDesktop public void inputURLMenuItem_actionPerformed(ActionEvent e) { - String url = JOptionPane.showInternalInputDialog(this,"Enter url of input file", + String url = JOptionPane.showInternalInputDialog(Desktop.desktop,"Enter url of input file", "Input alignment from URL", JOptionPane.QUESTION_MESSAGE); if (url == null) @@ -169,7 +169,7 @@ public class Desktop extends jalview.jbgui.GDesktop System.out.println(format +" format"); if (format.equals("URL NOT FOUND")) { - JOptionPane.showInternalMessageDialog(this,"Couldn't locate " + url, + JOptionPane.showInternalMessageDialog(Desktop.desktop,"Couldn't locate " + url, "URL not found", JOptionPane.WARNING_MESSAGE); return; @@ -181,7 +181,7 @@ public class Desktop extends jalview.jbgui.GDesktop public void inputTextboxMenuItem_actionPerformed(ActionEvent e) { CutAndPasteTransfer cap = new CutAndPasteTransfer(true); - int accept = JOptionPane.showInternalOptionDialog(desktop, cap, "Cut & paste Alignment File", + int accept = JOptionPane.showInternalOptionDialog(Desktop.desktop, cap, "Cut & paste Alignment File", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE, null, @@ -204,7 +204,7 @@ public class Desktop extends jalview.jbgui.GDesktop af.statusBar.setText("Successfully pasted alignment file"); } else - JOptionPane.showInternalMessageDialog(this, "Couldn't read the pasted text.\n" + JOptionPane.showInternalMessageDialog(Desktop.desktop, "Couldn't read the pasted text.\n" +"Formats currently supported are\n" +"Fasta, MSF, Clustal, BLC, PIR, MSP or PFAM", "Error parsing text", JOptionPane.WARNING_MESSAGE); @@ -232,7 +232,7 @@ public class Desktop extends jalview.jbgui.GDesktop public void aboutMenuItem_actionPerformed(ActionEvent e) { - JOptionPane.showInternalMessageDialog(desktop, + JOptionPane.showInternalMessageDialog(Desktop.desktop, "JalView 2005" +"\nAuthors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse and Geoff Barton." +"\nCurrent development managed by Andrew Waterhouse; Barton Group, University of Dundee." -- 1.7.10.2