From: BobHanson <hansonr@stolaf.edu>
Date: Fri, 5 Jun 2020 05:54:10 +0000 (-0500)
Subject: Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into... 
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=cdb44b9c7723a7c2b0110185212d830d57d812c6;hp=-c;p=jalview.git

Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into Jalview-JS/develop
---

cdb44b9c7723a7c2b0110185212d830d57d812c6
diff --combined src/jalview/structure/StructureSelectionManager.java
index 636a460,0f8157b..f8048cd
--- a/src/jalview/structure/StructureSelectionManager.java
+++ b/src/jalview/structure/StructureSelectionManager.java
@@@ -1275,43 -1275,39 +1275,43 @@@ public class StructureSelectionManager 
    {
      if (mappings != null)
      {
-     mappings.clear();
+       mappings.clear();
      }
      if (seqmappings != null)
      {
-     seqmappings.clear();
+       seqmappings.clear();
      }
      if (sel_listeners != null)
      {
-     sel_listeners.clear();
+       sel_listeners.clear();
      }
      if (listeners != null)
      {
-     listeners.clear();
+       listeners.clear();
      }
      if (commandListeners != null)
      {
-     commandListeners.clear();
+       commandListeners.clear();
      }
      if (view_listeners != null)
      {
-     view_listeners.clear();
+       view_listeners.clear();
      }
      if (pdbFileNameId != null)
      {
-     pdbFileNameId.clear();
+       pdbFileNameId.clear();
      }
      if (pdbIdFileName != null)
      {
-     pdbIdFileName.clear();
+       pdbIdFileName.clear();
      }
    }
  
 -  public void addSelectionListener(SelectionListener selecter)
 +  public List<SelectionListener> getListeners() {
 +    return sel_listeners;
 +  }
 +  
 +   public void addSelectionListener(SelectionListener selecter)
    {
      if (!sel_listeners.contains(selecter))
      {