[Simexplorer-si-commits] r1013 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service

16 Feb 2008

Author: tchemit
Date: 2008-02-16 09:37:30 +0000 (Sat, 16 Feb 2008)
New Revision: 1013

Modified:
   trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java
Log:
un commit a ecrase des modifs...

Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java
===================================================================

--- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java	2008-02-15 18:02:15 UTC (rev 1012)
+++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java	2008-02-16 09:37:30 UTC (rev 1013)
@@ -18,28 +18,17 @@
 * ##% */
 package fr.cemagref.simexplorer.is.service;
 
-import static fr.cemagref.simexplorer.is.factories.XmlConstants.FILE_DATA_PREFIX;
-import static fr.cemagref.simexplorer.is.factories.XmlConstants.FILE_XML;
-import static fr.cemagref.simexplorer.is.factories.XmlConstants.FOLDER_SEPARATOR;
-
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-
-import org.codelutin.util.ZipStreamEncoder;
-
 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;
 import fr.cemagref.simexplorer.is.entities.metadata.Version;
 import fr.cemagref.simexplorer.is.exceptions.SimExplorerException;
 
+import java.io.InputStream;
+import java.util.Map;
+import java.util.SortedMap;
+
 /**
  * The Class MockStorageServiceImpl.
  *
@@ -49,8 +38,6 @@
 
     protected MockDatabase base;
 
-    private Attachment xmlAttachment;
-
     private boolean remote;
 
     public MockStorageServiceImpl(boolean remote) {
@@ -73,7 +60,7 @@
     }
 
     public MetaData saveElement(String token,
-            SerializableInputStream xmlRemoteStream,
+                                SerializableInputStream xmlRemoteStream,
                                 Map<Attachment, SerializableInputStream> attachmentsRemoteStream)
             throws SimExplorerException {
         return (MetaData) checkImplemented();
@@ -129,61 +116,6 @@
         return null;
     }
 
-    /* (non-Javadoc)
-    * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String)
-    */
-    public InputStream downloadElementFull(String token, String uuid,
-                                           String version) throws SimExplorerException {
-        LoggableElement element = getLoggableElement(token, uuid, version);
-        try {
-            PipedOutputStream pipedOut = new PipedOutputStream();
-            Map<String, InputStream> files = new HashMap<String, InputStream>();
-            files.put(FILE_XML, downloadElementData(token, uuid, version, getXMLAttachment()));
-            List<LoggableElement> children = element.getChildren();
-            for (LoggableElement loggableElement : children) {
-                MetaData thisMde = loggableElement.getMetaData();
-                List<Attachment> attachments;
-                attachments = loggableElement.getMetaData().getAttachments();
-                for (Attachment attachment : attachments) {
-                    files.put(FILE_DATA_PREFIX + FOLDER_SEPARATOR + attachment.getUniqueId(),
-                            retrieveElementData(token, thisMde.getUuid(), thisMde.getVersion().toString(), attachment));
-                }
-            }
-            PipedInputStream pipedIn = new PipedInputStream(pipedOut);
-            ZipStreamEncoder zse = new ZipStreamEncoder(files, pipedOut);
-            zse.start();
-            return pipedIn;
-        } catch (Exception e) {
-            throw new SimExplorerException(e);
-        }
-    }
-
-    /* (non-Javadoc)
-    * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
-    */
-    public InputStream downloadElementData(String token, String uuid, String version, Attachment attachment) throws SimExplorerException {
-        LoggableElement element = getLoggableElement(token, uuid, version);
-
-        try {
-            ElementGenerator.RandomStream stream = base.generateTextStream();
-            String md5 = stream.getMd5();
-            attachment.setDataHash(md5);
-            MockDatabase.log.info("setMd5 " + md5 + " for " + element);
-            return stream.getStream();
-        } catch (Exception e) {
-            throw new SimExplorerException(e);
-        }
-    }
-
-    private Attachment getXMLAttachment() {
-        if (xmlAttachment == null) {
-            xmlAttachment = new Attachment();
-            xmlAttachment.setDataHash("");
-            xmlAttachment.setFileName("entity.xml");
-        }
-        return xmlAttachment;
-    }
-
     public int findFullTextCount(String token, String query, boolean onlyLatest)
             throws SimExplorerException {
         // TODO Changer

    

[Simexplorer-si-commits] r1013 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service

tchemit＠users.labs.libre-entreprise.org