git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-690 jvp rather than jar for save/restore state file browser
[jalview.git]
/
src
/
jalview
/
gui
/
RestServiceEditorPane.java
diff --git
a/src/jalview/gui/RestServiceEditorPane.java
b/src/jalview/gui/RestServiceEditorPane.java
index
2a6bb72
..
cfdea05
100644
(file)
--- a/
src/jalview/gui/RestServiceEditorPane.java
+++ b/
src/jalview/gui/RestServiceEditorPane.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
* Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
@@
-20,6
+20,7
@@
package jalview.gui;
import jalview.io.packed.DataProvider.JvDataType;
import jalview.jbgui.GRestServiceEditorPane;
import jalview.io.packed.DataProvider.JvDataType;
import jalview.jbgui.GRestServiceEditorPane;
+import jalview.util.MessageManager;
import jalview.ws.rest.InputType;
import jalview.ws.rest.RestServiceDescription;
import jalview.ws.rest.InputType;
import jalview.ws.rest.RestServiceDescription;
@@
-267,7
+268,7
@@
public class RestServiceEditorPane extends GRestServiceEditorPane
final int rdatasel = rdata.getSelectedIndex();
if (rdatasel > -1)
{
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(
for (final JvDataType type : JvDataType.values())
{
popup.add(new JMenuItem(type.name())).addActionListener(
@@
-428,15
+429,13
@@
public class RestServiceEditorPane extends GRestServiceEditorPane
}
else
{
}
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();
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);
}
}
parseWarnings.setVisible(true);
}
}