X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceFetcher.java;h=f06bd97ebbf0db6f451874d80c940b344eb0a9f4;hb=1a7a229e4e1a3f6960a34543333748477022c234;hp=79f25e2d277879e67869084f9fd25c29edfbafaf;hpb=f5d6c0018555b2c453c2c0354c84cd5d2d81e3b9;p=jalview.git diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java index 79f25e2..f06bd97 100755 --- a/src/jalview/gui/SequenceFetcher.java +++ b/src/jalview/gui/SequenceFetcher.java @@ -145,8 +145,8 @@ public class SequenceFetcher extends JPanel implements Runnable frame = new JInternalFrame(); frame.setContentPane(this); - int height = Platform.isAMacAndNotJS() ? 240 : 180; - Desktop.addInternalFrame(frame, getFrameTitle(), true, 400, height); + Desktop.addInternalFrame(frame, getFrameTitle(), true, 400, + Platform.isAMacAndNotJS() ? 240 : 180); } private String getFrameTitle() @@ -417,13 +417,15 @@ public class SequenceFetcher extends JPanel implements Runnable /* * tidy inputs and check there is something to search for */ - String text = textArea.getText(); + String t0 = textArea.getText(); + String text = text.trim(); // BH 2019.01.30 if (replacePunctuation.isEnabled() && replacePunctuation.isSelected()) { text = text.replace(",", ";"); } text = text.replaceAll("(\\s|[,; ])+", ";"); - textArea.setText(text); + if (!t0.equals(text)) // BH 2019.01.30 no need to do setting if it is the same + textArea.setText(text); if (text.isEmpty()) { // todo i18n @@ -750,13 +752,14 @@ public class SequenceFetcher extends JPanel implements Runnable 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) {