X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Frest%2FRestClient.java;h=41713f1df551f4027c2230d46617722145332933;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=437d3b4521a010dfbe035da35e8d2caaa8e35233;hpb=ef43a335ff52a55b03b4d6687c3e876e547cd27a;p=jalview.git
diff --git a/src/jalview/ws/rest/RestClient.java b/src/jalview/ws/rest/RestClient.java
index 437d3b4..41713f1 100644
--- a/src/jalview/ws/rest/RestClient.java
+++ b/src/jalview/ws/rest/RestClient.java
@@ -1,33 +1,25 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * 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.
+ * 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.ws.rest;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
-
import jalview.bin.Cache;
import jalview.datamodel.AlignmentView;
import jalview.gui.AlignFrame;
@@ -36,10 +28,22 @@ import jalview.gui.AlignmentPanel;
import jalview.gui.Desktop;
import jalview.gui.WebserviceInfo;
import jalview.io.packed.DataProvider.JvDataType;
+import jalview.util.MessageManager;
import jalview.ws.WSClient;
import jalview.ws.WSClientI;
import jalview.ws.WSMenuEntryProviderI;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.event.MenuEvent;
+import javax.swing.event.MenuListener;
+
/**
* @author JimP
*
@@ -78,8 +82,11 @@ public class RestClient extends WSClient implements WSClientI,
{
this(service2, alignFrame, false);
}
+
boolean headless = false;
- public RestClient(RestServiceDescription service2, AlignFrame alignFrame, boolean nogui)
+
+ public RestClient(RestServiceDescription service2, AlignFrame alignFrame,
+ boolean nogui)
{
service = service2;
af = alignFrame;
@@ -90,8 +97,7 @@ public class RestClient extends WSClient implements WSClientI,
public void setWebserviceInfo(boolean headless)
{
- WebServiceJobTitle = service.details.Action + " using "
- + service.details.Name;
+ WebServiceJobTitle = MessageManager.formatMessage("label.webservice_job_title", new String[]{service.details.Action,service.details.Name});
WebServiceName = service.details.Name;
WebServiceReference = "No reference - go to url for more info";
if (service.details.description != null)
@@ -101,7 +107,7 @@ public class RestClient extends WSClient implements WSClientI,
if (!headless)
{
wsInfo = new WebserviceInfo(WebServiceJobTitle, WebServiceName + "\n"
- + WebServiceReference);
+ + WebServiceReference, true);
wsInfo.setRenderAsHtml(true);
}
@@ -134,8 +140,7 @@ public class RestClient extends WSClient implements WSClientI,
final AlignFrame alignFrame)
{
JMenuItem submit = new JMenuItem(service.details.Name);
- submit.setToolTipText(service.details.Action + " using "
- + service.details.Name);
+ submit.setToolTipText(MessageManager.formatMessage("label.rest_client_submit", new String[]{service.details.Action,service.details.Name}));
submit.addActionListener(new ActionListener()
{
@@ -225,6 +230,7 @@ public class RestClient extends WSClient implements WSClientI,
* informative name for results
*/
public String viewTitle;
+
protected void constructJob()
{
service.setInvolvesFlags();
@@ -251,9 +257,7 @@ public class RestClient extends WSClient implements WSClientI,
_input = new AlignmentView(av.getAlignment(),
av.getColumnSelection(), av.getSelectionGroup(),
av.hasHiddenColumns(), true, true);
- viewTitle = "selected "
- + (av.hasHiddenColumns() ? "visible" : "")
- + " region of " + af.getTitle();
+ viewTitle = MessageManager.formatMessage("label.select_visible_region_of", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()});
}
else
{
@@ -262,9 +266,7 @@ public class RestClient extends WSClient implements WSClientI,
av.getColumnSelection(), av.getSelectionGroup(),
av.hasHiddenColumns(), false, true);
}
- viewTitle = "select and unselected "
- + (av.hasHiddenColumns() ? "visible" : "")
- + " regions from " + af.getTitle();
+ viewTitle = MessageManager.formatMessage("label.select_unselect_visible_regions_from", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()});
}
else
{
@@ -272,8 +274,7 @@ public class RestClient extends WSClient implements WSClientI,
_input = new AlignmentView(av.getAlignment(),
av.getColumnSelection(), av.getSelectionGroup(),
av.hasHiddenColumns(), true, true);
- viewTitle = "selected " + (av.hasHiddenColumns() ? "visible" : "")
- + " region of " + af.getTitle();
+ viewTitle = MessageManager.formatMessage("label.select_visible_region_of", new String[]{(av.hasHiddenColumns() ? MessageManager.getString("label.visible") : ""),af.getTitle()});
}
}
else
@@ -282,7 +283,7 @@ public class RestClient extends WSClient implements WSClientI,
_input = new AlignmentView(av.getAlignment(),
av.getColumnSelection(), null, av.hasHiddenColumns(), false,
true);
- viewTitle = "" + (av.hasHiddenColumns() ? "visible region of " : "")
+ viewTitle = "" + (av.hasHiddenColumns() ? (new StringBuffer(" ").append(MessageManager.getString("label.visible_region_of")).toString()) : "")
+ af.getTitle();
}
@@ -291,7 +292,8 @@ public class RestClient extends WSClient implements WSClientI,
if (jobsthread.isValid())
{
setWebserviceInfo(headless);
- if (!headless) {
+ if (!headless)
+ {
wsInfo.setthisService(this);
jobsthread.setWebServiceInfo(wsInfo);
}
@@ -304,15 +306,15 @@ public class RestClient extends WSClient implements WSClientI,
.showMessageDialog(
Desktop.desktop,
(jobsthread.hasWarnings() ? jobsthread.getWarnings()
- : "The Job couldn't be started. Please check your input, and the Jalview console for any warning messages."),
- "Unable to start web service analysis",
+ : MessageManager.getString("label.job_couldnt_be_started_check_input")),
+ MessageManager.getString("label.unable_start_web_service_analysis"),
JOptionPane.WARNING_MESSAGE);
}
}
public static RestClient makeShmmrRestClient()
{
- String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = "Multi-Harmony";
+ String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = MessageManager.getString("label.multiharmony");
Hashtable iparams = new Hashtable();
jalview.ws.rest.params.JobConstant toolp;
// toolp = new jalview.ws.rest.JobConstant("tool","jalview");