Author: tchemit Date: 2008-02-08 15:11:02 +0000 (Fri, 08 Feb 2008) New Revision: 745 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java Log: suppression ancienne action download ajout action abstraite + action downloadLE et downloadAttachment Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-08 15:10:29 UTC (rev 744) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAttachmentAction.java 2008-02-08 15:11:02 UTC (rev 745) @@ -26,6 +26,8 @@ import java.io.BufferedInputStream; import java.io.File; +import org.codelutin.util.FileUtil; + /** * Action pour downloader un résultat ou une librairie * @@ -52,13 +54,16 @@ @Override protected void initModel(DetailTabModel model) { super.initModel(model); - int selectedAttachment = model.getSelectedAttachmentIndex(); + Integer selectedAttachment = model.getSelectedAttachmentIndex(); attachment = getElement().getAttachment(selectedAttachment); } - + protected File getFile() { + if (attachment==null) { + return null; + } // ask user path where to save data - String dir = org.codelutin.util.FileUtil.getDirectory("select directory where todownload attachment '" + attachment.getFileName() + "'"); + String dir = FileUtil.getDirectory("select directory where to download attachment '" + attachment.getFileName() + "' of element "+getElement().getName()+" - "+getVersion(),"choose a dir"); if (dir == null) { // user cancel action return null; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java 2008-02-08 15:10:29 UTC (rev 744) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadLoggableElementAction.java 2008-02-08 15:11:02 UTC (rev 745) @@ -26,6 +26,8 @@ import java.io.File; import java.text.MessageFormat; +import org.codelutin.util.FileUtil; + /** * Action pour downloader un Loggable Element * @@ -50,7 +52,7 @@ } protected File getFile() { - String dir = org.codelutin.util.FileUtil.getDirectory("select directory where to download a Zip of '" + getElement().getName() + "'"); + String dir = FileUtil.getDirectory("select directory where to download a Zip of '" + getElement().getName()+"-"+getVersion() + "'","choose a dir"); if (dir == null) { // user cancel action return null; Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-02-08 15:10:29 UTC (rev 744) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/DownloadAbstractAction.java 2008-02-08 15:11:02 UTC (rev 745) @@ -77,11 +77,10 @@ } DetailTabModel model = ((DetailTabModel) getModel()); boolean result; + // init from model + initModel(model); result = element != null && version != null; if (result) { - // init from model - initModel(model); - // ask user path where to save data file = getFile(); if (file == null) {