X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FRestServiceEditorPane.java;h=895362669c46ee67e4ce90553d7491a9d49c3d9a;hb=5640ec0623c6d1205e62f9fe15292f32bfdab7d9;hp=f4c5484529d938db2c1d26a2ac788b24d514f70a;hpb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;p=jalview.git
diff --git a/src/jalview/gui/RestServiceEditorPane.java b/src/jalview/gui/RestServiceEditorPane.java
index f4c5484..8953626 100644
--- a/src/jalview/gui/RestServiceEditorPane.java
+++ b/src/jalview/gui/RestServiceEditorPane.java
@@ -1,24 +1,28 @@
-/*******************************************************************************
- * 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
- *
+/*
+ * 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 .
- *******************************************************************************/
+ *
+ * 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.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;
@@ -143,9 +147,9 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
}
- Vector _iparam = new Vector();
+ Vector _iparam = new Vector<>();
- Vector _rparam = new Vector();
+ Vector _rparam = new Vector<>();
/**
* generate an editable URL service string and parameter list using the
@@ -237,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,
@@ -266,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
@@ -299,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
@@ -345,30 +351,30 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
private boolean updateServiceFromGui()
{
- Map inputTypes = new HashMap();
+ Map 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 '"
+ jalview.bin.Console.errPrintln(
+ "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())
@@ -383,8 +389,8 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
} catch (Throwable x)
{
- System.err
- .println("IMPLEMENTATION PROBLEM: Cannot parse RestService output parameter string '"
+ jalview.bin.Console.errPrintln(
+ "IMPLEMENTATION PROBLEM: Cannot parse RestService output parameter string '"
+ its + "'" + "\n" + warnings);
}
}
@@ -393,8 +399,8 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
}
else
{
- System.err
- .println("IMPLEMENTATION PROBLEM: Restservice generated from GUI is invalid\n"
+ jalview.bin.Console.errPrintln(
+ "IMPLEMENTATION PROBLEM: Restservice generated from GUI is invalid\n"
+ warnings);
}
@@ -427,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);
}
}
@@ -445,6 +455,10 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
}
+ /**
+ * @j2sIgnore
+ * @param args
+ */
public static void main(String[] args)
{
if (args.length == 0)
@@ -453,6 +467,7 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
{
boolean visible = true;
+ @Override
public void run()
{
boolean nulserv = true;
@@ -461,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()
{
@@ -507,7 +519,6 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
} catch (Exception x)
{
}
- ;
}
visible = true;
}
@@ -548,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);