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-3070 pushed down JABAWS specific args for WsJobParameters to Jws2Client
[jalview.git]
/
src
/
jalview
/
gui
/
WsParamSetManager.java
diff --git
a/src/jalview/gui/WsParamSetManager.java
b/src/jalview/gui/WsParamSetManager.java
index
0be609c
..
ab03d69
100644
(file)
--- a/
src/jalview/gui/WsParamSetManager.java
+++ b/
src/jalview/gui/WsParamSetManager.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
- * Copyright (C) 2015 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.
*
@@
-22,6
+22,7
@@
package jalview.gui;
import jalview.bin.Cache;
import jalview.io.JalviewFileChooser;
import jalview.bin.Cache;
import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
import jalview.util.MessageManager;
import jalview.ws.params.ParamDatastoreI;
import jalview.ws.params.ParamManager;
import jalview.util.MessageManager;
import jalview.ws.params.ParamDatastoreI;
import jalview.ws.params.ParamManager;
@@
-38,8
+39,6
@@
import java.util.Hashtable;
import java.util.List;
import java.util.StringTokenizer;
import java.util.List;
import java.util.StringTokenizer;
-import javax.swing.JOptionPane;
-
/**
* store and retrieve web service parameter sets.
*
/**
* store and retrieve web service parameter sets.
*
@@
-48,20
+47,21
@@
import javax.swing.JOptionPane;
*/
public class WsParamSetManager implements ParamManager
{
*/
public class WsParamSetManager implements ParamManager
{
- Hashtable<String, ParamDatastoreI> paramparsers = new Hashtable<String, ParamDatastoreI>();
+ private static final String WS_PARAM_FILES = "WS_PARAM_FILES";
+ Hashtable<String, ParamDatastoreI> paramparsers = new Hashtable<>();
@Override
public WsParamSetI[] getParameterSet(String name, String serviceUrl,
boolean modifiable, boolean unmodifiable)
{
@Override
public WsParamSetI[] getParameterSet(String name, String serviceUrl,
boolean modifiable, boolean unmodifiable)
{
- String files = Cache.getProperty("WS_PARAM_FILES");
+ String files = Cache.getProperty(WS_PARAM_FILES);
if (files == null)
{
return null;
}
StringTokenizer st = new StringTokenizer(files, "|");
String pfile = null;
if (files == null)
{
return null;
}
StringTokenizer st = new StringTokenizer(files, "|");
String pfile = null;
- ArrayList<WsParamSetI> params = new ArrayList<WsParamSetI>();
+ ArrayList<WsParamSetI> params = new ArrayList<>();
while (st.hasMoreTokens())
{
pfile = st.nextToken();
while (st.hasMoreTokens())
{
pfile = st.nextToken();
@@
-85,8
+85,8
@@
public class WsParamSetManager implements ParamManager
{
add = true;
}
{
add = true;
}
- add &= (modifiable == p.isModifiable() || unmodifiable == !p
- .isModifiable());
+ add &= (modifiable == p.isModifiable()
+ || unmodifiable == !p.isModifiable());
add &= name == null || p.getName().equals(name);
if (add)
add &= name == null || p.getName().equals(name);
if (add)
@@
-98,11
+98,10
@@
public class WsParamSetManager implements ParamManager
}
} catch (IOException e)
{
}
} catch (IOException e)
{
- Cache.log
- .info("Failed to parse parameter file "
- + pfile
- + " (Check that all JALVIEW_WSPARAMFILES entries are valid!)",
- e);
+ Cache.log.info("Failed to parse parameter file " + pfile
+ + " (Check that all " + WS_PARAM_FILES
+ + " entries are valid!)",
+ e);
}
}
return params.toArray(new WsParamSetI[0]);
}
}
return params.toArray(new WsParamSetI[0]);
@@
-110,7
+109,7
@@
public class WsParamSetManager implements ParamManager
private WsParamSetI[] parseParamFile(String filename) throws IOException
{
private WsParamSetI[] parseParamFile(String filename) throws IOException
{
- List<WsParamSetI> psets = new ArrayList<WsParamSetI>();
+ List<WsParamSetI> psets = new ArrayList<>();
InputStreamReader is = new InputStreamReader(
new java.io.FileInputStream(new File(filename)), "UTF-8");
InputStreamReader is = new InputStreamReader(
new java.io.FileInputStream(new File(filename)), "UTF-8");
@@
-178,18
+177,14
@@
public class WsParamSetManager implements ParamManager
}
if (parser == null)
{
}
if (parser == null)
{
- throw new Error(
- MessageManager
- .getString("error.implementation_error_cannot_find_marshaller_for_param_set"));
+ throw new Error(MessageManager.getString(
+ "error.implementation_error_cannot_find_marshaller_for_param_set"));
}
if (filename == null)
{
}
if (filename == null)
{
- JalviewFileChooser chooser = new JalviewFileChooser(
- jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[]
- { "wsparams" },
- new String[] { "Web Service Parameter File" },
+ JalviewFileChooser chooser = new JalviewFileChooser("wsparams",
"Web Service Parameter File");
"Web Service Parameter File");
- chooser.setFileView(new jalview.io.JalviewFileView());
+ chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
.getString("label.choose_filename_for_param_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
chooser.setDialogTitle(MessageManager
.getString("label.choose_filename_for_param_file"));
chooser.setToolTipText(MessageManager.getString("action.save"));
@@
-197,8
+192,8
@@
public class WsParamSetManager implements ParamManager
if (value == JalviewFileChooser.APPROVE_OPTION)
{
outfile = chooser.getSelectedFile();
if (value == JalviewFileChooser.APPROVE_OPTION)
{
outfile = chooser.getSelectedFile();
- jalview.bin.Cache
- .setProperty("LAST_DIRECTORY", outfile.getParent());
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+ outfile.getParent());
filename = outfile.getAbsolutePath();
if (!filename.endsWith(".wsparams"))
{
filename = outfile.getAbsolutePath();
if (!filename.endsWith(".wsparams"))
{
@@
-209,7
+204,7
@@
public class WsParamSetManager implements ParamManager
}
if (outfile != null)
{
}
if (outfile != null)
{
- String paramFiles = jalview.bin.Cache.getDefault("WS_PARAM_FILES",
+ String paramFiles = jalview.bin.Cache.getDefault(WS_PARAM_FILES,
filename);
if (paramFiles.indexOf(filename) == -1)
{
filename);
if (paramFiles.indexOf(filename) == -1)
{
@@
-219,7
+214,7
@@
public class WsParamSetManager implements ParamManager
}
paramFiles = paramFiles.concat(filename);
}
}
paramFiles = paramFiles.concat(filename);
}
- jalview.bin.Cache.setProperty("WS_PARAM_FILES", paramFiles);
+ jalview.bin.Cache.setProperty(WS_PARAM_FILES, paramFiles);
jalview.schemabinding.version2.WebServiceParameterSet paramxml = new jalview.schemabinding.version2.WebServiceParameterSet();
jalview.schemabinding.version2.WebServiceParameterSet paramxml = new jalview.schemabinding.version2.WebServiceParameterSet();
@@
-229,8
+224,8
@@
public class WsParamSetManager implements ParamManager
paramxml.setVersion("1.0");
try
{
paramxml.setVersion("1.0");
try
{
- paramxml.setParameters(parser
- .generateServiceParameterFile(parameterSet));
+ paramxml.setParameters(
+ parser.generateServiceParameterFile(parameterSet));
PrintWriter out = new PrintWriter(new OutputStreamWriter(
new FileOutputStream(outfile), "UTF-8"));
paramxml.marshal(out);
PrintWriter out = new PrintWriter(new OutputStreamWriter(
new FileOutputStream(outfile), "UTF-8"));
paramxml.marshal(out);
@@
-273,7
+268,7
@@
public class WsParamSetManager implements ParamManager
{
return;
}
{
return;
}
- String paramFiles = jalview.bin.Cache.getDefault("WS_PARAM_FILES", "");
+ String paramFiles = jalview.bin.Cache.getDefault(WS_PARAM_FILES, "");
if (paramFiles.indexOf(filename) > -1)
{
String nparamFiles = new String();
if (paramFiles.indexOf(filename) > -1)
{
String nparamFiles = new String();
@@
-286,7
+281,7
@@
public class WsParamSetManager implements ParamManager
nparamFiles = nparamFiles.concat("|").concat(fl);
}
}
nparamFiles = nparamFiles.concat("|").concat(fl);
}
}
- jalview.bin.Cache.setProperty("WS_PARAM_FILES", nparamFiles);
+ jalview.bin.Cache.setProperty(WS_PARAM_FILES, nparamFiles);
}
try
}
try
@@
-294,18
+289,18
@@
public class WsParamSetManager implements ParamManager
File pfile = new File(filename);
if (pfile.exists() && pfile.canWrite())
{
File pfile = new File(filename);
if (pfile.exists() && pfile.canWrite())
{
- if (JOptionPane.showConfirmDialog(Desktop.instance,
+ if (JvOptionPane.showConfirmDialog(Desktop.instance,
"Delete the preset's file, too ?", "Delete User Preset ?",
"Delete the preset's file, too ?", "Delete User Preset ?",
- JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
+ JvOptionPane.OK_CANCEL_OPTION) == JvOptionPane.OK_OPTION)
{
pfile.delete();
}
}
} catch (Exception e)
{
{
pfile.delete();
}
}
} catch (Exception e)
{
- Cache.log
- .error("Exception when trying to delete webservice user preset: ",
- e);
+ Cache.log.error(
+ "Exception when trying to delete webservice user preset: ",
+ e);
}
}
}
}