JAL-1734 updated progress bar messages

diff --git a/resources/lang/Messages.properties b/resources/lang/Messages.properties
index ee6b92d..64fdd4d 100644 (file)
--- a/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@ -1147,6 +1147,8 @@ status.no_das_sources_active = No DAS Sources Active
 status.das_feature_fetching_cancelled = DAS Feature Fetching Cancelled
 status.das_feature_fetching_complete = DAS Feature Fetching Complete
 status.fetching_db_refs = Fetching db refs
+status.loading_cached_pdb_entries = Loading Cached PDB Entries
+status.searching_for_pdb_structures = Searching for PDB Structures
 label.font_doesnt_have_letters_defined = Font doesn't have letters defined\nso cannot be used\nwith alignment data
 label.font_too_small = Font size is too small
 label.error_loading_file_params = Error loading file {0}

diff --git a/src/jalview/gui/StructureChooser.java b/src/jalview/gui/StructureChooser.java
index 2f24c61..2cc5079 100644 (file)
--- a/src/jalview/gui/StructureChooser.java
+++ b/src/jalview/gui/StructureChooser.java
@@ -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);
@@ -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