X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWsParamSetManager.java;h=ab03d694ea32a6dda5a06024d35bc875c1ded9ff;hb=f37c3fd4fe12799de498de5f397252e9f457fee9;hp=46d93b071f9b0edd6422f70c0a4501bed0775879;hpb=da53a3eaf1e5c06ff6a2506b7b603086293a887e;p=jalview.git diff --git a/src/jalview/gui/WsParamSetManager.java b/src/jalview/gui/WsParamSetManager.java index 46d93b0..ab03d69 100644 --- 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.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. * @@ -20,6 +20,14 @@ */ package jalview.gui; +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.ws.params.WsParamSetI; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -31,15 +39,6 @@ import java.util.Hashtable; import java.util.List; import java.util.StringTokenizer; -import javax.swing.JOptionPane; - -import jalview.bin.Cache; -import jalview.io.JalviewFileChooser; -import jalview.util.MessageManager; -import jalview.ws.params.ParamDatastoreI; -import jalview.ws.params.ParamManager; -import jalview.ws.params.WsParamSetI; - /** * store and retrieve web service parameter sets. * @@ -48,20 +47,21 @@ import jalview.ws.params.WsParamSetI; */ public class WsParamSetManager implements ParamManager { - Hashtable paramparsers = new Hashtable(); + private static final String WS_PARAM_FILES = "WS_PARAM_FILES"; + Hashtable paramparsers = new Hashtable<>(); @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; - ArrayList params = new ArrayList(); + ArrayList params = new ArrayList<>(); while (st.hasMoreTokens()) { pfile = st.nextToken(); @@ -85,8 +85,8 @@ public class WsParamSetManager implements ParamManager { 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) @@ -98,11 +98,10 @@ public class WsParamSetManager implements ParamManager } } 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]); @@ -110,7 +109,7 @@ public class WsParamSetManager implements ParamManager private WsParamSetI[] parseParamFile(String filename) throws IOException { - List psets = new ArrayList(); + List psets = new ArrayList<>(); InputStreamReader is = new InputStreamReader( new java.io.FileInputStream(new File(filename)), "UTF-8"); @@ -178,24 +177,23 @@ public class WsParamSetManager implements ParamManager } 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) { - 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"); - chooser.setFileView(new jalview.io.JalviewFileView()); - chooser.setDialogTitle(MessageManager.getString("label.choose_filename_for_param_file")); + chooser.setFileView(new JalviewFileView()); + chooser.setDialogTitle(MessageManager + .getString("label.choose_filename_for_param_file")); chooser.setToolTipText(MessageManager.getString("action.save")); int value = chooser.showSaveDialog(Desktop.instance); 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")) { @@ -206,7 +204,7 @@ public class WsParamSetManager implements ParamManager } 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) { @@ -216,7 +214,7 @@ public class WsParamSetManager implements ParamManager } 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(); @@ -226,8 +224,8 @@ public class WsParamSetManager implements ParamManager 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); @@ -270,7 +268,7 @@ public class WsParamSetManager implements ParamManager { 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(); @@ -283,7 +281,7 @@ public class WsParamSetManager implements ParamManager nparamFiles = nparamFiles.concat("|").concat(fl); } } - jalview.bin.Cache.setProperty("WS_PARAM_FILES", nparamFiles); + jalview.bin.Cache.setProperty(WS_PARAM_FILES, nparamFiles); } try @@ -291,18 +289,18 @@ public class WsParamSetManager implements ParamManager 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 ?", - JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION) + JvOptionPane.OK_CANCEL_OPTION) == JvOptionPane.OK_OPTION) { 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); } }