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
TreeBuilder now stores the used ScoreModel and ScoreParams
[jalview.git]
/
src
/
jalview
/
gui
/
WsParamSetManager.java
diff --git
a/src/jalview/gui/WsParamSetManager.java
b/src/jalview/gui/WsParamSetManager.java
index
b260e1b
..
d91775c
100644
(file)
--- a/
src/jalview/gui/WsParamSetManager.java
+++ b/
src/jalview/gui/WsParamSetManager.java
@@
-84,8
+84,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)
@@
-97,11
+97,9
@@
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 JALVIEW_WSPARAMFILES entries are valid!)",
+ e);
}
}
return params.toArray(new WsParamSetI[0]);
}
}
return params.toArray(new WsParamSetI[0]);
@@
-177,14
+175,12
@@
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(
- Cache.getProperty("LAST_DIRECTORY"), "wsparams",
+ JalviewFileChooser chooser = new JalviewFileChooser("wsparams",
"Web Service Parameter File");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
"Web Service Parameter File");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
@@
-194,8
+190,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"))
{
@@
-226,8
+222,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);
@@
-300,9
+296,9
@@
public class WsParamSetManager implements ParamManager
}
} catch (Exception e)
{
}
} 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);
}
}
}
}