Author: tchemit Date: 2008-02-14 18:53:32 +0000 (Thu, 14 Feb 2008) New Revision: 977 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/ui/StorageServiceHelper.java Log: ajout sur le service de mock de la provenance 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-14 18:52:50 UTC (rev 976) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-14 18:53:32 UTC (rev 977) @@ -18,9 +18,15 @@ * ##% */ package fr.cemagref.simexplorer.is.service; +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 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 org.codelutin.util.ZipStreamEncoder; import java.io.InputStream; import java.io.PipedInputStream; @@ -30,15 +36,6 @@ 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; - /** * The Class MockStorageServiceImpl. * @@ -50,8 +47,11 @@ private Attachment xmlAttachment; - public MockStorageServiceImpl() { + private boolean remote; + + public MockStorageServiceImpl(boolean remote) { base = new MockDatabase(); + this.remote = remote; } /** @@ -103,7 +103,7 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) */ public InputStream retrieveElementXML(String token, String uuid, - String version) throws SimExplorerServiceException { + String version) throws SimExplorerServiceException { return (InputStream) checkImplemented(); } @@ -111,7 +111,7 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) */ public InputStream retrieveElementFull(String token, String uuid, - String version) throws SimExplorerServiceException { + String version) throws SimExplorerServiceException { return (InputStream) checkImplemented(); } @@ -120,7 +120,7 @@ * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ public InputStream retrieveElementData(String token, String uuid, - String version, Attachment attachment) throws SimExplorerServiceException { + String version, Attachment attachment) throws SimExplorerServiceException { return null; } @@ -164,7 +164,7 @@ ElementGenerator.RandomStream stream = base.generateTextStream(); String md5 = stream.getMd5(); attachment.setDataHash(md5); - MockDatabase.log.info("setMd5 "+ md5+" for "+element); + MockDatabase.log.info("setMd5 " + md5 + " for " + element); return stream.getStream(); } catch (Exception e) { throw new SimExplorerServiceException(e); @@ -246,7 +246,7 @@ public Version[] getVersions(String token, String uuid) throws SimExplorerServiceException { MetaData[] datas = base.metadatas.get(uuid); - if (datas==null) { + if (datas == null) { return new Version[0]; } Version[] result = new Version[datas.length]; @@ -264,7 +264,7 @@ if (login == null) { throw new SimExplorerServiceException(new NullPointerException("login can not be null")); } - return password == null || password.length()==0 ? null : "abc"; + return password == null || password.length() == 0 ? null : "abc"; } /* (non-Javadoc) @@ -287,6 +287,8 @@ checkImplemented(); } - - + @Override + public String toString() { + return super.toString() + " remote:" + remote; + } } 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-14 18:52:50 UTC (rev 976) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-14 18:53:32 UTC (rev 977) @@ -179,7 +179,7 @@ protected static StorageService getLocalStorageService() { if (storageService == null) { if (mock) { - return storageService = new MockStorageServiceImpl(); + return storageService = new MockStorageServiceImpl(false); } try { storageService = new StorageServiceClient(); @@ -197,7 +197,7 @@ protected static StorageService getRemoteStorageService(SimExplorerContext context) { if (remoteStorageService == null) { if (mock) { - return remoteStorageService = new MockStorageServiceImpl(); + return remoteStorageService = new MockStorageServiceImpl(true); } try { Properties props = initProperties(context.getConfig().getRemoteURI());