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-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
de71f6c
..
ec8e7f1
100644
(file)
--- a/
src/jalview/gui/RestServiceEditorPane.java
+++ b/
src/jalview/gui/RestServiceEditorPane.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * 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.
*
*
* This file is part of Jalview.
*
@@
-270,7
+270,8
@@
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(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(
for (final JvDataType type : JvDataType.values())
{
popup.add(new JMenuItem(type.name())).addActionListener(
@@
-431,13
+432,19
@@
public class RestServiceEditorPane extends GRestServiceEditorPane
}
else
{
}
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();
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);
}
}
parseWarnings.setVisible(true);
}
}