JAL-4307 also report molecule name in tooltip for show/hide HETATM

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

diff --git a/src/jalview/gui/StructureViewerBase.java b/src/jalview/gui/StructureViewerBase.java
index 09d2dcb..085be71 100644 (file)
--- a/src/jalview/gui/StructureViewerBase.java
+++ b/src/jalview/gui/StructureViewerBase.java
@@ -35,6 +35,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.Vector;
 
@@ -606,7 +607,7 @@ public abstract class StructureViewerBase extends GStructureViewer
       chainMenu.add(menuItem);
     }
   }
-  void setHetatmMenuItems(List<String> hetatmNames)
+  void setHetatmMenuItems(Map<String,String> hetatmNames)
   {
     hetatmMenu.removeAll();
     if (hetatmNames == null || hetatmNames.isEmpty())
@@ -660,9 +661,10 @@ public abstract class StructureViewerBase extends GStructureViewer
     hetatmMenu.add(noneMenuItem);
     hetatmMenu.add(allMenuItem);
 
-    for (String chain : hetatmNames)
+    for (Map.Entry<String, String> chain : hetatmNames.entrySet())
     {
-      JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem(chain, false);
+      JCheckBoxMenuItem menuItem = new JCheckBoxMenuItem(chain.getKey(), false);
+      menuItem.setToolTipText(chain.getValue());
       menuItem.addItemListener(new ItemListener()
       {
         @Override