X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceFetcher.java;h=fc6fb0d0a27d856d8a5dd0e40bac43aaa48b45d3;hb=e24933a537e0f640c75d4685c468615872bc77fc;hp=c330a922faeea7ab82916585cfc4876e8d842882;hpb=6dd554fdbf34db6b79595d5027159d20225f4894;p=jalview.git diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java index c330a92..fc6fb0d 100755 --- a/src/jalview/gui/SequenceFetcher.java +++ b/src/jalview/gui/SequenceFetcher.java @@ -22,7 +22,6 @@ package jalview.gui; import jalview.datamodel.AlignmentI; import jalview.datamodel.DBRefEntry; -import jalview.datamodel.DBRefSource; import jalview.datamodel.SequenceFeature; import jalview.datamodel.SequenceI; import jalview.io.FormatAdapter; @@ -54,8 +53,6 @@ import javax.swing.JTextArea; import javax.swing.SwingConstants; import javax.swing.tree.DefaultMutableTreeNode; -import com.stevesoft.pat.Regex; - public class SequenceFetcher extends JPanel implements Runnable { JLabel dbeg = new JLabel(); @@ -115,6 +112,7 @@ public class SequenceFetcher extends JPanel implements Runnable private static Thread initingThread = null; int debounceTrap = 0; + /** * Blocking method that initialises and returns the shared instance of the * SequenceFetcher client @@ -130,9 +128,11 @@ public class SequenceFetcher extends JPanel implements Runnable { 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. @@ -149,9 +149,11 @@ public class SequenceFetcher extends JPanel implements Runnable } 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 @@ -168,7 +170,8 @@ public class SequenceFetcher extends JPanel implements Runnable */ 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 = jalview.bin.Cache.getDasSourceRegistry(); @@ -189,6 +192,7 @@ public class SequenceFetcher extends JPanel implements Runnable } private IProgressIndicator progressIndicator; + public SequenceFetcher(IProgressIndicator guiIndic) { this.progressIndicator = guiIndic; @@ -214,8 +218,10 @@ public class SequenceFetcher extends JPanel implements Runnable JOptionPane .showInternalMessageDialog( Desktop.desktop, - MessageManager.getString("warn.couldnt_create_sequence_fetcher_client"), - MessageManager.getString("label.couldnt_create_sequence_fetcher"), + MessageManager + .getString("warn.couldnt_create_sequence_fetcher_client"), + MessageManager + .getString("label.couldnt_create_sequence_fetcher"), JOptionPane.ERROR_MESSAGE); } }); @@ -272,7 +278,9 @@ public class SequenceFetcher extends JPanel implements Runnable 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")); } private void jbInit() throws Exception @@ -358,18 +366,19 @@ public class SequenceFetcher extends JPanel implements Runnable { debounceTrap++; String currentSelection = database.getSelectedItem(); - if (!currentSelection.equalsIgnoreCase("pdb")) { - otherSourceAction(); + otherSourceAction(); } - if (currentSelection.equalsIgnoreCase("pdb") && ((debounceTrap % 2) == 0)) + if (currentSelection.equalsIgnoreCase("pdb") + && (database.action == KeyEvent.VK_ENTER || ((debounceTrap % 2) == 0))) { pdbSourceAction(); } - + database.action = -1; } }); + dbeg.setText(""); jPanel2.add(databaseButt, java.awt.BorderLayout.NORTH); jPanel2.add(dbeg, java.awt.BorderLayout.CENTER); @@ -403,8 +412,7 @@ public class SequenceFetcher extends JPanel implements Runnable : "")); String eq = database.getExampleQueries(); dbeg.setText(MessageManager.formatMessage( - "label.example_query_param", new String[] - { eq })); + "label.example_query_param", new String[] { eq })); boolean enablePunct = !(eq != null && eq.indexOf(",") > -1); for (DbSourceProxy dbs : database.getSelectedSources()) { @@ -442,8 +450,6 @@ public class SequenceFetcher extends JPanel implements Runnable jPanel3.repaint(); } - - public void close_actionPerformed(ActionEvent e) { try @@ -509,6 +515,7 @@ public class SequenceFetcher extends JPanel implements Runnable resetDialog(); return; } + // TODO: Refactor to GUI independent code and write tests. // indicate if successive sources should be merged into one alignment. boolean addToLast = false; ArrayList aresultq = new ArrayList(), presultTitle = new ArrayList(); @@ -536,9 +543,14 @@ public class SequenceFetcher extends JPanel implements Runnable try { // update status - guiWindow.setProgressBar(MessageManager.formatMessage("status.fetching_sequence_queries_from", new String[]{Integer.valueOf(nqueries).toString(),proxy.getDbName()}), Thread - .currentThread().hashCode()); - isAliSource = proxy.isA(DBRefSource.ALIGNMENTDB); + guiWindow + .setProgressBar(MessageManager.formatMessage( + "status.fetching_sequence_queries_from", + new String[] { + Integer.valueOf(nqueries).toString(), + proxy.getDbName() }), Thread.currentThread() + .hashCode()); + isAliSource = proxy.isAlignmentSource(); if (proxy.getAccessionSeparator() == null) { while (en.hasNext()) @@ -625,34 +637,19 @@ public class SequenceFetcher extends JPanel implements Runnable DBRefEntry dbr = new DBRefEntry(), found[] = null; dbr.setSource(proxy.getDbSource()); dbr.setVersion(null); - if (proxy.getAccessionValidator() != null) - { - Regex vgr = proxy.getAccessionValidator(); - vgr.search(q); - if (vgr.numSubs() > 0) - { - dbr.setAccessionId(vgr.stringMatched(1)); - } - else - { - dbr.setAccessionId(vgr.stringMatched()); - } - } - else - { - dbr.setAccessionId(q); - } + String accId = proxy.getAccessionIdFromQuery(q); + dbr.setAccessionId(accId); boolean rfound = false; for (int r = 0; r < rs.length; r++) { - if (rs[r] != null - && (found = DBRefUtils.searchRefs( - rs[r].getDBRef(), dbr)) != null - && found.length > 0) + if (rs[r] != null) { - rfound = true; - rs[r] = null; - continue; + found = DBRefUtils.searchRefs(rs[r].getDBRefs(), accId); + if (found != null && found.length > 0) + { + rfound = true; + rs[r] = null; + } } } if (!rfound) @@ -734,11 +731,15 @@ public class SequenceFetcher extends JPanel implements Runnable presultTitle.add(titl); } } - guiWindow.setProgressBar(MessageManager.getString("status.finshed_querying"), Thread.currentThread() + 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) { @@ -772,7 +773,7 @@ public class SequenceFetcher extends JPanel implements Runnable AlignmentI parseResult(String result, String title) { - String format = new IdentifyFile().Identify(result, "Paste"); + String format = new IdentifyFile().identify(result, "Paste"); AlignmentI sequences = null; if (FormatAdapter.isValidFormat(format)) {