X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FStructureChooser.java;h=2e3b37ab56bc29b704a629cf60a22b4d5cb97583;hb=fd1c6fd67abdd50ff0d77410d3da9be66be315ce;hp=2f24c61465c53736a7157575f19f53b59f591053;hpb=744872398c812f4db4ad5315f5c489f0e7c150f1;p=jalview.git diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java index 2f24c61..2e3b37a 100644 --- a/src/jalview/gui/StructureChooser.java +++ b/src/jalview/gui/StructureChooser.java @@ -22,19 +22,6 @@ package jalview.gui; -import jalview.datamodel.DBRefEntry; -import jalview.datamodel.PDBEntry; -import jalview.datamodel.SequenceI; -import jalview.jbgui.GStructureChooser; -import jalview.jbgui.PDBDocFieldPreferences; -import jalview.structure.StructureSelectionManager; -import jalview.util.MessageManager; -import jalview.ws.dbsources.PDBRestClient; -import jalview.ws.dbsources.PDBRestClient.PDBDocField; -import jalview.ws.uimodel.PDBRestRequest; -import jalview.ws.uimodel.PDBRestResponse; -import jalview.ws.uimodel.PDBRestResponse.PDBResponseSummary; - import java.awt.event.ItemEvent; import java.util.ArrayList; import java.util.Collection; @@ -49,6 +36,19 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.table.DefaultTableModel; +import jalview.datamodel.DBRefEntry; +import jalview.datamodel.PDBEntry; +import jalview.datamodel.SequenceI; +import jalview.jbgui.GStructureChooser; +import jalview.jbgui.PDBDocFieldPreferences; +import jalview.structure.StructureSelectionManager; +import jalview.util.MessageManager; +import jalview.ws.dbsources.PDBRestClient; +import jalview.ws.dbsources.PDBRestClient.PDBDocField; +import jalview.ws.uimodel.PDBRestRequest; +import jalview.ws.uimodel.PDBRestResponse; +import jalview.ws.uimodel.PDBRestResponse.PDBResponseSummary; + /** * Provides the behaviors for the Structure chooser Panel @@ -100,9 +100,13 @@ public class StructureChooser extends GStructureChooser public void run() { long startTime = System.currentTimeMillis(); - String msg = MessageManager.getString("status.fetching_db_refs"); - updateProgressIndicator(msg, startTime); + updateProgressIndicator(MessageManager + .getString("status.loading_cached_pdb_entries"), startTime); loadLocalCachedPDBEntries(); + updateProgressIndicator(null, startTime); + updateProgressIndicator(MessageManager + .getString("status.searching_for_pdb_structures"), + startTime); fetchStructuresMetaData(); populateFilterComboBox(); updateProgressIndicator(null, startTime); @@ -742,17 +746,17 @@ public class StructureChooser extends GStructureChooser private void launchStructureViewer(StructureSelectionManager ssm, PDBEntry[] pdbEntriesToView, AlignmentPanel alignPanel, - SequenceI[] selectedSequences) + SequenceI[] sequences) { StructureViewer sViewer = new StructureViewer(ssm); if (pdbEntriesToView.length > 1) { - sViewer.viewStructures(alignPanel, pdbEntriesToView, - alignPanel.av.collateForPDB(pdbEntriesToView)); + sViewer.viewStructures(pdbEntriesToView, alignPanel.av.collateForPDB(pdbEntriesToView), + alignPanel); } else { - sViewer.viewStructures(pdbEntriesToView[0], selectedSequences, null, + sViewer.viewStructures(pdbEntriesToView[0], sequences, alignPanel); } } @@ -824,13 +828,10 @@ public class StructureChooser extends GStructureChooser resultList = pdbRestCleint.executeRequest(pdbRequest); } catch (Exception e) { - // JOptionPane.showMessageDialog(this, e.getMessage(), - // "PDB Web-service Error", JOptionPane.ERROR_MESSAGE); errorWarning.append(e.getMessage()); return; } finally { - // System.out.println(">>>>> executing finally block"); validateSelections(); } if (resultList.getSearchSummary() != null