X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FEmbmenuFrame.java;h=cdaca2b2e2390e7b149fe1c5f4a812c935cc528b;hb=746d44733521ab266aea00b724175a6ade377bcd;hp=df59ef4eb82fd5ba7abe9d9196f9030e6dd0aa08;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/appletgui/EmbmenuFrame.java b/src/jalview/appletgui/EmbmenuFrame.java index df59ef4..cdaca2b 100644 --- a/src/jalview/appletgui/EmbmenuFrame.java +++ b/src/jalview/appletgui/EmbmenuFrame.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.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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 . */ package jalview.appletgui; @@ -80,8 +79,8 @@ public class EmbmenuFrame extends Frame implements MouseListener * menuBar to be embedded, and if so, embeds it. * * @param tobeAdjusted - * the panel that is to be reduced to make space for the - * embedded menu bar + * the panel that is to be reduced to make space for the embedded + * menu bar * @return true if menuBar was embedded and tobeAdjusted's height modified */ protected boolean embedMenuIfNeeded(Panel tobeAdjusted) @@ -118,8 +117,8 @@ public class EmbmenuFrame extends Frame implements MouseListener * @param fstyle * @param fsz * @param overrideFonts - * true if we take the menuBar fonts in preference to the - * supplied defaults + * true if we take the menuBar fonts in preference to the supplied + * defaults * @return the embedded menu instance to be added to the frame. */ protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, String fn, @@ -140,8 +139,8 @@ public class EmbmenuFrame extends Frame implements MouseListener * @param fsz * @param overrideFonts * @param append - * true means existing menu will be emptied before adding new - * elements + * true means existing menu will be emptied before adding new + * elements * @return */ protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, String fn, @@ -176,18 +175,18 @@ public class EmbmenuFrame extends Frame implements MouseListener * already attached. * * @param menuBar - * must be non-null + * must be non-null * @param fn * @param fstyle * @param fsz * @param overrideFonts * @param embeddedPopup - * must be non-null + * must be non-null * @param embeddedMenu - * if null, a new panel will be created and returned - * @param clickHandler - - * usually the instance of EmbmenuFrame that holds references - * to embeddedPopup and embeddedMenu + * if null, a new panel will be created and returned + * @param clickHandler + * - usually the instance of EmbmenuFrame that holds references to + * embeddedPopup and embeddedMenu * @return the panel instance for convenience. */ protected Panel makeEmbeddedPopupMenu(MenuBar menuBar, String fn, @@ -257,7 +256,7 @@ public class EmbmenuFrame extends Frame implements MouseListener * get the menu for source from the hash. * * @param source - * what was clicked on. + * what was clicked on. */ PopupMenu getPopupMenu(Label source) {