X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRestServiceEditorPane.java;h=cda76d94be1f8a17899e9778a7c69e7ef1dcdd2f;hb=3ffda7877bae6500636fcccaf1a9eae8bff2f45c;hp=2a6bb7244607b0008f47983685ceab743b48fb1f;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git

diff --git a/src/jalview/gui/RestServiceEditorPane.java b/src/jalview/gui/RestServiceEditorPane.java
index 2a6bb72..cda76d9 100644
--- a/src/jalview/gui/RestServiceEditorPane.java
+++ b/src/jalview/gui/RestServiceEditorPane.java
@@ -1,25 +1,28 @@
 /*
- * 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;
 
 import jalview.io.packed.DataProvider.JvDataType;
 import jalview.jbgui.GRestServiceEditorPane;
+import jalview.util.MessageManager;
 import jalview.ws.rest.InputType;
 import jalview.ws.rest.RestServiceDescription;
 
@@ -144,9 +147,9 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
 
   }
 
-  Vector<String> _iparam = new Vector<String>();
+  Vector<String> _iparam = new Vector<>();
 
-  Vector<String> _rparam = new Vector<String>();
+  Vector<String> _rparam = new Vector<>();
 
   /**
    * generate an editable URL service string and parameter list using the
@@ -238,8 +241,8 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
   protected void iprmsAdd_actionPerformed(ActionEvent e)
   {
     RestInputParamEditDialog dialog = new RestInputParamEditDialog(this,
-            currentservice, "param"
-                    + (1 + currentservice.getInputParams().size()));
+            currentservice,
+            "param" + (1 + currentservice.getInputParams().size()));
     if (dialog.wasUpdated())
     {
       currentservice.getInputParams().put(dialog.current.token,
@@ -267,11 +270,12 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
     final int rdatasel = rdata.getSelectedIndex();
     if (rdatasel > -1)
     {
-      JPopupMenu popup = new JPopupMenu("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(
-                new ActionListener()
+        popup.add(new JMenuItem(type.name()))
+                .addActionListener(new ActionListener()
                 {
 
                   @Override
@@ -300,8 +304,9 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
       currentservice.addResultDatatype(JvDataType.ANNOTATION);
     }
     initGuiWith(currentservice);
-    rdata.setSelectedIndex(p == -1 ? currentservice.getResultDataTypes()
-            .size() - 1 : p + 1);
+    rdata.setSelectedIndex(
+            p == -1 ? currentservice.getResultDataTypes().size() - 1
+                    : p + 1);
   }
 
   @Override
@@ -346,30 +351,30 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
 
   private boolean updateServiceFromGui()
   {
-    Map<String, InputType> inputTypes = new HashMap<String, InputType>();
+    Map<String, InputType> inputTypes = new HashMap<>();
     StringBuffer warnings = new StringBuffer();
     for (String its : _iparam)
     {
-      Matcher mtch = Pattern.compile("(\\S+)\\s(\\S+):\\[(.+)]").matcher(
-              its);
+      Matcher mtch = Pattern.compile("(\\S+)\\s(\\S+):\\[(.+)]")
+              .matcher(its);
       if (mtch.find())
       {
-        if (!RestServiceDescription.parseTypeString(mtch.group(2) + ":"
-                + mtch.group(3), mtch.group(1), mtch.group(2),
-                mtch.group(3), inputTypes, warnings))
+        if (!RestServiceDescription.parseTypeString(
+                mtch.group(2) + ":" + mtch.group(3), mtch.group(1),
+                mtch.group(2), mtch.group(3), inputTypes, warnings))
         {
-          System.err
-                  .println("IMPLEMENTATION PROBLEM: Cannot parse RestService input parameter string '"
+          System.err.println(
+                  "IMPLEMENTATION PROBLEM: Cannot parse RestService input parameter string '"
                           + its + "'" + "\n" + warnings);
         }
       }
     }
-    char gc = gapChar.getSelectedItem() == null ? ' ' : ((String) gapChar
-            .getSelectedItem()).charAt(0);
+    char gc = gapChar.getSelectedItem() == null ? ' '
+            : ((String) gapChar.getSelectedItem()).charAt(0);
     RestServiceDescription newService = new RestServiceDescription(
-            (String) action.getSelectedItem(), descr.getText().trim(), name
-                    .getText().trim(), url.getText().trim(), urlsuff
-                    .getText().trim(), inputTypes, hSeparable.isSelected(),
+            (String) action.getSelectedItem(), descr.getText().trim(),
+            name.getText().trim(), url.getText().trim(),
+            urlsuff.getText().trim(), inputTypes, hSeparable.isSelected(),
             vSeparable.isSelected(), gc);
 
     if (newService.isValid())
@@ -384,8 +389,8 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
         } catch (Throwable x)
         {
 
-          System.err
-                  .println("IMPLEMENTATION PROBLEM: Cannot parse RestService output parameter string '"
+          System.err.println(
+                  "IMPLEMENTATION PROBLEM: Cannot parse RestService output parameter string '"
                           + its + "'" + "\n" + warnings);
         }
       }
@@ -394,8 +399,8 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
     }
     else
     {
-      System.err
-              .println("IMPLEMENTATION PROBLEM: Restservice generated from GUI is invalid\n"
+      System.err.println(
+              "IMPLEMENTATION PROBLEM: Restservice generated from GUI is invalid\n"
                       + warnings);
 
     }
@@ -428,15 +433,19 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
             }
             else
             {
-              parseRes.setText("Parsing failed. Syntax errors shown below\n"
-                      + 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("\nParsing failed. An unrecoverable exception was thrown:\n"
-                    + e.toString());
+            parseRes.setText(MessageManager.formatMessage(
+                    "label.parsing_failed_unrecoverable_exception_thrown_param",
+                    new String[]
+                    { e.toString() }));
             parseWarnings.setVisible(true);
           }
         }
@@ -446,6 +455,10 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
 
   }
 
+  /**
+   * @j2sIgnore
+   * @param args
+   */
   public static void main(String[] args)
   {
     if (args.length == 0)
@@ -454,6 +467,7 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
       {
         boolean visible = true;
 
+        @Override
         public void run()
         {
           boolean nulserv = true;
@@ -462,13 +476,10 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
             final Thread runner = Thread.currentThread();
             JFrame df = new JFrame();
             df.getContentPane().setLayout(new BorderLayout());
-            df.getContentPane().add(
-                    (nulserv = !nulserv) ? new RestServiceEditorPane(
-                            jalview.ws.rest.RestClient
-                                    .makeShmmrRestClient()
-                                    .getRestDescription())
-                            : new RestServiceEditorPane(),
-                    BorderLayout.CENTER);
+            df.getContentPane().add((nulserv = !nulserv)
+                    ? new RestServiceEditorPane(jalview.ws.rest.RestClient
+                            .makeShmmrRestClient().getRestDescription())
+                    : new RestServiceEditorPane(), BorderLayout.CENTER);
             df.setBounds(100, 100, 600, 400);
             df.addComponentListener(new ComponentListener()
             {
@@ -508,7 +519,6 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
               } catch (Exception x)
               {
               }
-              ;
             }
             visible = true;
           }
@@ -549,8 +559,8 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
 
       }
     };
-    JPanel pane = new JPanel(new BorderLayout()), okcancel = new JPanel(
-            new FlowLayout());
+    JPanel pane = new JPanel(new BorderLayout()),
+            okcancel = new JPanel(new FlowLayout());
     pane.add(this, BorderLayout.CENTER);
     okcancel.add(jvd.ok);
     okcancel.add(jvd.cancel);