X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRestServiceEditorPane.java;h=cfdea050a8c1c8e48ecf9a83cb71c90bebe9eaed;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=3863f4080bdbe0cd8ff27a5b3350016fb3ea7670;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git
diff --git a/src/jalview/gui/RestServiceEditorPane.java b/src/jalview/gui/RestServiceEditorPane.java
index 3863f40..cfdea05 100644
--- a/src/jalview/gui/RestServiceEditorPane.java
+++ b/src/jalview/gui/RestServiceEditorPane.java
@@ -1,24 +1,26 @@
-/*******************************************************************************
- * 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 2.8.1)
+ * Copyright (C) 2014 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.
- *
+ *
* 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 .
- *******************************************************************************/
+ * 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;
@@ -68,40 +70,47 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
public void keyTyped(KeyEvent e)
{
}
-
+
@Override
public void keyReleased(KeyEvent e)
{
- refreshCutnPaste(true);
+ refreshCutnPaste(true);
}
-
+
@Override
public void keyPressed(KeyEvent e)
{
-
+
}
});
panels.addChangeListener(new ChangeListener()
{
/**
- * last panel selected - used to decide whether the service or the GUI has the latest info
+ * last panel selected - used to decide whether the service or the GUI has
+ * the latest info
*/
Object lastComp;
+
@Override
public void stateChanged(ChangeEvent e)
{
- if (lastComp!=paste) {
+ if (lastComp != paste)
+ {
updateServiceFromGui();
refreshCutnPaste(false);
- } else {
+ }
+ else
+ {
refreshCutnPaste(true);
}
lastComp = panels.getSelectedComponent();
-
+
}
- });
- currentservice = new RestServiceDescription("Analysis", "service description", "service name", "http://localhost/", "", null, false, false, '-');
+ });
+ currentservice = new RestServiceDescription("Analysis",
+ "service description", "service name", "http://localhost/", "",
+ null, false, false, '-');
initGuiWith(currentservice);
refreshCutnPaste(false);
updateButtons();
@@ -111,10 +120,15 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
{
this();
oldservice = toedit;
- if (oldservice!=null)
- { currentservice = new RestServiceDescription(toedit);
- } else {
- currentservice = new RestServiceDescription("Analysis", "service description", "service name", "http://localhost/", "", null, false, false, '-');
+ if (oldservice != null)
+ {
+ currentservice = new RestServiceDescription(toedit);
+ }
+ else
+ {
+ currentservice = new RestServiceDescription("Analysis",
+ "service description", "service name", "http://localhost/",
+ "", null, false, false, '-');
}
initGuiWith(currentservice);
refreshCutnPaste(false);
@@ -152,7 +166,7 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
gapChar.addItem(".");
gapChar.addItem(" ");
gapChar.addItem("-");
- if (currentservice==null)
+ if (currentservice == null)
{
name.setText("");
descr.setText("");
@@ -160,194 +174,235 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
urlsuff.setText("");
action.setSelectedItem("Analysis");
gapChar.setSelectedItem("-");
- } else {
- name.setText(currentservice.getName());
- descr.setText(currentservice.getDescription());
- url.setText(currentservice.getPostUrl());
- urlsuff.setText(currentservice.getUrlSuffix());
- for (Map.Entry inparam : currentservice
- .getInputParams().entrySet())
- {
- _iparam.add(inparam.getKey() + " "
- + inparam.getValue().getURLtokenPrefix() + ":"
- + inparam.getValue().getURLEncodedParameter().toString());
}
-
- for (JvDataType oparam : currentservice.getResultDataTypes())
+ else
{
- _rparam.add(oparam.name());
- }
- iprms.setListData(_iparam);
- rdata.setListData(_rparam);
+ name.setText(currentservice.getName());
+ descr.setText(currentservice.getDescription());
+ url.setText(currentservice.getPostUrl());
+ urlsuff.setText(currentservice.getUrlSuffix());
+ for (Map.Entry inparam : currentservice
+ .getInputParams().entrySet())
+ {
+ _iparam.add(inparam.getKey() + " "
+ + inparam.getValue().getURLtokenPrefix() + ":"
+ + inparam.getValue().getURLEncodedParameter().toString());
+ }
- action.setSelectedItem(currentservice.getAction());
+ for (JvDataType oparam : currentservice.getResultDataTypes())
+ {
+ _rparam.add(oparam.name());
+ }
+ iprms.setListData(_iparam);
+ rdata.setListData(_rparam);
+
+ action.setSelectedItem(currentservice.getAction());
- gapChar.setSelectedItem(""+currentservice.getGapCharacter());
+ gapChar.setSelectedItem("" + currentservice.getGapCharacter());
}
revalidate();
}
+
private String getSelectedInputToken()
{
- if (iprms.getSelectedIndex()>-1)
+ if (iprms.getSelectedIndex() > -1)
{
- String toktoedit = (String) iprms.getSelectedValue();
- toktoedit=toktoedit.substring(0, toktoedit.indexOf(" "));
- return toktoedit;
+ String toktoedit = (String) iprms.getSelectedValue();
+ toktoedit = toktoedit.substring(0, toktoedit.indexOf(" "));
+ return toktoedit;
}
return null;
}
+
@Override
protected void iprmListSelection_doubleClicked()
{
String toktoedit = getSelectedInputToken();
- if (toktoedit!=null)
+ if (toktoedit != null)
{
InputType toedit = currentservice.getInputParams().get(toktoedit);
- String oldParam=toktoedit;
- RestInputParamEditDialog dialog=new RestInputParamEditDialog(this, currentservice, toedit);
- if (dialog.wasUpdated()) {
+ String oldParam = toktoedit;
+ RestInputParamEditDialog dialog = new RestInputParamEditDialog(this,
+ currentservice, toedit);
+ if (dialog.wasUpdated())
+ {
currentservice.getInputParams().remove(oldParam);
- currentservice.getInputParams().put(dialog.current.token, dialog.current);
+ currentservice.getInputParams().put(dialog.current.token,
+ dialog.current);
initGuiWith(currentservice);
}
-
+
}
}
+
@Override
protected void iprmsAdd_actionPerformed(ActionEvent e)
{
- RestInputParamEditDialog dialog=new RestInputParamEditDialog(this, currentservice, "param"+(1+currentservice.getInputParams().size()));
- if (dialog.wasUpdated()) {
- currentservice.getInputParams().put(dialog.current.token, dialog.current);
+ RestInputParamEditDialog dialog = new RestInputParamEditDialog(this,
+ currentservice, "param"
+ + (1 + currentservice.getInputParams().size()));
+ if (dialog.wasUpdated())
+ {
+ currentservice.getInputParams().put(dialog.current.token,
+ dialog.current);
initGuiWith(currentservice);
}
}
+
@Override
protected void iprmsRem_actionPerformed(ActionEvent e)
{
String toktoedit = getSelectedInputToken();
- if (toktoedit!=null)
+ if (toktoedit != null)
{
currentservice.getInputParams().remove(toktoedit);
initGuiWith(currentservice);
}
}
+
@Override
protected void rdata_rightClicked(MouseEvent mouse)
{
final int rdatasel = rdata.getSelectedIndex();
- if (rdatasel>-1)
+ if (rdatasel > -1)
{
- JPopupMenu popup = new JPopupMenu("Select return type");
- for (final JvDataType type:JvDataType.values()) {
- popup.add(new JMenuItem(type.name())).addActionListener(new ActionListener()
- {
-
- @Override
- public void actionPerformed(ActionEvent e)
- {
- currentservice.getResultDataTypes().set(rdatasel, type);
- initGuiWith(currentservice);
- rdata.setSelectedIndex(rdatasel);
- }
- });
+ 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()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ currentservice.getResultDataTypes().set(rdatasel, type);
+ initGuiWith(currentservice);
+ rdata.setSelectedIndex(rdatasel);
+ }
+ });
}
popup.show(rdata, mouse.getX(), mouse.getY());
}
}
+
@Override
protected void rdataAdd_actionPerformed(ActionEvent e)
{
int p;
- if ((p=rdata.getSelectedIndex())>-1)
+ if ((p = rdata.getSelectedIndex()) > -1)
+ {
+ currentservice.getResultDataTypes().add(p + 1, JvDataType.ANNOTATION);
+ }
+ else
{
- currentservice.getResultDataTypes().add(p+1, JvDataType.ANNOTATION);
- } else {
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
protected void rdataNdown_actionPerformed(ActionEvent e)
{
int p;
- if ((p=rdata.getSelectedIndex())>-1 && p<_rparam.size()-1)
+ if ((p = rdata.getSelectedIndex()) > -1 && p < _rparam.size() - 1)
{
List rtypes = currentservice.getResultDataTypes();
- JvDataType below = rtypes.get(p+1);
- rtypes.set(p+1, rtypes.get(p));
+ JvDataType below = rtypes.get(p + 1);
+ rtypes.set(p + 1, rtypes.get(p));
rtypes.set(p, below);
initGuiWith(currentservice);
- rdata.setSelectedIndex(p+1);
+ rdata.setSelectedIndex(p + 1);
}
}
+
@Override
protected void rdataNup_actionPerformed(ActionEvent e)
{
int p;
- if ((p=rdata.getSelectedIndex())>0)
+ if ((p = rdata.getSelectedIndex()) > 0)
{
List rtypes = currentservice.getResultDataTypes();
- JvDataType above = rtypes.get(p-1);
- rtypes.set(p-1, rtypes.get(p));
+ JvDataType above = rtypes.get(p - 1);
+ rtypes.set(p - 1, rtypes.get(p));
rtypes.set(p, above);
initGuiWith(currentservice);
- rdata.setSelectedIndex(p-1);
+ rdata.setSelectedIndex(p - 1);
}
}
+
@Override
protected void rdataRem_actionPerformed(ActionEvent e)
{
- if (rdata.getSelectedIndex()>-1)
+ if (rdata.getSelectedIndex() > -1)
{
currentservice.getResultDataTypes().remove(rdata.getSelectedIndex());
initGuiWith(currentservice);
}
}
- private boolean updateServiceFromGui() {
- MapinputTypes = new HashMap();
- StringBuffer warnings=new StringBuffer();
- for (String its:_iparam)
+ private boolean updateServiceFromGui()
+ {
+ Map inputTypes = new HashMap();
+ StringBuffer warnings = new StringBuffer();
+ for (String its : _iparam)
{
- 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))
+ 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))
{
- System.err.println("IMPLEMENTATION PROBLEM: Cannot parse RestService input parameter string '"+its+"'"+"\n"+warnings);
- }
+ System.err
+ .println("IMPLEMENTATION PROBLEM: Cannot parse RestService input parameter string '"
+ + its + "'" + "\n" + warnings);
+ }
}
}
- 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(), vSeparable.isSelected(), gc);
-
+ 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(),
+ vSeparable.isSelected(), gc);
+
if (newService.isValid())
{
- for (String its:_rparam)
+ for (String its : _rparam)
{
JvDataType dtype;
- try {
+ try
+ {
dtype = JvDataType.valueOf(its);
newService.addResultDatatype(dtype);
- }
- catch (Throwable x)
+ } catch (Throwable x)
{
- System.err.println("IMPLEMENTATION PROBLEM: Cannot parse RestService output parameter string '"+its+"'"+"\n"+warnings);
+ System.err
+ .println("IMPLEMENTATION PROBLEM: Cannot parse RestService output parameter string '"
+ + its + "'" + "\n" + warnings);
}
}
currentservice = newService;
return true;
- } else {
- System.err.println("IMPLEMENTATION PROBLEM: Restservice generated from GUI is invalid\n"+warnings);
+ }
+ else
+ {
+ System.err
+ .println("IMPLEMENTATION PROBLEM: Restservice generated from GUI is invalid\n"
+ + warnings);
}
return false;
}
+
protected void refreshCutnPaste(boolean reparse)
{
if (!reparse && currentservice.isValid())
@@ -370,26 +425,24 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
{
parseWarnings.setVisible(false);
parseRes.setText("");
- initGuiWith(currentservice=rsd);
+ initGuiWith(currentservice = rsd);
}
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);
}
}
paste.revalidate();
}
}
-
+
}
public static void main(String[] args)
@@ -402,15 +455,18 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
public void run()
{
- boolean nulserv=true;
+ boolean nulserv = true;
while (visible)
{
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(),
+ (nulserv = !nulserv) ? new RestServiceEditorPane(
+ jalview.ws.rest.RestClient
+ .makeShmmrRestClient()
+ .getRestDescription())
+ : new RestServiceEditorPane(),
BorderLayout.CENTER);
df.setBounds(100, 100, 600, 400);
df.addComponentListener(new ComponentListener()
@@ -460,42 +516,45 @@ public class RestServiceEditorPane extends GRestServiceEditorPane
}
}
- String finalService=null;
+
+ String finalService = null;
+
public void showDialog(String title)
{
- if (oldservice!=null)
+ if (oldservice != null)
{
finalService = oldservice.toString();
}
JalviewDialog jvd = new JalviewDialog()
{
-
+
@Override
protected void raiseClosed()
{
// TODO Auto-generated method stub
-
+
}
-
+
@Override
protected void okPressed()
{
updateServiceFromGui();
- finalService = currentservice.toString();
+ finalService = currentservice.toString();
}
-
+
@Override
protected void cancelPressed()
{
-
+
}
};
- JPanel pane = new JPanel(new BorderLayout()),okcancel=new JPanel(new FlowLayout());
- pane.add(this,BorderLayout.CENTER);
+ JPanel pane = new JPanel(new BorderLayout()), okcancel = new JPanel(
+ new FlowLayout());
+ pane.add(this, BorderLayout.CENTER);
okcancel.add(jvd.ok);
okcancel.add(jvd.cancel);
pane.add(okcancel, BorderLayout.SOUTH);
- jvd.initDialogFrame(pane, true, true, title, 600,350);
+ jvd.initDialogFrame(pane, true, true, title, 600, 350);
jvd.waitForInput();
}