X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=0a765cbb27c21e46eaec86e611420d80b204042e;hb=062ebc02980364930ceb26dd6c06448af971fe20;hp=9573e1facc94d6dcf50065cb7bd8140efd286659;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git
diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 9573e1f..0a765cb 100644
--- a/src/jalview/gui/JvSwingUtils.java
+++ b/src/jalview/gui/JvSwingUtils.java
@@ -1,34 +1,43 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* 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.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* 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
field + * wrap a bare html safe string to around 60 characters per line using a CSS + * style class specifying word-wrap and break-word * + * @param enclose + * if true, add <html> wrapper tags * @param ttext + * * @return */ - public static String wrapTooltip(String ttext) + public static String wrapTooltip(boolean enclose, String ttext) { - if (ttext.length() < 60) + Objects.requireNonNull(ttext, + "Tootip text to format must not be null!"); + ttext = ttext.trim(); + boolean maxLengthExceeded = false; + + if (ttext.contains(" |
" + ttext - + " |
" + + ttext + "
" + ((enclose ? "" : "")); + } public static JButton makeButton(String label, String tooltip, @@ -88,8 +120,8 @@ public final class JvSwingUtils for (int i = 0, iSize = menu.getMenuComponentCount(); i < iSize; i++) { if (menu.getMenuComponent(i) instanceof JMenu - && ((JMenu) menu.getMenuComponent(i)).getText().equals( - submenu)) + && ((JMenu) menu.getMenuComponent(i)).getText() + .equals(submenu)) { submenuinstance = (JMenu) menu.getMenuComponent(i); } @@ -100,7 +132,7 @@ public final class JvSwingUtils menu.add(submenuinstance); } return submenuinstance; - + } /** @@ -109,18 +141,18 @@ public final class JvSwingUtils * @param tooltip * @param label * @param valBox - * @return the GUI element created that was added to the layout so it's attributes can be changed. + * @return the GUI element created that was added to the layout so it's + * attributes can be changed. */ - public static JPanel addtoLayout(JPanel panel, String tooltip, JComponent label, JComponent valBox) + public static JPanel addtoLayout(JPanel panel, String tooltip, + JComponent label, JComponent valBox) { - JPanel laypanel = new JPanel(),labPanel=new JPanel(), valPanel=new JPanel(); - // laypanel.setSize(panel.getPreferredSize()); - // laypanel.setLayout(null); + JPanel laypanel = new JPanel(new GridLayout(1, 2)); + JPanel labPanel = new JPanel(new BorderLayout()); + JPanel valPanel = new JPanel(); labPanel.setBounds(new Rectangle(7, 7, 158, 23)); - valPanel.setBounds(new Rectangle(172, 7, 270,23)); - //labPanel.setLayout(new GridLayout(1,1)); - //valPanel.setLayout(new GridLayout(1,1)); - labPanel.add(label); + valPanel.setBounds(new Rectangle(172, 7, 270, 23)); + labPanel.add(label, BorderLayout.WEST); valPanel.add(valBox); laypanel.add(labPanel); laypanel.add(valPanel); @@ -135,60 +167,141 @@ public final class JvSwingUtils public static void mgAddtoLayout(JPanel cpanel, String tooltip, JLabel jLabel, JComponent name) { - mgAddtoLayout(cpanel, tooltip, jLabel, name,null); + mgAddtoLayout(cpanel, tooltip, jLabel, name, null); } + public static void mgAddtoLayout(JPanel cpanel, String tooltip, JLabel jLabel, JComponent name, String params) { cpanel.add(jLabel); - if (params==null) { + if (params == null) + { cpanel.add(name); - } else {cpanel.add(name, params); + } + else + { + cpanel.add(name, params); } name.setToolTipText(tooltip); jLabel.setToolTipText(tooltip); } /** - * standard font for labels and check boxes in dialog boxes + * standard font for labels and check boxes in dialog boxes + * * @return */ public static Font getLabelFont() { - return getLabelFont(false,false); + return getLabelFont(false, false); } + public static Font getLabelFont(boolean bold, boolean italic) { - return new java.awt.Font("Verdana", (!bold && !italic) ? Font.PLAIN : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), 11); + return new java.awt.Font("Verdana", + (!bold && !italic) ? Font.PLAIN + : (bold ? Font.BOLD : 0) + (italic ? Font.ITALIC : 0), + 11); } /** * standard font for editable text areas + * * @return */ public static Font getTextAreaFont() { - return getLabelFont(false,false); + return getLabelFont(false, false); } /** - * clean up a swing menu. - * Removes any empty submenus without selection listeners. + * clean up a swing menu. Removes any empty submenus without selection + * listeners. + * * @param webService */ public static void cleanMenu(JMenu webService) { - for (int i=0;i