X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fstructure%2FStructureSelectionManager.java;h=478706a74f6c98d7c970b36ed50552362f6dc869;hb=2c6965c96b057296981403f3394a4c180ed60ea4;hp=5a2ac7036d58cd6c2944ff9ef877688c923f4a28;hpb=9f3f8923d63c90a045c1ecefa0197a2acf6c7167;p=jalview.git

diff --git a/src/jalview/structure/StructureSelectionManager.java b/src/jalview/structure/StructureSelectionManager.java
index 5a2ac70..478706a 100644
--- a/src/jalview/structure/StructureSelectionManager.java
+++ b/src/jalview/structure/StructureSelectionManager.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
  * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.structure;
 
@@ -310,13 +309,12 @@ public class StructureSelectionManager
    * highlight regions associated with a position (indexpos) in seq
    * 
    * @param seq
-   *                the sequeence that the mouse over occured on
+   *          the sequeence that the mouse over occured on
    * @param indexpos
-   *                the absolute position being mouseovered in seq (0 to
-   *                seq.length())
+   *          the absolute position being mouseovered in seq (0 to seq.length())
    * @param index
-   *                the sequence position (if -1, seq.findPosition is called to
-   *                resolve the residue number)
+   *          the sequence position (if -1, seq.findPosition is called to
+   *          resolve the residue number)
    */
   public void mouseOverSequence(SequenceI seq, int indexpos, int index)
   {
@@ -418,7 +416,7 @@ public class StructureSelectionManager
    * 
    * @param sequenceI
    * @param position
-   *                in an alignment sequence
+   *          in an alignment sequence
    */
   public void mouseOverVamsasSequence(SequenceI sequenceI, int position)
   {
@@ -447,9 +445,10 @@ public class StructureSelectionManager
      * 
      * for (int j = 0; j < mappings.length; j++) {
      * 
-     * if (mappings[j].sequence == seq && mappings[j].getPdbId().equals(pdbid) &&
-     * mappings[j].pdbfile.equals(sl.getPdbFile())) { System.out.println(pdbid+"
-     * "+mappings[j].getPdbId() +" "+mappings[j].pdbfile);
+     * if (mappings[j].sequence == seq && mappings[j].getPdbId().equals(pdbid)
+     * && mappings[j].pdbfile.equals(sl.getPdbFile())) {
+     * System.out.println(pdbid+" "+mappings[j].getPdbId() +"
+     * "+mappings[j].pdbfile);
      * 
      * java.awt.Color col; for(int index=0; index<seq.getLength(); index++) {
      * if(jalview.util.Comparison.isGap(seq.getCharAt(index))) continue;
@@ -588,6 +587,7 @@ public class StructureSelectionManager
   }
 
   Vector sel_listeners = new Vector();
+
   public void addSelectionListener(SelectionListener selecter)
   {
     if (!sel_listeners.contains(selecter))
@@ -595,24 +595,31 @@ public class StructureSelectionManager
       sel_listeners.addElement(selecter);
     }
   }
+
   public void removeSelectionListener(SelectionListener toremove)
   {
     if (sel_listeners.contains(toremove))
     {
-      sel_listeners.remove(toremove);
+      sel_listeners.removeElement(toremove);
     }
   }
-  public synchronized void sendSelection(jalview.datamodel.SequenceGroup selection, jalview.datamodel.ColumnSelection colsel, SelectionSource source)
+
+  public synchronized void sendSelection(
+          jalview.datamodel.SequenceGroup selection,
+          jalview.datamodel.ColumnSelection colsel, SelectionSource source)
   {
-    if (sel_listeners!=null && sel_listeners.size()>0)
+    if (sel_listeners != null && sel_listeners.size() > 0)
     {
       Enumeration listeners = sel_listeners.elements();
       while (listeners.hasMoreElements())
       {
-        SelectionListener slis = ((SelectionListener) listeners.nextElement());
-        if (slis!=source) { 
-          slis.selection(selection, colsel, source); 
-        };
+        SelectionListener slis = ((SelectionListener) listeners
+                .nextElement());
+        if (slis != source)
+        {
+          slis.selection(selection, colsel, source);
+        }
+        ;
       }
     }
   }