import jalview.datamodel.DBRefEntry;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
+import jalview.fts.core.GFTSPanel;
import jalview.fts.service.pdb.PDBFTSPanel;
import jalview.fts.service.uniprot.UniprotFTSPanel;
import jalview.io.FileFormatI;
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;
JButton close = new JButton();
+ JButton back = new JButton();
+
JPanel jPanel1 = new JPanel();
JTextArea textArea = new JTextArea();
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;
{
if (guiWindow != null)
{
- guiWindow
- .setProgressBar(
- MessageManager
- .getString("status.waiting_sequence_database_fetchers_init"),
- Thread.currentThread().hashCode());
+ 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.
}
if (guiWindow != null)
{
- guiWindow
- .setProgressBar(
- MessageManager
- .getString("status.waiting_sequence_database_fetchers_init"),
- Thread.currentThread().hashCode());
+ 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())
+ if (sfetch == null)
{
_initingFetcher = true;
initingThread = Thread.currentThread();
*/
if (guiWindow != null)
{
- guiWindow.setProgressBar(MessageManager
- .getString("status.init_sequence_database_fetchers"),
+ 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;
@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);
+ JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+ MessageManager.getString(
+ "warn.couldnt_create_sequence_fetcher_client"),
+ MessageManager.getString(
+ "label.couldnt_create_sequence_fetcher"),
+ JvOptionPane.ERROR_MESSAGE);
}
});
return Collections.emptyList();
}
}
- sf.newAlframes = new ArrayList<AlignFrame>();
+ sf.newAlframes = new ArrayList<>();
sf.run();
return sf.newAlframes;
}
if (sourcep.getTier() == 0)
{
database.selection = Arrays
- .asList(new DbSourceProxy[] { sourcep });
+ .asList(new DbSourceProxy[]
+ { sourcep });
break;
}
}
if (database.selection == null || database.selection.size() == 0)
{
- System.err.println("Ignoring fetch parameter db='" + selectedDb
- + "'");
+ System.err.println(
+ "Ignoring fetch parameter db='" + selectedDb + "'");
return false;
}
textArea.setText(queryString);
private String getFrameTitle()
{
- return ((alignFrame == null) ? MessageManager
- .getString("label.new_sequence_fetcher") : MessageManager
- .getString("label.additional_sequence_fetcher"));
+ return ((alignFrame == null)
+ ? MessageManager.getString("label.new_sequence_fetcher")
+ : MessageManager
+ .getString("label.additional_sequence_fetcher"));
}
+ GFTSPanel parentFTSframe = null;
+ /**
+ * change the buttons so they fit with the FTS panel.
+ */
+ public void embedWithFTSPanel(GFTSPanel toClose)
+ {
+ back.setVisible(true);
+ parentFTSframe = toClose;
+ }
private void jbInit() throws Exception
{
this.setLayout(borderLayout2);
replacePunctuation.setHorizontalAlignment(SwingConstants.CENTER);
replacePunctuation
.setFont(new java.awt.Font("Verdana", Font.ITALIC, 11));
- replacePunctuation.setText(MessageManager
- .getString("label.replace_commas_semicolons"));
+ replacePunctuation.setText(
+ MessageManager.getString("label.replace_commas_semicolons"));
ok.setText(MessageManager.getString("action.ok"));
ok.addActionListener(new ActionListener()
{
example_actionPerformed();
}
});
- close.setText(MessageManager.getString("action.close"));
+ close.setText(MessageManager.getString("action.cancel"));
close.addActionListener(new ActionListener()
{
@Override
close_actionPerformed(e);
}
});
+ back.setText(MessageManager.getString("action.back"));
+ back.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ parentFTSframe.btn_back_ActionPerformed();
+ }
+ });
+ // back not visible unless embedded
+ back.setVisible(false);
textArea.setFont(JvSwingUtils.getLabelFont());
textArea.setLineWrap(true);
textArea.addKeyListener(new KeyAdapter()
});
jPanel3.setLayout(borderLayout1);
borderLayout1.setVgap(5);
- jPanel1.add(ok);
+ jPanel1.add(back);
jPanel1.add(example);
jPanel1.add(clear);
+ jPanel1.add(ok);
jPanel1.add(close);
jPanel2.setLayout(borderLayout3);
databaseButt = /*database.getDatabaseSelectorButton();
+ database.getSelectedSources().size() + " others)"
: ""));
String eq = database.getExampleQueries();
- dbeg.setText(MessageManager.formatMessage(
- "label.example_query_param", new String[] { eq }));
+ dbeg.setText(MessageManager.formatMessage("label.example_query_param",
+ new String[]
+ { eq }));
+ // TODO this should be a property of the SequenceFetcher whether commas are and
+ // colons are allowed in the IDs...
+
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)
try
{
frame.setClosed(true);
+ if (parentFTSframe!=null)
+ {
+ parentFTSframe.btn_cancel_ActionPerformed();
+ }
} catch (Exception ex)
{
}
textArea.setEnabled(false);
ok.setEnabled(false);
close.setEnabled(false);
-
+ back.setEnabled(false);
Thread worker = new Thread(this);
worker.start();
}
textArea.setEnabled(true);
ok.setEnabled(true);
close.setEnabled(true);
+ back.setEnabled(parentFTSframe != null);
}
@Override
if (replacePunctuation.isEnabled() && replacePunctuation.isSelected())
{
empty = new com.stevesoft.pat.Regex(
- // replace commas and spaces with a semicolon
+ // replace commas and spaces with a semicolon
"(\\s|[,; ])+", ";");
}
else
}
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()))
+ 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)";
}
// TODO: Refactor to GUI independent code and write tests.
// indicate if successive sources should be merged into one alignment.
boolean addToLast = false;
- List<String> aresultq = new ArrayList<String>();
- List<String> presultTitle = new ArrayList<String>();
- List<AlignmentI> presult = new ArrayList<AlignmentI>();
- List<AlignmentI> aresult = new ArrayList<AlignmentI>();
+ List<String> aresultq = new ArrayList<>();
+ List<String> presultTitle = new ArrayList<>();
+ List<AlignmentI> presult = new ArrayList<>();
+ List<AlignmentI> aresult = new ArrayList<>();
Iterator<DbSourceProxy> proxies = database.getSelectedSources()
.iterator();
String[] qries;
- List<String> nextFetch = Arrays.asList(qries = textArea.getText()
- .split(";"));
+ List<String> nextFetch = Arrays
+ .asList(qries = textArea.getText().split(";"));
Iterator<String> en = Arrays.asList(new String[0]).iterator();
int nqueries = qries.length;
nqueries = nextFetch.size();
// save the remaining queries in the original array
qries = nextFetch.toArray(new String[nqueries]);
- nextFetch = new ArrayList<String>();
+ nextFetch = new ArrayList<>();
}
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());
+ guiWindow.setProgressBar(MessageManager.formatMessage(
+ "status.fetching_sequence_queries_from", new String[]
+ { Integer.valueOf(nqueries).toString(),
+ proxy.getDbName() }),
+ Thread.currentThread().hashCode());
if (proxy.getMaximumQueryCount() == 1)
{
/*
}
} catch (Exception e)
{
- showErrorMessage("Error retrieving " + textArea.getText()
- + " from " + database.getSelectedItem());
+ showErrorMessage("Error retrieving " + textArea.getText() + " from "
+ + database.getSelectedItem());
// error
// +="Couldn't retrieve sequences from "+database.getSelectedItem();
System.err.println("Retrieval failed for source ='"
} catch (OutOfMemoryError e)
{
showErrorMessage("Out of Memory when retrieving "
- + textArea.getText()
- + " from "
- + database.getSelectedItem()
+ + 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)
while (aresult.size() > 0)
{
presult.add(aresult.remove(0));
- presultTitle.add(aresultq.remove(0) + " "
- + getDefaultRetrievalTitle());
+ presultTitle.add(
+ aresultq.remove(0) + " " + getDefaultRetrievalTitle());
}
}
else
presultTitle.add(titl);
}
}
- guiWindow.setProgressBar(MessageManager
- .getString("status.finshed_querying"), Thread.currentThread()
- .hashCode());
+ 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());
+ guiWindow
+ .setProgressBar(
+ (presult.size() > 0)
+ ? MessageManager
+ .getString("status.parsing_results")
+ : MessageManager.getString("status.processing"),
+ Thread.currentThread().hashCode());
// process results
while (presult.size() > 0)
{
{
StringBuffer sb = new StringBuffer();
sb.append("Didn't retrieve the following "
- + (nextFetch.size() == 1 ? "query" : nextFetch.size()
- + " queries") + ": \n");
+ + (nextFetch.size() == 1 ? "query"
+ : nextFetch.size() + " queries")
+ + ": \n");
int l = sb.length(), lr = 0;
for (String s : nextFetch)
{
*/
void fetchMultipleAccessions(DbSourceProxy proxy,
Iterator<String> accessions, List<String> aresultq,
- List<AlignmentI> aresult, List<String> nextFetch)
- throws Exception
+ List<AlignmentI> aresult, List<String> nextFetch) throws Exception
{
StringBuilder multiacc = new StringBuilder();
- List<String> tosend = new ArrayList<String>();
+ List<String> tosend = new ArrayList<>();
while (accessions.hasNext())
{
String nel = accessions.next();
indres = proxy.getSequenceRecords(accession);
} catch (OutOfMemoryError oome)
{
- new OOMWarning("fetching " + accession + " from "
- + proxy.getDbName(), oome, this);
+ new OOMWarning(
+ "fetching " + accession + " from " + proxy.getDbName(),
+ oome, this);
}
if (indres != null)
{
}
} catch (Exception e)
{
- Cache.log.info(
- "Error retrieving " + accession + " from "
- + proxy.getDbName(), e);
+ Cache.log.info("Error retrieving " + accession + " from "
+ + proxy.getDbName(), e);
}
return success;
}
}
if (Cache.getDefault("HIDE_INTRONS", true))
{
- af.hideFeatureColumns(SequenceOntologyI.EXON, false);
+ af.hideFeatureColumns(false, SequenceOntologyI.EXON);
}
if (newAlframes != null)
{
{
frame.setVisible(false);
}
+
+ public void setDatabaseChooserVisible(boolean b)
+ {
+ databaseButt.setVisible(b);
+ }
}
git://source.jalview.org / jalview.git / blobdiff