Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index a2a344c..c80a6ba 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -141,6 +141,8 @@ import jalview.structure.StructureSelectionManager;
 import jalview.urls.IdOrgSettings;
 import jalview.util.BrowserLauncher;
 import jalview.util.ChannelProperties;
+import jalview.util.IdUtils;
+import jalview.util.IdUtils.IdType;
 import jalview.util.ImageMaker.TYPE;
 import jalview.util.LaunchUtils;
 import jalview.util.MessageManager;
@@ -759,11 +761,12 @@ public class Desktop extends jalview.jbgui.GDesktop
         @Override
         public void run()
         {
-          long now = System.currentTimeMillis();
+          long progressId = IdUtils.newId(IdType.PROGRESS);
           Desktop.instance.setProgressBar(
-                  MessageManager.getString("status.refreshing_news"), now);
+                  MessageManager.getString("status.refreshing_news"),
+                  progressId);
           jvnews.refreshNews();
-          Desktop.instance.setProgressBar(null, now);
+          Desktop.instance.setProgressBar(null, progressId);
           jvnews.showNews();
         }
       }).start();
@@ -1956,7 +1959,8 @@ public class Desktop extends jalview.jbgui.GDesktop
           // TODO: refactor to Jalview desktop session controller action.
           setProgressBar(MessageManager.formatMessage(
                   "label.saving_jalview_project", new Object[]
-                  { chosenFile.getName() }), chosenFile.hashCode());
+                  { chosenFile.getName() }),
+                  IdUtils.newId(IdType.PROGRESS, chosenFile));
           Cache.setProperty("LAST_DIRECTORY", chosenFile.getParent());
           // TODO catch and handle errors for savestate
           // TODO prevent user from messing with the Desktop whilst we're saving
@@ -1990,7 +1994,7 @@ public class Desktop extends jalview.jbgui.GDesktop
                     MessageManager.getString("label.couldnt_save_project"),
                     JvOptionPane.WARNING_MESSAGE);
           }
-          setProgressBar(null, chosenFile.hashCode());
+          setProgressBar(null, IdUtils.newId(IdType.PROGRESS, chosenFile));
         }
       }).start();
     }
@@ -3108,7 +3112,7 @@ public class Desktop extends jalview.jbgui.GDesktop
           {
             progress.setProgressBar(MessageManager
                     .formatMessage("status.opening_params", new Object[]
-                    { url }), this.hashCode());
+                    { url }), IdUtils.newId(IdType.PROGRESS, this));
           }
           jalview.util.BrowserLauncher.openURL(url);
         } catch (Exception ex)
@@ -3123,7 +3127,8 @@ public class Desktop extends jalview.jbgui.GDesktop
         }
         if (progress != null)
         {
-          progress.setProgressBar(null, this.hashCode());
+          progress.setProgressBar(null,
+                  IdUtils.newId(IdType.PROGRESS, this));
         }
       }
     }).start();