jalview 2.5 release banner

[jalview.git] / src / jalview / appletgui / EmbmenuFrame.java

diff --git a/src/jalview/appletgui/EmbmenuFrame.java b/src/jalview/appletgui/EmbmenuFrame.java
index 6ef30ef..c80adb3 100644 (file)
--- a/src/jalview/appletgui/EmbmenuFrame.java
+++ b/src/jalview/appletgui/EmbmenuFrame.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.appletgui;\r
 \r
@@ -80,8 +79,8 @@ public class EmbmenuFrame extends Frame implements MouseListener
    * menuBar to be embedded, and if so, embeds it.\r
    * \r
    * @param tobeAdjusted\r
-   *                the panel that is to be reduced to make space for the\r
-   *                embedded menu bar\r
+   *          the panel that is to be reduced to make space for the embedded\r
+   *          menu bar\r
    * @return true if menuBar was embedded and tobeAdjusted's height modified\r
    */\r
   protected boolean embedMenuIfNeeded(Panel tobeAdjusted)\r
@@ -118,8 +117,8 @@ public class EmbmenuFrame extends Frame implements MouseListener
    * @param fstyle\r
    * @param fsz\r
    * @param overrideFonts\r
-   *                true if we take the menuBar fonts in preference to the\r
-   *                supplied defaults\r
+   *          true if we take the menuBar fonts in preference to the supplied\r
+   *          defaults\r
    * @return the embedded menu instance to be added to the frame.\r
    */\r
   protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, String fn,\r
@@ -140,8 +139,8 @@ public class EmbmenuFrame extends Frame implements MouseListener
    * @param fsz\r
    * @param overrideFonts\r
    * @param append\r
-   *                true means existing menu will be emptied before adding new\r
-   *                elements\r
+   *          true means existing menu will be emptied before adding new\r
+   *          elements\r
    * @return\r
    */\r
   protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, String fn,\r
@@ -176,18 +175,18 @@ public class EmbmenuFrame extends Frame implements MouseListener
    * already attached.\r
    * \r
    * @param menuBar\r
-   *                must be non-null\r
+   *          must be non-null\r
    * @param fn\r
    * @param fstyle\r
    * @param fsz\r
    * @param overrideFonts\r
    * @param embeddedPopup\r
-   *                must be non-null\r
+   *          must be non-null\r
    * @param embeddedMenu\r
-   *                if null, a new panel will be created and returned\r
-   * @param clickHandler -\r
-   *                usually the instance of EmbmenuFrame that holds references\r
-   *                to embeddedPopup and embeddedMenu\r
+   *          if null, a new panel will be created and returned\r
+   * @param clickHandler\r
+   *          - usually the instance of EmbmenuFrame that holds references to\r
+   *          embeddedPopup and embeddedMenu\r
    * @return the panel instance for convenience.\r
    */\r
   protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, String fn,\r
@@ -257,7 +256,7 @@ public class EmbmenuFrame extends Frame implements MouseListener
    * get the menu for source from the hash.\r
    * \r
    * @param source\r
-   *                what was clicked on.\r
+   *          what was clicked on.\r
    */\r
   PopupMenu getPopupMenu(Label source)\r
   {\r