frame = new JInternalFrame();
frame.setContentPane(this);
- int height = Platform.isAMac() ? 240 : 180;
- Desktop.addInternalFrame(frame, getFrameTitle(), true, 400, height);
+ Desktop.addInternalFrame(frame, getFrameTitle(), true, 400,
+ Platform.isAMacAndNotJS() ? 240 : 180);
}
private String getFrameTitle()
if ("pdb".equalsIgnoreCase(currentSelection))
{
- new PDBFTSPanel(SequenceFetcher.this);
frame.dispose();
+ new PDBFTSPanel(SequenceFetcher.this);
}
else if ("uniprot".equalsIgnoreCase(currentSelection))
{
- new UniprotFTSPanel(SequenceFetcher.this);
frame.dispose();
+ new UniprotFTSPanel(SequenceFetcher.this);
}
else
{
JLabel jLabel1 = new JLabel(MessageManager
.getString("label.separate_multiple_accession_ids"));
jLabel1.setFont(new Font("Verdana", Font.ITALIC, 11));
- jLabel1.setHorizontalAlignment(SwingConstants.CENTER);
+ jLabel1.setHorizontalAlignment(SwingConstants.LEFT);
replacePunctuation = new JCheckBox(
MessageManager.getString("label.replace_commas_semicolons"));
- replacePunctuation.setHorizontalAlignment(SwingConstants.CENTER);
+ replacePunctuation.setHorizontalAlignment(SwingConstants.LEFT);
replacePunctuation.setFont(new Font("Verdana", Font.ITALIC, 11));
okBtn = new JButton(MessageManager.getString("action.ok"));
okBtn.addActionListener(new ActionListener()
/*
* tidy inputs and check there is something to search for
*/
- String text = textArea.getText();
+ String t0 = textArea.getText();
+ String text = t0.trim();
if (replacePunctuation.isEnabled() && replacePunctuation.isSelected())
{
text = text.replace(",", ";");
}
- text = text.replaceAll("(\\s|[,; ])+", ";");
- textArea.setText(text);
+ text = text.replaceAll("(\\s|[; ])+", ";");
+ if (!t0.equals(text))
+ {
+ textArea.setText(text);
+ }
if (text.isEmpty())
{
// todo i18n
resetDialog();
return;
}
+ if (database.getSelectedIndex() == 0)
+ {
+ // todo i18n
+ showErrorMessage("Please choose a database");
+ resetDialog();
+ return;
+ }
+
exampleBtn.setEnabled(false);
textArea.setEnabled(false);
okBtn.setEnabled(false);
List<DbSourceProxy> sources = sfetch
.getSourceProxy((String) database.getSelectedItem());
Iterator<DbSourceProxy> proxies = sources.iterator();
- String[] qries;
- List<String> nextFetch = Arrays
- .asList(qries = textArea.getText().split(";"));
+ String[] qries = textArea.getText().trim().split(";");
+ List<String> nextFetch = Arrays.asList(qries);
Iterator<String> en = Arrays.asList(new String[0]).iterator();
int nqueries = qries.length;
for (String q : queries)
{
- DBRefEntry dbr = new DBRefEntry();
- dbr.setSource(proxy.getDbSource());
- dbr.setVersion(null);
+ // BH 2019.01.25 dbr is never used.
+// DBRefEntry dbr = new DBRefEntry();
+// dbr.setSource(proxy.getDbSource());
+// dbr.setVersion(null);
String accId = proxy.getAccessionIdFromQuery(q);
- dbr.setAccessionId(accId);
+// dbr.setAccessionId(accId);
boolean rfound = false;
- for (int r = 0; r < rs.length; r++)
+ for (int r = 0, nr = rs.length; r < nr; r++)
{
if (rs[r] != null)
{