jalview 2.5 release banner

[jalview.git] / src / jalview / datamodel / ColumnSelection.java

diff --git a/src/jalview/datamodel/ColumnSelection.java b/src/jalview/datamodel/ColumnSelection.java
index 5c1707f..4371994 100644 (file)
--- a/src/jalview/datamodel/ColumnSelection.java
+++ b/src/jalview/datamodel/ColumnSelection.java
@@ -1,20 +1,19 @@
 /*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)\r
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)\r
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle\r
  * \r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
+ * This file is part of Jalview.\r
  * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
  * \r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE.  See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 package jalview.datamodel;\r
 \r
@@ -1060,7 +1059,9 @@ public class ColumnSelection
   }\r
 \r
   /**\r
-   * add in any unselected columns from the given column selection, excluding any that are hidden.\r
+   * add in any unselected columns from the given column selection, excluding\r
+   * any that are hidden.\r
+   * \r
    * @param colsel\r
    */\r
   public void addElementsFrom(ColumnSelection colsel)\r
@@ -1071,7 +1072,8 @@ public class ColumnSelection
       while (e.hasMoreElements())\r
       {\r
         Object eo = e.nextElement();\r
-        if (hiddenColumns!=null && isVisible(((Integer) eo).intValue())) {\r
+        if (hiddenColumns != null && isVisible(((Integer) eo).intValue()))\r
+        {\r
           if (!selected.contains(eo))\r
           {\r
             selected.addElement(eo);\r
@@ -1080,21 +1082,26 @@ public class ColumnSelection
       }\r
     }\r
   }\r
-/**\r
- * set the selected columns the given column selection, excluding any columns that are hidden. \r
- * @param colsel\r
- */\r
+\r
+  /**\r
+   * set the selected columns the given column selection, excluding any columns\r
+   * that are hidden.\r
+   * \r
+   * @param colsel\r
+   */\r
   public void setElementsFrom(ColumnSelection colsel)\r
   {\r
     selected = new Vector();\r
     if (colsel.selected != null && colsel.selected.size() > 0)\r
     {\r
-      if (hiddenColumns!=null && hiddenColumns.size()>0)\r
+      if (hiddenColumns != null && hiddenColumns.size() > 0)\r
       {\r
         // only select visible columns in this columns selection\r
         selected = new Vector();\r
         addElementsFrom(colsel);\r
-      } else {\r
+      }\r
+      else\r
+      {\r
         // add everything regardless\r
         Enumeration en = colsel.selected.elements();\r
         while (en.hasMoreElements())\r