Author: glandais Date: 2008-02-06 17:11:57 +0000 (Wed, 06 Feb 2008) New Revision: 696 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java Log: Attachment handling Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-06 17:11:44 UTC (rev 695) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-06 17:11:57 UTC (rev 696) @@ -19,6 +19,8 @@ package fr.cemagref.simexplorer.is.service; import com.healthmarketscience.rmiio.RemoteInputStream; + +import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; @@ -65,7 +67,7 @@ public MetaData saveElement(String token, RemoteInputStream xmlRemoteStream, - Map<String, RemoteInputStream> attachmentsRemoteStream) + Map<Attachment, RemoteInputStream> attachmentsRemoteStream) throws SimExplorerServiceException { return (MetaData) checkImplemented(); } @@ -114,7 +116,7 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ public RemoteInputStream retrieveData(String token, String uuid, - String version, String dataKey) throws SimExplorerServiceException { + String version, Attachment attachment) throws SimExplorerServiceException { return null; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-06 17:11:44 UTC (rev 695) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-06 17:11:57 UTC (rev 696) @@ -101,7 +101,7 @@ protected void doAction(ActionEvent e) throws Exception { super.doAction(e); StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); - RemoteInputStream ris = service.retrieveData(getContext().getToken(), uuid, version.toString(), "_xml"); + RemoteInputStream ris = service.exportElement(getContext().getToken(), uuid, version.toString()); if (ris == null) { // todo log error log.warn("could not get incoming data for " + uuid);