From 48144232e86777008fb78dd1233ebb0eb3cc34cb Mon Sep 17 00:00:00 2001
From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 4 Feb 2020 16:32:33 +0000
Subject: [PATCH] JAL-2422 fixed stopProgressBar (broken in pull up
 refactoring)

---
 src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java      |    2 +-
 src/jalview/api/structures/JalviewStructureDisplayI.java |   11 +++++++++--
 src/jalview/gui/StructureViewerBase.java                 |   13 +------------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
index 710ca95..78103af 100644
--- a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
+++ b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
@@ -449,7 +449,7 @@ public class ChimeraManager
 
     // in fact 'listinfo' (undocumented) works in ChimeraX
     String command = (isChimeraX
-            ? "view" /*"info selection level residue" */
+            ? "wait 1; view" /*"info selection level residue" */
             : "list selection level residue");
     List<String> chimeraReply = sendChimeraCommand(command, true);
     if (chimeraReply != null)
diff --git a/src/jalview/api/structures/JalviewStructureDisplayI.java b/src/jalview/api/structures/JalviewStructureDisplayI.java
index f59e4cb..506334c 100644
--- a/src/jalview/api/structures/JalviewStructureDisplayI.java
+++ b/src/jalview/api/structures/JalviewStructureDisplayI.java
@@ -158,8 +158,15 @@ public interface JalviewStructureDisplayI
    * @param msg
    * @return handle
    */
-  long startProgressBar(String progressMsg);
+  long startProgressBar(String msg);
 
-  void stopProgressBar(Object object, long handle);
+  /**
+   * Ends the progress bar with the specified handle, leaving a message (if not
+   * null) on the status bar
+   * 
+   * @param msg
+   * @param handle
+   */
+  void stopProgressBar(String msg, long handle);
 
 }
diff --git a/src/jalview/gui/StructureViewerBase.java b/src/jalview/gui/StructureViewerBase.java
index c9607c6..8a4b61c 100644
--- a/src/jalview/gui/StructureViewerBase.java
+++ b/src/jalview/gui/StructureViewerBase.java
@@ -1060,13 +1060,7 @@ public abstract class StructureViewerBase extends GStructureViewer
     return tm;
   }
 
-  /**
-   * End the progress bar with the specified handle, leaving a message (if not
-   * null) on the status bar
-   * 
-   * @param msg
-   * @param handle
-   */
+  @Override
   public void stopProgressBar(String msg, long handle)
   {
     if (progressBar != null)
@@ -1075,11 +1069,6 @@ public abstract class StructureViewerBase extends GStructureViewer
     }
   }
 
-  @Override
-  public void stopProgressBar(Object object, long handle)
-  {
-  }
-
   protected IProgressIndicator getProgressIndicator()
   {
     return progressBar;
-- 
1.7.10.2