+/*\r
+* Jalview - A Sequence Alignment Editor and Viewer\r
+* Copyright (C) 2005 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
+* as published by the Free Software Foundation; either version 2\r
+* of the License, or (at your option) any later version.\r
+*\r
+* This program is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with this program; if not, write to the Free Software\r
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
+*/\r
+\r
package jalview.io;\r
\r
import jalview.gui.AlignFrame;\r
import jalview.gui.Jalview2XML;\r
import javax.swing.JOptionPane;\r
-import jalview.datamodel.Alignment;\r
-import jalview.gui.Desktop;\r
-import jalview.datamodel.SequenceI;\r
-import jalview.gui.Preferences;\r
+\r
+import jalview.gui.*;\r
+import jalview.datamodel.*;\r
+import java.util.Vector;\r
+import java.util.StringTokenizer;\r
\r
public class FileLoader\r
{\r
+ String file;\r
+ String protocol;\r
+ String format;\r
+ AlignViewport viewport;\r
+\r
+ public void LoadFile(AlignViewport viewport, String file, String protocol, String format)\r
+ {\r
+ this.viewport = viewport;\r
+ LoadFile(file, protocol, format);\r
+ }\r
+\r
public void LoadFile(String file, String protocol, String format)\r
{\r
- LoadingThread loader = new LoadingThread(file, protocol, format);\r
+ this.file = file;\r
+ this.protocol = protocol;\r
+ this.format = format;\r
+\r
+ LoadingThread loader = new LoadingThread();\r
loader.start();\r
}\r
\r
public AlignFrame LoadFileWaitTillLoaded(String file, String protocol,\r
String format)\r
{\r
- LoadingThread loader = new LoadingThread(file, protocol, format);\r
+ this.file = file;\r
+ this.protocol = protocol;\r
+ this.format = format;\r
+\r
+ LoadingThread loader = new LoadingThread();\r
loader.start();\r
while (loader.isAlive())\r
{\r
try\r
{\r
- Thread.sleep(50);\r
+ Thread.sleep(500);\r
}\r
catch (Exception ex)\r
{}\r
}\r
\r
\r
- class LoadingThread\r
- extends Thread\r
-{\r
- String file;\r
- String protocol;\r
- String format;\r
- AlignFrame af;\r
\r
- public LoadingThread(String file, String protocol, String format)\r
+ public void updateRecentlyOpened()\r
{\r
- this.file = file;\r
- this.protocol = protocol;\r
- this.format = format;\r
- }\r
+ Vector recent = new Vector();\r
\r
- public void run()\r
- {\r
- SequenceI[] sequences = null;\r
+ String type = protocol.equals(FormatAdapter.FILE)\r
+ ? "RECENT_FILE" : "RECENT_URL";\r
+\r
+ String historyItems = jalview.bin.Cache.getProperty(type);\r
+\r
+ StringTokenizer st;\r
\r
- if (format.equalsIgnoreCase("Jalview"))\r
+ if (historyItems != null)\r
{\r
- af = Jalview2XML.LoadJalviewAlign(file);\r
+ st = new StringTokenizer(historyItems, "\t");\r
+\r
+ while (st.hasMoreTokens())\r
+ {\r
+ recent.addElement(st.nextElement().toString().trim());\r
+ }\r
}\r
- else\r
+\r
+ if (recent.contains(file))\r
{\r
- if (FormatAdapter.formats.contains(format))\r
+ recent.remove(file);\r
+ }\r
+\r
+ StringBuffer newHistory = new StringBuffer(file);\r
+ for (int i = 0; i < recent.size() && i < 10; i++)\r
+ {\r
+ newHistory.append("\t");\r
+ newHistory.append(recent.elementAt(i));\r
+ }\r
+\r
+ jalview.bin.Cache.setProperty(type, newHistory.toString());\r
+\r
+ if(type.equals(FormatAdapter.FILE))\r
+ jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format);\r
+ }\r
+\r
+\r
+ class LoadingThread\r
+ extends Thread\r
+ {\r
+\r
+ AlignFrame af;\r
+\r
+\r
+\r
+ public void run()\r
+ {\r
+ Desktop.instance.startLoading(file);\r
+\r
+ SequenceI[] sequences = null;\r
+\r
+ if (format.equalsIgnoreCase("Jalview"))\r
{\r
- sequences = FormatAdapter.readFile(file, protocol, format);\r
+ af = new Jalview2XML().LoadJalviewAlign(file);\r
}\r
-\r
- if ( (sequences != null) && (sequences.length > 0))\r
+ else\r
{\r
- af = new AlignFrame(new Alignment(sequences));\r
- af.currentFileFormat = format;\r
- af.statusBar.setText("Successfully loaded file " + file);\r
-\r
- Desktop.addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH,\r
- AlignFrame.NEW_WINDOW_HEIGHT);\r
+ String errorMessage = AppletFormatAdapter.SUPPORTED_FORMATS;\r
\r
+ if (FormatAdapter.formats.contains(format))\r
+ {\r
+ try\r
+ {\r
+ sequences = new FormatAdapter().readFile(file, protocol, format);\r
+ }\r
+ catch (java.io.IOException ex)\r
+ {\r
+ errorMessage = ex.getMessage();\r
+ }\r
+ }\r
\r
- try\r
+ if ( (sequences != null) && (sequences.length > 0))\r
{\r
- af.setMaximum(Preferences.showFullscreen);\r
+ if(viewport!=null)\r
+ {\r
+ for(int i=0; i<sequences.length; i++)\r
+ viewport.getAlignment().addSequence(sequences[i]);\r
+\r
+ viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());\r
+ }\r
+ else\r
+ {\r
+ af = new AlignFrame(new Alignment(sequences));\r
+ af.currentFileFormat = format;\r
+ af.statusBar.setText("Successfully loaded file " + file);\r
+\r
+ Desktop.addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH,\r
+ AlignFrame.NEW_WINDOW_HEIGHT);\r
+\r
+ try\r
+ {\r
+ af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));\r
+ }\r
+ catch (java.beans.PropertyVetoException ex)\r
+ {\r
+ }\r
+ }\r
}\r
- catch (Exception ex)\r
+ else\r
{\r
+ Desktop.instance.stopLoading();\r
+\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+ "Couldn't load file " + file +\r
+ "\n"\r
+ + errorMessage,\r
+ "Error loading file",\r
+ JOptionPane.WARNING_MESSAGE);\r
}\r
}\r
- else\r
+\r
+ if (af != null)\r
{\r
- JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
- "Couldn't open file.\n" +\r
- "Formats currently supported are\n" +\r
- "Fasta, MSF, Clustal, BLC, PIR, MSP, and PFAM" // JBPNote - message should be generated through FormatAdapter!\r
- , "Error loading file",\r
- JOptionPane.WARNING_MESSAGE);\r
+ updateRecentlyOpened();\r
}\r
+\r
+ Desktop.instance.stopLoading();\r
+\r
}\r
}\r
-}\r
\r
}\r
git://source.jalview.org / jalview.git / blobdiff