JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / gui / RestServiceEditorPane.java

diff --git a/src/jalview/gui/RestServiceEditorPane.java b/src/jalview/gui/RestServiceEditorPane.java
index 2507ceb..ec8e7f1 100644 (file)
--- a/src/jalview/gui/RestServiceEditorPane.java
+++ b/src/jalview/gui/RestServiceEditorPane.java
@@ -1,19 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
  * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
@@ -268,7 +270,8 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
     final int rdatasel = rdata.getSelectedIndex();
     if (rdatasel > -1)
     {
-      JPopupMenu popup = new JPopupMenu(MessageManager.getString("label.select_return_type"));
+      JPopupMenu popup = new JPopupMenu(
+              MessageManager.getString("label.select_return_type"));
       for (final JvDataType type : JvDataType.values())
       {
         popup.add(new JMenuItem(type.name())).addActionListener(
@@ -429,13 +432,19 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
             }
             else
             {
-              parseRes.setText(MessageManager.formatMessage("label.parsing_failed_syntax_errors_shown_below_param", new String[]{rsd.getInvalidMessage()}));
+              parseRes.setText(MessageManager
+                      .formatMessage(
+                              "label.parsing_failed_syntax_errors_shown_below_param",
+                              new String[] { rsd.getInvalidMessage() }));
               parseWarnings.setVisible(true);
             }
           } catch (Throwable e)
           {
             e.printStackTrace();
-            parseRes.setText(MessageManager.formatMessage("label.parsing_failed_unrecoverable_exception_thrown_param", new String[]{e.toString()}));
+            parseRes.setText(MessageManager
+                    .formatMessage(
+                            "label.parsing_failed_unrecoverable_exception_thrown_param",
+                            new String[] { e.toString() }));
             parseWarnings.setVisible(true);
           }
         }