X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGRestServiceEditorPane.java;h=c233f6367f9314187dfc739bb397265774cb5a94;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=50048aab9b692a76f283739cb46a13b0c6f1a675;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/jbgui/GRestServiceEditorPane.java b/src/jalview/jbgui/GRestServiceEditorPane.java index 50048aa..c233f63 100644 --- a/src/jalview/jbgui/GRestServiceEditorPane.java +++ b/src/jalview/jbgui/GRestServiceEditorPane.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.jbgui; @@ -107,48 +109,45 @@ public class GRestServiceEditorPane extends JPanel cpanel = details; name = new JTextArea(1, 12); - JvSwingUtils.mgAddtoLayout(cpanel, - MessageManager.getString("label.short_descriptive_name_for_service"), new JLabel(MessageManager.getString("label.name")), - name, "wrap"); + JvSwingUtils.mgAddtoLayout(cpanel, MessageManager + .getString("label.short_descriptive_name_for_service"), + new JLabel(MessageManager.getString("label.name")), name, + "wrap"); action = new JComboBox(); - JvSwingUtils - .mgAddtoLayout( - cpanel, - MessageManager.getString("label.function_service_performs"), - new JLabel(MessageManager.getString("label.service_action")), action, "wrap"); + JvSwingUtils.mgAddtoLayout(cpanel, + MessageManager.getString("label.function_service_performs"), + new JLabel(MessageManager.getString("label.service_action")), + action, "wrap"); descr = new JTextArea(4, 60); descrVp = new JScrollPane(); descrVp.setViewportView(descr); - JvSwingUtils.mgAddtoLayout(cpanel, MessageManager.getString("label.brief_description_service"), - new JLabel(MessageManager.getString("label.description")), descrVp, "wrap"); + JvSwingUtils.mgAddtoLayout(cpanel, + MessageManager.getString("label.brief_description_service"), + new JLabel(MessageManager.getString("label.description")), + descrVp, "wrap"); url = new JTextArea(2, 60); urlVp = new JScrollPane(); urlVp.setViewportView(url); - JvSwingUtils - .mgAddtoLayout( - cpanel, - MessageManager.getString("label.url_post_data_service"), - new JLabel(MessageManager.getString("label.post_url")), urlVp, "wrap"); + JvSwingUtils.mgAddtoLayout(cpanel, + MessageManager.getString("label.url_post_data_service"), + new JLabel(MessageManager.getString("label.post_url")), urlVp, + "wrap"); urlsuff = new JTextArea(); urlsuff.setColumns(60); - JvSwingUtils - .mgAddtoLayout( - cpanel, - MessageManager.getString("label.optional_suffix"), - new JLabel(MessageManager.getString("label.url_suffix")), urlsuff, "wrap"); + JvSwingUtils.mgAddtoLayout(cpanel, MessageManager + .getString("label.optional_suffix"), + new JLabel(MessageManager.getString("label.url_suffix")), + urlsuff, "wrap"); // input options // details.add(cpanel = new JPanel(), BorderLayout.CENTER); // cpanel.setLayout(new FlowLayout()); hSeparable = new JCheckBox(MessageManager.getString("label.per_seq")); - hSeparable - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("When checked, a job is created for every sequence in the current selection.") - + ""); + hSeparable.setToolTipText(JvSwingUtils.wrapTooltip(true, + MessageManager.getString("label.job_created_when_checked"))); hSeparable.addActionListener(new ActionListener() { @@ -159,15 +158,13 @@ public class GRestServiceEditorPane extends JPanel } }); - vSeparable = new JCheckBox(MessageManager.getString("label.result_vertically_separable")); + vSeparable = new JCheckBox( + MessageManager.getString("label.result_vertically_separable")); vSeparable - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("When checked, a single job is created for the visible region and results" - + " mapped back onto their location in the alignment. Otherwise, a job would be" - + " created for every contiguous region visible in the alignment or current" - + " selection (e.g. a multiple alignment).") - + ""); + .setToolTipText(JvSwingUtils.wrapTooltip( + true, + MessageManager + .getString("label.when_checked_job_visible_region_and_results"))); vSeparable.addActionListener(new ActionListener() { @@ -180,8 +177,9 @@ public class GRestServiceEditorPane extends JPanel }); gapChar = new JComboBox(); JvSwingUtils.mgAddtoLayout(cpanel, - MessageManager.getString("label.preferred_gap_character"), new JLabel( - MessageManager.getString("label.gap_character") + ":"), gapChar, "wrap"); + MessageManager.getString("label.preferred_gap_character"), + new JLabel(MessageManager.getString("label.gap_character") + + ":"), gapChar, "wrap"); cpanel.add(hSeparable); cpanel.add(vSeparable); @@ -189,7 +187,8 @@ public class GRestServiceEditorPane extends JPanel // Input and Output lists // Inputparams JPanel iprmsList = new JPanel(); - iprmsList.setBorder(new TitledBorder(MessageManager.getString("label.data_input_parameters"))); + iprmsList.setBorder(new TitledBorder(MessageManager + .getString("label.data_input_parameters"))); iprmsList.setLayout(new MigLayout("", "[grow 90, fill][]")); iprmVp = new JScrollPane(); iprmVp.getViewport().setView(iprms = new JList()); @@ -239,7 +238,8 @@ public class GRestServiceEditorPane extends JPanel JPanel iprmButs = new JPanel(); iprmButs.setLayout(new MigLayout()); - iprmsAdd = JvSwingUtils.makeButton("+", MessageManager.getString("action.add_input_parameter"), + iprmsAdd = JvSwingUtils.makeButton("+", + MessageManager.getString("action.add_input_parameter"), new ActionListener() { @@ -251,7 +251,8 @@ public class GRestServiceEditorPane extends JPanel } }); iprmsRem = JvSwingUtils.makeButton("-", - MessageManager.getString("action.remove_input_parameter"), new ActionListener() + MessageManager.getString("action.remove_input_parameter"), + new ActionListener() { @Override @@ -269,7 +270,8 @@ public class GRestServiceEditorPane extends JPanel // Return Parameters - rdataAdd = JvSwingUtils.makeButton("+", MessageManager.getString("action.add_return_datatype"), + rdataAdd = JvSwingUtils.makeButton("+", + MessageManager.getString("action.add_return_datatype"), new ActionListener() { @@ -280,7 +282,8 @@ public class GRestServiceEditorPane extends JPanel } }); - rdataRem = JvSwingUtils.makeButton("-", MessageManager.getString("action.remove_return_datatype"), + rdataRem = JvSwingUtils.makeButton("-", + MessageManager.getString("action.remove_return_datatype"), new ActionListener() { @@ -291,8 +294,10 @@ public class GRestServiceEditorPane extends JPanel } }); - rdataNup = JvSwingUtils.makeButton(MessageManager.getString("action.move_up"), - MessageManager.getString("label.move_return_type_up_order"), new ActionListener() + rdataNup = JvSwingUtils.makeButton( + MessageManager.getString("action.move_up"), + MessageManager.getString("label.move_return_type_up_order"), + new ActionListener() { @Override @@ -302,8 +307,10 @@ public class GRestServiceEditorPane extends JPanel } }); - rdataNdown = JvSwingUtils.makeButton(MessageManager.getString("action.move_down"), - MessageManager.getString("label.move_return_type_down_order"), new ActionListener() + rdataNdown = JvSwingUtils.makeButton( + MessageManager.getString("action.move_down"), + MessageManager.getString("label.move_return_type_down_order"), + new ActionListener() { @Override @@ -315,10 +322,12 @@ public class GRestServiceEditorPane extends JPanel }); JPanel rparamList = new JPanel(); - rparamList.setBorder(new TitledBorder(MessageManager.getString("label.data_returned_by_service"))); + rparamList.setBorder(new TitledBorder(MessageManager + .getString("label.data_returned_by_service"))); rparamList.setLayout(new MigLayout("", "[grow 90, fill][]")); rdata = new JList(); - rdata.setToolTipText(MessageManager.getString("label.right_click_to_edit_currently_selected_parameter")); + rdata.setToolTipText(MessageManager + .getString("label.right_click_to_edit_currently_selected_parameter")); rdata.addMouseListener(new MouseListener() { @@ -381,13 +390,12 @@ public class GRestServiceEditorPane extends JPanel JPanel urldescPane = new JPanel(); urldescPane.setLayout(new MigLayout("", "[grow 100, fill]", "[grow 100, fill]")); - urldescPane.setBorder(new TitledBorder(MessageManager.getString("label.rsbs_encoded_service"))); + urldescPane.setBorder(new TitledBorder(MessageManager + .getString("label.rsbs_encoded_service"))); urldescPane.add(urldescVp, "span"); paste.add(urldescPane, "span"); - urldescPane - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("Flat file representation of this rest service using the Really Simple Bioinformatics Service formalism")); + urldescPane.setToolTipText(JvSwingUtils.wrapTooltip(true, + MessageManager.getString("label.flat_file_representation"))); parseRes = new JTextArea(); parseResVp = new JScrollPane(); @@ -396,27 +404,27 @@ public class GRestServiceEditorPane extends JPanel parseRes.setColumns(60); parseWarnings = new JPanel(new MigLayout("", "[grow 100, fill]", "[grow 100, fill]")); - parseWarnings.setBorder(new TitledBorder(MessageManager.getString("label.parsing_errors"))); - parseWarnings - .setToolTipText("" - + JvSwingUtils - .wrapTooltip("Results of parsing the RSBS representation") - + ""); + parseWarnings.setBorder(new TitledBorder(MessageManager + .getString("label.parsing_errors"))); + parseWarnings.setToolTipText(JvSwingUtils.wrapTooltip(true, + MessageManager.getString("label.result_of_parsing_rsbs"))); parseWarnings.add(parseResVp, "center"); parseRes.setEditable(false); paste.add(parseWarnings, "span"); setLayout(new BorderLayout()); add(panels, BorderLayout.CENTER); - okButton = JvSwingUtils.makeButton(MessageManager.getString("action.ok"), "", new ActionListener() - { + okButton = JvSwingUtils.makeButton( + MessageManager.getString("action.ok"), "", new ActionListener() + { - @Override - public void actionPerformed(ActionEvent e) - { - ok_actionPerformed(); - } - }); - cancelButton = JvSwingUtils.makeButton(MessageManager.getString("action.cancel"), "", + @Override + public void actionPerformed(ActionEvent e) + { + ok_actionPerformed(); + } + }); + cancelButton = JvSwingUtils.makeButton( + MessageManager.getString("action.cancel"), "", new ActionListener() {