Author: tchemit Date: 2008-02-15 15:41:17 +0000 (Fri, 15 Feb 2008) New Revision: 993 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java Log: suppress downloadXXX mehtods (use retrieve ones) and importElement method Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-15 15:40:32 UTC (rev 992) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-15 15:41:17 UTC (rev 993) @@ -18,6 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui; +import com.healthmarketscience.rmiio.SerializableInputStream; import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; @@ -32,6 +33,8 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; import java.io.InputStream; import java.net.URI; import java.util.Properties; @@ -119,30 +122,7 @@ } } - public static BufferedInputStream downloadElementFull(SimExplorerContext context, boolean remote, String uuid, String version) { - try { - InputStream stream = ((MockStorageServiceImpl) getService(context, remote)).downloadElementFull(context.getToken(), uuid, version); - BufferedInputStream bis; - bis = new BufferedInputStream(stream); - return bis; - } catch (SimExplorerServiceException e1) { - throw new SimExplorerRuntimeException(e1); - } - } - - public static BufferedInputStream downloadElementData(SimExplorerContext context, boolean remote, String uuid, String version, Attachment attachment) { - try { - InputStream stream = ((MockStorageServiceImpl) getService(context, remote)).downloadElementData(context.getToken(), uuid, version, attachment); - BufferedInputStream bis; - bis = new BufferedInputStream(stream); - return bis; - } catch (SimExplorerServiceException e1) { - throw new SimExplorerRuntimeException(e1); - } - } - - public static BufferedInputStream retrieveElementFull(SimExplorerContext context, boolean remote, String uuid, String version) { try { InputStream stream = getService(context, remote).retrieveElementFull(context.getToken(), uuid, version); @@ -165,6 +145,16 @@ } } + public static void importElement(SimExplorerContext context, boolean remote, File file) { + try { + SerializableInputStream zipStream; + zipStream = new SerializableInputStream(new FileInputStream(file)); + getService(context, remote).saveElement(context.getToken(), zipStream); + } catch (Exception e) { + throw new SimExplorerRuntimeException(e); + } + } + public static Version[] getVersions(SimExplorerContext context, boolean remote, String uuid) { try { Version[] result;