X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FSequenceFetcher.java;h=8e1d5498554f4b9de439cbdc5beb13f82ed5456c;hb=0935f3c68446aa5cd3a928295a0c5ea78f303648;hp=cb41e6e0e98ee480c85e309ff083b65f6318f380;hpb=ed8d18abc302ac802ad1d0611f3fe2fef570ab5e;p=jalview.git
diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index cb41e6e..8e1d549 100755
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -1,149 +1,598 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
* of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import jalview.io.EBIFetchClient;
-import MCview.*;
-import jalview.datamodel.*;
-import jalview.analysis.AlignSeq;
-import java.io.File;
-import jalview.io.*;
-import java.util.*;
-
-public class SequenceFetcher
- extends JPanel implements Runnable
+import jalview.api.FeatureSettingsModelI;
+import jalview.bin.Cache;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.fts.service.pdb.PDBFTSPanel;
+import jalview.fts.service.uniprot.UniprotFTSPanel;
+import jalview.io.FileFormatI;
+import jalview.io.gff.SequenceOntologyI;
+import jalview.util.DBRefUtils;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+import jalview.ws.dbsources.das.api.DasSourceRegistryI;
+import jalview.ws.seqfetcher.DbSourceProxy;
+
+import java.awt.BorderLayout;
+import java.awt.Font;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.SwingConstants;
+import javax.swing.tree.DefaultMutableTreeNode;
+
+public class SequenceFetcher extends JPanel implements Runnable
{
+ JLabel dbeg = new JLabel();
+
+ JDatabaseTree database;
+
+ JButton databaseButt;
+
+ JLabel jLabel1 = new JLabel();
+
+ JCheckBox replacePunctuation = new JCheckBox();
+
+ JButton ok = new JButton();
+
+ JButton clear = new JButton();
+
+ JButton example = new JButton();
+
+ JButton close = new JButton();
+
+ JPanel jPanel1 = new JPanel();
+
+ JTextArea textArea = new JTextArea();
+
+ JScrollPane jScrollPane1 = new JScrollPane();
+
+ JPanel jPanel2 = new JPanel();
+
+ JPanel jPanel3 = new JPanel();
+
+ JPanel jPanel4 = new JPanel();
+
+ BorderLayout borderLayout1 = new BorderLayout();
+
+ BorderLayout borderLayout2 = new BorderLayout();
+
+ BorderLayout borderLayout3 = new BorderLayout();
+
JInternalFrame frame;
+
+ IProgressIndicator guiWindow;
+
AlignFrame alignFrame;
+
StringBuffer result;
+
final String noDbSelected = "-- Select Database --";
- public SequenceFetcher(AlignFrame af)
+
+ private static jalview.ws.SequenceFetcher sfetch = null;
+
+ private static long lastDasSourceRegistry = -3;
+
+ private static DasSourceRegistryI dasRegistry = null;
+
+ private static boolean _initingFetcher = false;
+
+ private static Thread initingThread = null;
+
+ public JTextArea getTextArea()
+ {
+ return textArea;
+ }
+
+ /**
+ * Blocking method that initialises and returns the shared instance of the
+ * SequenceFetcher client
+ *
+ * @param guiWindow
+ * - where the initialisation delay message should be shown
+ * @return the singleton instance of the sequence fetcher client
+ */
+ public static jalview.ws.SequenceFetcher getSequenceFetcherSingleton(
+ final IProgressIndicator guiWindow)
+ {
+ if (_initingFetcher && initingThread != null && initingThread.isAlive())
+ {
+ if (guiWindow != null)
+ {
+ guiWindow
+ .setProgressBar(
+ MessageManager
+ .getString("status.waiting_sequence_database_fetchers_init"),
+ Thread.currentThread().hashCode());
+ }
+ // initting happening on another thread - so wait around to see if it
+ // finishes.
+ while (_initingFetcher && initingThread != null
+ && initingThread.isAlive())
+ {
+ try
+ {
+ Thread.sleep(10);
+ } catch (Exception e)
+ {
+ }
+ ;
+ }
+ if (guiWindow != null)
+ {
+ guiWindow
+ .setProgressBar(
+ MessageManager
+ .getString("status.waiting_sequence_database_fetchers_init"),
+ Thread.currentThread().hashCode());
+ }
+ }
+ if (sfetch == null
+ || dasRegistry != Cache.getDasSourceRegistry()
+ || lastDasSourceRegistry != (Cache.getDasSourceRegistry()
+ .getDasRegistryURL() + Cache.getDasSourceRegistry()
+ .getLocalSourceString()).hashCode())
+ {
+ _initingFetcher = true;
+ initingThread = Thread.currentThread();
+ /**
+ * give a visual indication that sequence fetcher construction is occuring
+ */
+ if (guiWindow != null)
+ {
+ guiWindow.setProgressBar(MessageManager
+ .getString("status.init_sequence_database_fetchers"),
+ Thread.currentThread().hashCode());
+ }
+ dasRegistry = Cache.getDasSourceRegistry();
+ dasRegistry.refreshSources();
+
+ jalview.ws.SequenceFetcher sf = new jalview.ws.SequenceFetcher();
+ if (guiWindow != null)
+ {
+ guiWindow.setProgressBar(null, Thread.currentThread().hashCode());
+ }
+ lastDasSourceRegistry = (dasRegistry.getDasRegistryURL() + dasRegistry
+ .getLocalSourceString()).hashCode();
+ sfetch = sf;
+ _initingFetcher = false;
+ initingThread = null;
+ }
+ return sfetch;
+ }
+
+ private IProgressIndicator progressIndicator;
+
+ private volatile boolean _isConstructing = false;
+
+ private List newAlframes = null;
+
+ public SequenceFetcher(IProgressIndicator guiIndic)
{
- alignFrame = af;
- database.addItem(noDbSelected);
- database.addItem("Uniprot");
- database.addItem("EMBL");
- database.addItem("EMBLCDS");
- database.addItem("PDB");
- database.addItem("PFAM");
+ this(guiIndic, null, null);
+ }
+ public SequenceFetcher(IProgressIndicator guiIndic,
+ final String selectedDb, final String queryString)
+ {
+ this._isConstructing = true;
+ this.progressIndicator = guiIndic;
+ final SequenceFetcher us = this;
+ // launch initialiser thread
+ Thread sf = new Thread(new Runnable()
+ {
+
+ @Override
+ public void run()
+ {
+ if (getSequenceFetcherSingleton(progressIndicator) != null)
+ {
+ us.initGui(progressIndicator, selectedDb, queryString);
+ us._isConstructing = false;
+ }
+ else
+ {
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ JvOptionPane
+ .showInternalMessageDialog(
+ Desktop.desktop,
+ MessageManager
+ .getString("warn.couldnt_create_sequence_fetcher_client"),
+ MessageManager
+ .getString("label.couldnt_create_sequence_fetcher"),
+ JvOptionPane.ERROR_MESSAGE);
+ }
+ });
+
+ // raise warning dialog
+ }
+ }
+ });
+ sf.start();
+ }
+
+ /**
+ * blocking call which creates a new sequence fetcher panel, configures it and
+ * presses the OK button with the given database and query.
+ *
+ * @param database
+ * @param query
+ */
+ public static List fetchAndShow(String database, String query)
+ {
+ final SequenceFetcher sf = new SequenceFetcher(Desktop.instance,
+ database, query);
+ while (sf._isConstructing)
+ {
+ try
+ {
+ Thread.sleep(50);
+ } catch (Exception q)
+ {
+ return Collections.emptyList();
+ }
+ }
+ sf.newAlframes = new ArrayList();
+ sf.run();
+ return sf.newAlframes;
+ }
+
+ private class DatabaseAuthority extends DefaultMutableTreeNode
+ {
+
+ };
+
+ private class DatabaseSource extends DefaultMutableTreeNode
+ {
+
+ };
+
+ /**
+ * initialise the database and query for this fetcher panel
+ *
+ * @param selectedDb
+ * - string that should correspond to a sequence fetcher
+ * @param queryString
+ * - string that will be entered in the query dialog
+ * @return true if UI was configured with valid database and query string
+ */
+ protected boolean setInitialQuery(String selectedDb, String queryString)
+ {
+ if (selectedDb == null || selectedDb.trim().length() == 0)
+ {
+ return false;
+ }
try
{
- jbInit();
+ List sp = sfetch.getSourceProxy(selectedDb);
+ for (DbSourceProxy sourcep : sp)
+ {
+ if (sourcep.getTier() == 0)
+ {
+ database.selection = Arrays
+ .asList(new DbSourceProxy[] { sourcep });
+ break;
+ }
+ }
+ if (database.selection == null || database.selection.size() == 0)
+ {
+ System.err.println("Ignoring fetch parameter db='" + selectedDb
+ + "'");
+ return false;
+ }
+ textArea.setText(queryString);
+ } catch (Exception q)
+ {
+ System.err.println("Ignoring fetch parameter db='" + selectedDb
+ + "' and query='" + queryString + "'");
+ return false;
}
- catch (Exception ex)
+ return true;
+ }
+
+ /**
+ * called by thread spawned by constructor
+ *
+ * @param guiWindow
+ * @param queryString
+ * @param selectedDb
+ */
+ private void initGui(IProgressIndicator guiWindow, String selectedDb,
+ String queryString)
+ {
+ this.guiWindow = guiWindow;
+ if (guiWindow instanceof AlignFrame)
+ {
+ alignFrame = (AlignFrame) guiWindow;
+ }
+ database = new JDatabaseTree(sfetch);
+ try
+ {
+ jbInit();
+ /*
+ * configure the UI with any query parameters we were called with
+ */
+ if (!setInitialQuery(selectedDb, queryString))
+ {
+ /*
+ * none provided, so show the database chooser
+ */
+ database.waitForInput();
+ }
+ } catch (Exception ex)
{
ex.printStackTrace();
}
frame = new JInternalFrame();
frame.setContentPane(this);
- if (System.getProperty("os.name").startsWith("Mac"))
- Desktop.addInternalFrame(frame, getFrameTitle(), 400, 140);
+ if (Platform.isAMac())
+ {
+ Desktop.addInternalFrame(frame, getFrameTitle(), false, 400, 240);
+ }
else
- Desktop.addInternalFrame(frame, getFrameTitle(), 400, 125);
+ {
+ Desktop.addInternalFrame(frame, getFrameTitle(), false, 400, 180);
+ }
}
private String getFrameTitle()
{
- return ( (alignFrame == null) ? "New " : "Additional ") + "Sequence Fetcher";
+ return ((alignFrame == null) ? MessageManager
+ .getString("label.new_sequence_fetcher") : MessageManager
+ .getString("label.additional_sequence_fetcher"));
}
- private void jbInit()
- throws Exception
+ private void jbInit() throws Exception
{
- this.setLayout(gridBagLayout1);
+ this.setLayout(borderLayout2);
- database.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
- database.setMinimumSize(new Dimension(160, 21));
- database.setPreferredSize(new Dimension(160, 21));
+ database.setFont(JvSwingUtils.getLabelFont());
+ dbeg.setFont(new java.awt.Font("Verdana", Font.BOLD, 11));
jLabel1.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11));
- jLabel1.setText(
- "Separate multiple accession ids with semi colon \";\"");
- ok.setText("OK");
+ jLabel1.setHorizontalAlignment(SwingConstants.CENTER);
+ jLabel1.setText(MessageManager
+ .getString("label.separate_multiple_accession_ids"));
+
+ replacePunctuation.setHorizontalAlignment(SwingConstants.CENTER);
+ replacePunctuation
+ .setFont(new java.awt.Font("Verdana", Font.ITALIC, 11));
+ replacePunctuation.setText(MessageManager
+ .getString("label.replace_commas_semicolons"));
+ ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ok_actionPerformed();
+ }
+ });
+ clear.setText(MessageManager.getString("action.clear"));
+ clear.addActionListener(new ActionListener()
+ {
+ @Override
public void actionPerformed(ActionEvent e)
{
- ok_actionPerformed(e);
+ clear_actionPerformed();
}
});
- close.setText("Close");
+
+ example.setText(MessageManager.getString("label.example"));
+ example.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ example_actionPerformed();
+ }
+ });
+ close.setText(MessageManager.getString("action.close"));
close.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent e)
{
close_actionPerformed(e);
}
});
- textfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
- textfield.addActionListener(new ActionListener()
+ textArea.setFont(JvSwingUtils.getLabelFont());
+ textArea.setLineWrap(true);
+ textArea.addKeyListener(new KeyAdapter()
{
- public void actionPerformed(ActionEvent e)
+ @Override
+ public void keyPressed(KeyEvent e)
{
- ok_actionPerformed(e);
+ if (e.getKeyCode() == KeyEvent.VK_ENTER)
+ {
+ ok_actionPerformed();
+ }
}
});
+ jPanel3.setLayout(borderLayout1);
+ borderLayout1.setVgap(5);
jPanel1.add(ok);
+ jPanel1.add(example);
+ jPanel1.add(clear);
jPanel1.add(close);
- this.add(jLabel1, new GridBagConstraints(0, 0, 2, 1, 0.0, 0.0
- , GridBagConstraints.WEST,
- GridBagConstraints.NONE,
- new Insets(7, 4, 0, 6), 77, 6));
- this.add(jPanel1, new GridBagConstraints(0, 2, 2, 1, 1.0, 1.0
- , GridBagConstraints.WEST,
- GridBagConstraints.BOTH,
- new Insets(7, -2, 7, 12), 241, -2));
- this.add(database, new GridBagConstraints(0, 1, 1, 1, 1.0, 0.0
- , GridBagConstraints.WEST,
- GridBagConstraints.NONE,
- new Insets(0, 4, 0, 0), 1, 0));
- this.add(textfield, new GridBagConstraints(1, 1, 1, 1, 1.0, 0.0
- , GridBagConstraints.CENTER,
- GridBagConstraints.NONE,
- new Insets(0, 0, 0, 6), 211, 1));
+ jPanel2.setLayout(borderLayout3);
+ databaseButt = /*database.getDatabaseSelectorButton();
+ final JButton viewdbs =*/new JButton(
+ MessageManager.getString("action.select_ddbb"));
+ databaseButt.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent arg0)
+ {
+ hidePanel();
+ database.showDialog();
+ }
+ });
+ databaseButt.setFont(JvSwingUtils.getLabelFont());
+ database.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ String currentSelection = database.getSelectedItem();
+ if (currentSelection == null)
+ {
+ close_actionPerformed(null);
+ }
+
+ showPanel();
+
+ if ("pdb".equalsIgnoreCase(currentSelection))
+ {
+ pdbSourceAction();
+ }
+ else if ("uniprot".equalsIgnoreCase(currentSelection))
+ {
+ uniprotSourceAction();
+ }
+ else
+ {
+ otherSourceAction();
+ }
+ database.action = -1;
+ }
+ });
+
+ dbeg.setText("");
+ jPanel2.add(databaseButt, java.awt.BorderLayout.NORTH);
+ jPanel2.add(dbeg, java.awt.BorderLayout.CENTER);
+ JPanel jPanel2a = new JPanel(new BorderLayout());
+ jPanel2a.add(jLabel1, java.awt.BorderLayout.NORTH);
+ jPanel2a.add(replacePunctuation, java.awt.BorderLayout.SOUTH);
+ jPanel2.add(jPanel2a, java.awt.BorderLayout.SOUTH);
+ // jPanel2.setPreferredSize(new Dimension())
+ jPanel3.add(jScrollPane1, java.awt.BorderLayout.CENTER);
+ this.add(jPanel1, java.awt.BorderLayout.SOUTH);
+ this.add(jPanel3, java.awt.BorderLayout.CENTER);
+ this.add(jPanel2, java.awt.BorderLayout.NORTH);
+ jScrollPane1.getViewport().add(textArea);
+ }
+
+ private void pdbSourceAction()
+ {
+ databaseButt.setText(database.getSelectedItem());
+ new PDBFTSPanel(this);
+ frame.dispose();
+ }
+
+ private void uniprotSourceAction()
+ {
+ databaseButt.setText(database.getSelectedItem());
+ new UniprotFTSPanel(this);
+ frame.dispose();
+ }
+
+ private void otherSourceAction()
+ {
+ try
+ {
+ databaseButt.setText(database.getSelectedItem()
+ + (database.getSelectedSources().size() > 1 ? " (and "
+ + database.getSelectedSources().size() + " others)"
+ : ""));
+ String eq = database.getExampleQueries();
+ dbeg.setText(MessageManager.formatMessage(
+ "label.example_query_param", new String[] { eq }));
+ boolean enablePunct = !(eq != null && eq.indexOf(",") > -1);
+ for (DbSourceProxy dbs : database.getSelectedSources())
+ {
+ if (dbs instanceof jalview.ws.dbsources.das.datamodel.DasSequenceSource)
+ {
+ enablePunct = false;
+ break;
+ }
+ }
+ replacePunctuation.setEnabled(enablePunct);
+
+ } catch (Exception ex)
+ {
+ dbeg.setText("");
+ replacePunctuation.setEnabled(true);
+ }
+ jPanel2.repaint();
+ }
+
+ protected void example_actionPerformed()
+ {
+ DbSourceProxy db = null;
+ try
+ {
+ textArea.setText(database.getExampleQueries());
+ } catch (Exception ex)
+ {
+ }
+ jPanel3.repaint();
+ }
+
+ protected void clear_actionPerformed()
+ {
+ textArea.setText("");
+ jPanel3.repaint();
}
- JComboBox database = new JComboBox();
- JLabel jLabel1 = new JLabel();
- JButton ok = new JButton();
- JButton close = new JButton();
- JPanel jPanel1 = new JPanel();
- JTextField textfield = new JTextField();
- GridBagLayout gridBagLayout1 = new GridBagLayout();
public void close_actionPerformed(ActionEvent e)
{
try
{
frame.setClosed(true);
+ } catch (Exception ex)
+ {
}
- catch (Exception ex)
- {}
}
- public void ok_actionPerformed(ActionEvent e)
+ public void ok_actionPerformed()
{
- database.setEnabled(false);
- textfield.setEnabled(false);
+ databaseButt.setEnabled(false);
+ example.setEnabled(false);
+ textArea.setEnabled(false);
ok.setEnabled(false);
close.setEnabled(false);
@@ -153,337 +602,454 @@ public class SequenceFetcher
private void resetDialog()
{
- database.setEnabled(true);
- textfield.setEnabled(true);
+ databaseButt.setEnabled(true);
+ example.setEnabled(true);
+ textArea.setEnabled(true);
ok.setEnabled(true);
close.setEnabled(true);
}
+ @Override
public void run()
{
String error = "";
- if (database.getSelectedItem().equals(noDbSelected))
+ if (!database.hasSelection())
+ {
error += "Please select the source database\n";
- com.stevesoft.pat.Regex empty = new com.stevesoft.pat.Regex("\\s+", "");
- textfield.setText(empty.replaceAll(textfield.getText()));
- if (textfield.getText().length() == 0)
+ }
+ // TODO: make this transformation more configurable
+ com.stevesoft.pat.Regex empty;
+ if (replacePunctuation.isEnabled() && replacePunctuation.isSelected())
+ {
+ empty = new com.stevesoft.pat.Regex(
+ // replace commas and spaces with a semicolon
+ "(\\s|[,; ])+", ";");
+ }
+ else
+ {
+ // just turn spaces and semicolons into single semicolons
+ empty = new com.stevesoft.pat.Regex("(\\s|[; ])+", ";");
+ }
+ textArea.setText(empty.replaceAll(textArea.getText()));
+ // see if there's anthing to search with
+ if (!new com.stevesoft.pat.Regex("[A-Za-z0-9_.]").search(textArea
+ .getText()))
+ {
error += "Please enter a (semi-colon separated list of) database id(s)";
+ }
if (error.length() > 0)
{
showErrorMessage(error);
resetDialog();
return;
}
+ // TODO: Refactor to GUI independent code and write tests.
+ // indicate if successive sources should be merged into one alignment.
+ boolean addToLast = false;
+ List aresultq = new ArrayList();
+ List presultTitle = new ArrayList();
+ List presult = new ArrayList();
+ List aresult = new ArrayList();
+ Iterator proxies = database.getSelectedSources()
+ .iterator();
+ String[] qries;
+ List nextFetch = Arrays.asList(qries = textArea.getText()
+ .split(";"));
+ Iterator en = Arrays.asList(new String[0]).iterator();
+ int nqueries = qries.length;
- result = new StringBuffer();
- if (database.getSelectedItem().equals("Uniprot"))
+ FeatureSettingsModelI preferredFeatureColours = null;
+ while (proxies.hasNext() && (en.hasNext() || nextFetch.size() > 0))
{
- getUniprotFile(textfield.getText());
- }
- else if (database.getSelectedItem().equals("EMBL")
- || database.getSelectedItem().equals("EMBLCDS"))
- {
- StringTokenizer st = new StringTokenizer(textfield.getText(), ";");
- while(st.hasMoreTokens())
+ if (!en.hasNext() && nextFetch.size() > 0)
{
- EBIFetchClient dbFetch = new EBIFetchClient();
+ en = nextFetch.iterator();
+ nqueries = nextFetch.size();
+ // save the remaining queries in the original array
+ qries = nextFetch.toArray(new String[nqueries]);
+ nextFetch = new ArrayList();
+ }
- String[] reply = dbFetch.fetchData(
- database.getSelectedItem().toString().toLowerCase(
- ) + ":" + st.nextToken(),
- "fasta", "raw");
-//
- if (reply != null)
+ DbSourceProxy proxy = proxies.next();
+ try
+ {
+ // update status
+ guiWindow
+ .setProgressBar(MessageManager.formatMessage(
+ "status.fetching_sequence_queries_from",
+ new String[] {
+ Integer.valueOf(nqueries).toString(),
+ proxy.getDbName() }), Thread.currentThread()
+ .hashCode());
+ if (proxy.getMaximumQueryCount() == 1)
{
- for (int i = 0; i < reply.length; i++)
- result.append(reply[i] + "\n");
+ /*
+ * proxy only handles one accession id at a time
+ */
+ while (en.hasNext())
+ {
+ String acc = en.next();
+ if (!fetchSingleAccession(proxy, acc, aresultq, aresult))
+ {
+ nextFetch.add(acc);
+ }
+ }
}
- }
-
- if(result!=null && result.length()>1) // arbitrary minimum length for a seuqence file
+ else
+ {
+ /*
+ * proxy can fetch multiple accessions at one time
+ */
+ fetchMultipleAccessions(proxy, en, aresultq, aresult, nextFetch);
+ }
+ } catch (Exception e)
{
- System.out.println(result.toString());
-
- parseResult(result.toString(), null);
- }
- }
- else if (database.getSelectedItem().equals("PDB"))
- {
- StringTokenizer qset = new StringTokenizer(textfield.getText(), ";");
- String query;
- while (qset.hasMoreTokens() && ((query = qset.nextToken())!=null))
+ showErrorMessage("Error retrieving " + textArea.getText()
+ + " from " + database.getSelectedItem());
+ // error
+ // +="Couldn't retrieve sequences from "+database.getSelectedItem();
+ System.err.println("Retrieval failed for source ='"
+ + database.getSelectedItem() + "' and query\n'"
+ + textArea.getText() + "'\n");
+ e.printStackTrace();
+ } catch (OutOfMemoryError e)
+ {
+ showErrorMessage("Out of Memory when retrieving "
+ + textArea.getText()
+ + " from "
+ + database.getSelectedItem()
+ + "\nPlease see the Jalview FAQ for instructions for increasing the memory available to Jalview.\n");
+ e.printStackTrace();
+ } catch (Error e)
{
- StringBuffer respart = getPDBFile(query.toUpperCase());
- if(respart!=null)
- result.append(respart);
+ showErrorMessage("Serious Error retrieving " + textArea.getText()
+ + " from " + database.getSelectedItem());
+ e.printStackTrace();
}
-
- if (result.length()>0)
- parseResult(result.toString(), null);
- }
- else if( database.getSelectedItem().equals("PFAM"))
- {
- try{
- result.append(new FastaFile(
- "http://www.sanger.ac.uk/cgi-bin/Pfam/getalignment.pl?format=fal&acc="
- + textfield.getText().toUpperCase(), "URL").print()
- );
-
- if(result.length()>0)
- parseResult( result.toString(), textfield.getText().toUpperCase() );
-
- }catch(java.io.IOException ex)
- { result = null; }
- }
-
- if (result == null || result.length() == 0)
- showErrorMessage("Error retrieving " + textfield.getText()
- + " from " + database.getSelectedItem());
-
- resetDialog();
- return;
- }
-
- void getUniprotFile(String id)
- {
- EBIFetchClient ebi = new EBIFetchClient();
- File file = ebi.fetchDataAsFile("uniprot:" + id, "xml", null);
-
- DBRefFetcher dbref = new DBRefFetcher();
- Vector entries = dbref.getUniprotEntries(file);
-
- if (entries != null)
- {
- //First, make the new sequences
- Enumeration en = entries.elements();
- while (en.hasMoreElements())
+ // Stack results ready for opening in alignment windows
+ if (aresult != null && aresult.size() > 0)
{
- UniprotEntry entry = (UniprotEntry) en.nextElement();
-
- StringBuffer name = new StringBuffer(">UniProt/Swiss-Prot");
- Enumeration en2 = entry.getAccession().elements();
- while (en2.hasMoreElements())
+ FeatureSettingsModelI proxyColourScheme = proxy
+ .getFeatureColourScheme();
+ if (proxyColourScheme != null)
{
- name.append("|");
- name.append(en2.nextElement());
+ preferredFeatureColours = proxyColourScheme;
}
- en2 = entry.getName().elements();
- while (en2.hasMoreElements())
+
+ AlignmentI ar = null;
+ if (proxy.isAlignmentSource())
{
- name.append("|");
- name.append(en2.nextElement());
+ addToLast = false;
+ // new window for each result
+ while (aresult.size() > 0)
+ {
+ presult.add(aresult.remove(0));
+ presultTitle.add(aresultq.remove(0) + " "
+ + getDefaultRetrievalTitle());
+ }
}
-
- if (entry.getProtein() != null)
+ else
{
- name.append(" " + entry.getProtein().getName().elementAt(0));
+ String titl = null;
+ if (addToLast && presult.size() > 0)
+ {
+ ar = presult.remove(presult.size() - 1);
+ titl = presultTitle.remove(presultTitle.size() - 1);
+ }
+ // concatenate all results in one window
+ while (aresult.size() > 0)
+ {
+ if (ar == null)
+ {
+ ar = aresult.remove(0);
+ }
+ else
+ {
+ ar.append(aresult.remove(0));
+ }
+ }
+ addToLast = true;
+ presult.add(ar);
+ presultTitle.add(titl);
}
-
- result.append(name + "\n" + entry.getUniprotSequence().getContent() +
- "\n");
-
}
-
- //Then read in the features and apply them to the dataset
- Alignment al = parseResult(result.toString(), null);
- for (int i = 0; i < entries.size(); i++)
+ guiWindow.setProgressBar(MessageManager
+ .getString("status.finshed_querying"), Thread.currentThread()
+ .hashCode());
+ }
+ guiWindow.setProgressBar(
+ (presult.size() > 0) ? MessageManager
+ .getString("status.parsing_results") : MessageManager
+ .getString("status.processing"), Thread.currentThread()
+ .hashCode());
+ // process results
+ while (presult.size() > 0)
+ {
+ parseResult(presult.remove(0), presultTitle.remove(0), null,
+ preferredFeatureColours);
+ }
+ // only remove visual delay after we finished parsing.
+ guiWindow.setProgressBar(null, Thread.currentThread().hashCode());
+ if (nextFetch.size() > 0)
+ {
+ StringBuffer sb = new StringBuffer();
+ sb.append("Didn't retrieve the following "
+ + (nextFetch.size() == 1 ? "query" : nextFetch.size()
+ + " queries") + ": \n");
+ int l = sb.length(), lr = 0;
+ for (String s : nextFetch)
{
- UniprotEntry entry = (UniprotEntry) entries.elementAt(i);
- Enumeration e = entry.getDbReference().elements();
- Vector onlyPdbEntries = new Vector();
- while (e.hasMoreElements())
+ if (l != sb.length())
{
- PDBEntry pdb = (PDBEntry) e.nextElement();
- if (!pdb.getType().equals("PDB"))
- continue;
-
- onlyPdbEntries.addElement(pdb);
+ sb.append("; ");
}
-
- Enumeration en2 = entry.getAccession().elements();
- while (en2.hasMoreElements())
+ if (lr - sb.length() > 40)
{
- al.getSequenceAt(i).getDatasetSequence().addDBRef(new DBRefEntry(DBRefSource.UNIPROT,
- "0",
- en2.nextElement().toString()));
- }
-
-
-
-
- al.getSequenceAt(i).getDatasetSequence().setPDBId(onlyPdbEntries);
- if (entry.getFeature() != null)
- {
- e = entry.getFeature().elements();
- while (e.hasMoreElements())
- {
- SequenceFeature sf = (SequenceFeature) e.nextElement();
- sf.setFeatureGroup("Uniprot");
- al.getSequenceAt(i).getDatasetSequence().addSequenceFeature( sf );
- }
+ sb.append("\n");
}
+ sb.append(s);
}
+ showErrorMessage(sb.toString());
}
+ resetDialog();
}
- StringBuffer getPDBFile(String id)
+ /**
+ * Tries to fetch one or more accession ids from the database proxy
+ *
+ * @param proxy
+ * @param accessions
+ * the queries to fetch
+ * @param aresultq
+ * a successful queries list to add to
+ * @param aresult
+ * a list of retrieved alignments to add to
+ * @param nextFetch
+ * failed queries are added to this list
+ * @throws Exception
+ */
+ void fetchMultipleAccessions(DbSourceProxy proxy,
+ Iterator accessions, List aresultq,
+ List aresult, List nextFetch)
+ throws Exception
{
- StringBuffer result = new StringBuffer();
- String chain = null;
- if (id.indexOf(":") > -1)
+ StringBuilder multiacc = new StringBuilder();
+ List tosend = new ArrayList();
+ while (accessions.hasNext())
{
- chain = id.substring(id.indexOf(":") + 1);
- id = id.substring(0, id.indexOf(":"));
+ String nel = accessions.next();
+ tosend.add(nel);
+ multiacc.append(nel);
+ if (accessions.hasNext())
+ {
+ multiacc.append(proxy.getAccessionSeparator());
+ }
}
- EBIFetchClient ebi = new EBIFetchClient();
- String file = ebi.fetchDataAsFile("pdb:" + id, "pdb", "raw").getAbsolutePath();
- if (file == null)
- return null;
try
{
- PDBfile pdbfile = new PDBfile(file, jalview.io.AppletFormatAdapter.FILE);
- for (int i = 0; i < pdbfile.chains.size(); i++)
+ String query = multiacc.toString();
+ AlignmentI rslt = proxy.getSequenceRecords(query);
+ if (rslt == null || rslt.getHeight() == 0)
{
- if (chain == null ||
- ( (PDBChain) pdbfile.chains.elementAt(i)).id.
- toUpperCase().equals(chain))
-
- result.append("\n>PDB|" + id + "|" +
- ( (PDBChain) pdbfile.chains.elementAt(i)).sequence.
- getName() +
- "\n"
- +
- ( (PDBChain) pdbfile.chains.elementAt(i)).sequence.
- getSequenceAsString());
+ // no results - pass on all queries to next source
+ nextFetch.addAll(tosend);
}
- }
- catch (Exception ex) // Problem parsing PDB file
+ else
+ {
+ aresultq.add(query);
+ aresult.add(rslt);
+ if (tosend.size() > 1)
+ {
+ checkResultForQueries(rslt, tosend, nextFetch, proxy);
+ }
+ }
+ } catch (OutOfMemoryError oome)
{
- jalview.bin.Cache.log.warn("Exception when retrieving " +
- textfield.getText() + " from " +
- database.getSelectedItem(), ex);
- return null;
+ new OOMWarning("fetching " + multiacc + " from "
+ + database.getSelectedItem(), oome, this);
}
-
- return result;
}
- Alignment parseResult(String result, String title)
+ /**
+ * Query for a single accession id via the database proxy
+ *
+ * @param proxy
+ * @param accession
+ * @param aresultq
+ * a list of successful queries to add to
+ * @param aresult
+ * a list of retrieved alignments to add to
+ * @return true if the fetch was successful, else false
+ */
+ boolean fetchSingleAccession(DbSourceProxy proxy, String accession,
+ List aresultq, List aresult)
{
- String format = new IdentifyFile().Identify(result, "Paste");
- Alignment al = null;
+ boolean success = false;
+ try
+ {
+ if (aresult != null)
+ {
+ try
+ {
+ // give the server a chance to breathe
+ Thread.sleep(5);
+ } catch (Exception e)
+ {
+ //
+ }
+ }
- if (FormatAdapter.isValidFormat(format))
+ AlignmentI indres = null;
+ try
+ {
+ indres = proxy.getSequenceRecords(accession);
+ } catch (OutOfMemoryError oome)
+ {
+ new OOMWarning("fetching " + accession + " from "
+ + proxy.getDbName(), oome, this);
+ }
+ if (indres != null)
+ {
+ aresultq.add(accession);
+ aresult.add(indres);
+ success = true;
+ }
+ } catch (Exception e)
{
+ Cache.log.info(
+ "Error retrieving " + accession + " from "
+ + proxy.getDbName(), e);
+ }
+ return success;
+ }
- try{ al = new FormatAdapter().readFile(result.toString(), "Paste",
- format);}
- catch(Exception ex){}
+ /**
+ * Checks which of the queries were successfully retrieved by searching the
+ * DBRefs of the retrieved sequences for a match. Any not found are added to
+ * the 'nextFetch' list.
+ *
+ * @param rslt
+ * @param queries
+ * @param nextFetch
+ * @param proxy
+ */
+ void checkResultForQueries(AlignmentI rslt, List queries,
+ List nextFetch, DbSourceProxy proxy)
+ {
+ SequenceI[] rs = rslt.getSequencesArray();
- if (al != null && al.getHeight() > 0)
+ for (String q : queries)
+ {
+ DBRefEntry dbr = new DBRefEntry();
+ dbr.setSource(proxy.getDbSource());
+ dbr.setVersion(null);
+ String accId = proxy.getAccessionIdFromQuery(q);
+ dbr.setAccessionId(accId);
+ boolean rfound = false;
+ for (int r = 0; r < rs.length; r++)
{
- if (alignFrame == null)
+ if (rs[r] != null)
{
- AlignFrame af = new AlignFrame(al,
- AlignFrame.DEFAULT_WIDTH,
- AlignFrame.DEFAULT_HEIGHT
-);
- af.currentFileFormat = format;
- if(title==null)
- title = "Retrieved from " + database.getSelectedItem();
- Desktop.addInternalFrame(af,
- title,
- AlignFrame.DEFAULT_WIDTH,
- AlignFrame.DEFAULT_HEIGHT);
- af.statusBar.setText("Successfully pasted alignment file");
-
- try
+ List found = DBRefUtils.searchRefs(rs[r].getDBRefs(),
+ accId);
+ if (!found.isEmpty())
{
- af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
+ rfound = true;
+ break;
}
- catch (Exception ex)
- {}
}
- else
- {
- for (int i = 0; i < al.getHeight(); i++)
- {
- alignFrame.viewport.alignment.addSequence(al.getSequenceAt(i));
-
- ////////////////////////////
- //Dataset needs extension;
- /////////////////////////////
- Sequence ds = new Sequence(al.getSequenceAt(i).getName(),
- AlignSeq.extractGaps("-. ",
- al.getSequenceAt(i).getSequenceAsString()),
- al.getSequenceAt(i).getStart(),
- al.getSequenceAt(i).getEnd());
- al.getSequenceAt(i).setDatasetSequence(ds);
- alignFrame.viewport.alignment.getDataset().addSequence(ds);
- }
- alignFrame.viewport.setEndSeq(alignFrame.viewport.alignment.
- getHeight());
- alignFrame.viewport.alignment.getWidth();
- alignFrame.viewport.firePropertyChange("alignment", null,
- alignFrame.viewport.
- getAlignment().getSequences());
+ }
+ if (!rfound)
+ {
+ nextFetch.add(q);
+ }
+ }
+ }
+ /**
+ *
+ * @return a standard title for any results retrieved using the currently
+ * selected source and settings
+ */
+ public String getDefaultRetrievalTitle()
+ {
+ return "Retrieved from " + database.getSelectedItem();
+ }
+
+ AlignmentI parseResult(AlignmentI al, String title,
+ FileFormatI currentFileFormat,
+ FeatureSettingsModelI preferredFeatureColours)
+ {
+
+ if (al != null && al.getHeight() > 0)
+ {
+ if (title == null)
+ {
+ title = getDefaultRetrievalTitle();
+ }
+ if (alignFrame == null)
+ {
+ AlignFrame af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
+ AlignFrame.DEFAULT_HEIGHT);
+ if (currentFileFormat != null)
+ {
+ af.currentFileFormat = currentFileFormat; // WHAT IS THE DEFAULT
+ // FORMAT FOR
+ // NON-FormatAdapter Sourced
+ // Alignments?
}
- if (database.getSelectedItem().equals("PDB"))
+ SequenceFeature[] sfs = null;
+ List alsqs;
+ synchronized (alsqs = al.getSequences())
{
- // Parse out the ids from the structured names
- boolean errors = false;
- for (int i = 0; i < al.getHeight(); i++)
+ for (SequenceI sq : alsqs)
{
- PDBEntry entry = new PDBEntry();
- com.stevesoft.pat.Regex idbits = new com.stevesoft.pat.Regex(
- "PDB\\|([0-9A-z]{4})\\|(.)");
- if (idbits.search(al.getSequenceAt(i).getName()))
+ if ((sfs = sq.getSequenceFeatures()) != null)
{
- String pdbid = idbits.substring(1);
- String pdbccode = idbits.substring(2);
- // Construct the PDBEntry
- entry.setId(pdbid);
- if (entry.getProperty() == null)
- entry.setProperty(new Hashtable());
- entry.getProperty().put("chains",
- pdbccode
- + "=" + al.getSequenceAt(i).getStart()
- + "-" + al.getSequenceAt(i).getEnd());
- al.getSequenceAt(i).getDatasetSequence().addPDBId(entry);
-
- // We make a DBRefEtntry because we have obtained the PDB file from a verifiable source
- // JBPNote - PDB DBRefEntry should also carry the chain and mapping information
- DBRefEntry dbentry = new DBRefEntry(jalview.datamodel.DBRefSource.PDB,"0",pdbid);
- al.getSequenceAt(i).getDatasetSequence().addDBRef(dbentry);
- }
- else
- {
- // don't add an entry for this chain, but this is probably a bug
- // that the user should know about.
- jalview.bin.Cache.log.warn(
- "No PDBEntry constructed for sequence " + i + " : " +
- al.getSequenceAt(i).getName());
- errors = true;
+ if (sfs.length > 0)
+ {
+ af.setShowSeqFeatures(true);
+ break;
+ }
}
+
}
- if (errors)
- jalview.bin.Cache.log.warn(
- "Query string that resulted in PDBEntry construction failure was :\n" +
- textfield.getText());
}
+ if (preferredFeatureColours != null)
+ {
+ af.getViewport().applyFeaturesStyle(preferredFeatureColours);
+ }
+ if (Cache.getDefault("HIDE_INTRONS", true))
+ {
+ af.hideFeatureColumns(SequenceOntologyI.EXON, false);
+ }
+ if (newAlframes != null)
+ {
+ newAlframes.add(af);
+ }
+ Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH,
+ AlignFrame.DEFAULT_HEIGHT);
+
+ af.statusBar.setText(MessageManager
+ .getString("label.successfully_pasted_alignment_file"));
+
+ try
+ {
+ af.setMaximum(Cache.getDefault("SHOW_FULLSCREEN", false));
+ } catch (Exception ex)
+ {
+ }
}
else
- showErrorMessage("Error retrieving " + textfield.getText()
- + " from " + database.getSelectedItem());
+ {
+ alignFrame.viewport.addAlignment(al, title);
+ }
}
-
return al;
-
}
void showErrorMessage(final String error)
@@ -491,13 +1057,41 @@ public class SequenceFetcher
resetDialog();
javax.swing.SwingUtilities.invokeLater(new Runnable()
{
+ @Override
public void run()
{
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
- error, "Error Retrieving Data",
- JOptionPane.WARNING_MESSAGE);
+ JvOptionPane.showInternalMessageDialog(Desktop.desktop, error,
+ MessageManager.getString("label.error_retrieving_data"),
+ JvOptionPane.WARNING_MESSAGE);
}
});
}
-}
+ public IProgressIndicator getProgressIndicator()
+ {
+ return progressIndicator;
+ }
+
+ public void setProgressIndicator(IProgressIndicator progressIndicator)
+ {
+ this.progressIndicator = progressIndicator;
+ }
+
+ /**
+ * Make this panel visible (after a selection has been made in the database
+ * chooser)
+ */
+ void showPanel()
+ {
+ frame.setVisible(true);
+ }
+
+ /**
+ * Hide this panel (on clicking the database button to open the database
+ * chooser)
+ */
+ void hidePanel()
+ {
+ frame.setVisible(false);
+ }
+}