Author: glandais Date: 2008-02-07 16:09:43 +0000 (Thu, 07 Feb 2008) New Revision: 727 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java Log: Harmonisation noms fonctions export Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-02-07 16:09:43 UTC (rev 727) @@ -144,8 +144,8 @@ * @throws SimExplorerServiceException * the sim explorer service exception */ - RemoteInputStream exportElement(String token, String uuid, String version) - throws SimExplorerServiceException; + RemoteInputStream retrieveElementXML(String token, String uuid, + String version) throws SimExplorerServiceException; /** * Export full element to a remote stream as a zip. @@ -162,8 +162,8 @@ * @throws SimExplorerServiceException * the sim explorer service exception */ - RemoteInputStream exportFull(String token, String uuid, String version) - throws SimExplorerServiceException; + RemoteInputStream retrieveElementFull(String token, String uuid, + String version) throws SimExplorerServiceException; /** * Retrieve data related to an entity. @@ -174,16 +174,17 @@ * the uuid * @param version * the version - * - * @param attachment the attachment - * + * @param attachment + * the attachment + * * @return the remote input stream * * @throws SimExplorerServiceException * the sim explorer service exception */ - RemoteInputStream retrieveData(String token, String uuid, String version, - Attachment attachment) throws SimExplorerServiceException; + RemoteInputStream retrieveElementData(String token, String uuid, + String version, Attachment attachment) + throws SimExplorerServiceException; /** * Retrieve number of elements matching query. @@ -281,7 +282,7 @@ * @throws SimExplorerServiceException * the sim explorer service exception */ - LoggableElement getElement(String token, String uuid, String version) + LoggableElement getLoggableElement(String token, String uuid, String version) throws SimExplorerServiceException; /** Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-02-07 16:09:43 UTC (rev 727) @@ -224,10 +224,10 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getElement(java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#getLoggableElement(java.lang.String, java.lang.String, java.lang.String) */ - public LoggableElement getElement(String token, String uuid, String version) - throws SimExplorerServiceException { + public LoggableElement getLoggableElement(String token, String uuid, + String version) throws SimExplorerServiceException { MetaData mde = getMetadata(token, uuid, version); try { @@ -343,9 +343,9 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveElementData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream retrieveData(String token, String uuid, + public RemoteInputStream retrieveElementData(String token, String uuid, String version, Attachment attachment) throws SimExplorerServiceException { try { @@ -363,9 +363,9 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveElementXML(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportElement(String token, String uuid, + public RemoteInputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerServiceException { MetaData mde = getMetadata(token, uuid, version); try { @@ -383,11 +383,11 @@ } /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveElementFull(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportFull(String token, String uuid, + public RemoteInputStream retrieveElementFull(String token, String uuid, String version) throws SimExplorerServiceException { - LoggableElement element = getElement(token, uuid, version); + LoggableElement element = getLoggableElement(token, uuid, version); MetaData mde = element.getMetaData(); try { PipedOutputStream pipedOut = new PipedOutputStream(); 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-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-07 16:09:43 UTC (rev 727) @@ -99,7 +99,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportElement(String token, String uuid, + public RemoteInputStream retrieveElementXML(String token, String uuid, String version) throws SimExplorerServiceException { return (RemoteInputStream) checkImplemented(); } @@ -107,7 +107,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) */ - public RemoteInputStream exportFull(String token, String uuid, + public RemoteInputStream retrieveElementFull(String token, String uuid, String version) throws SimExplorerServiceException { return (RemoteInputStream) checkImplemented(); } @@ -115,7 +115,7 @@ /* (non-Javadoc) * @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, + public RemoteInputStream retrieveElementData(String token, String uuid, String version, Attachment attachment) throws SimExplorerServiceException { return null; } @@ -161,7 +161,7 @@ /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#getElement(java.lang.String, java.lang.String, java.lang.String) */ - public LoggableElement getElement(String token, String uuid, String version) + public LoggableElement getLoggableElement(String token, String uuid, String version) throws SimExplorerServiceException { try { LoggableElement[] eas = base.loggableElements.get(uuid); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-07 16:09:43 UTC (rev 727) @@ -59,7 +59,7 @@ public static LoggableElement getElement(SimExplorerContext context, boolean remote, String uuid, String version) throws Exception { StorageService service = context.getStorageService(remote); LoggableElement data; - data = service.getElement(context.getToken(), uuid, version); + data = service.getLoggableElement(context.getToken(), uuid, version); return data; } 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-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-07 16:09:43 UTC (rev 727) @@ -102,7 +102,7 @@ super.doAction(e); //TODO push this in StorageHelper StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); - RemoteInputStream ris = service.exportElement(getContext().getToken(), uuid, version.toString()); + RemoteInputStream ris = service.retrieveElementXML(getContext().getToken(), uuid, version.toString()); if (ris == null) { // todo log error log.warn("could not get incoming data for " + uuid); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-07 16:09:43 UTC (rev 727) @@ -68,7 +68,7 @@ try { RemoteInputStream ris = RemoteStorageService.getStorageService() - .exportElement(getToken(), mde.getUuid(), + .retrieveElementXML(getToken(), mde.getUuid(), mde.getVersion().toString()); InputStream stream = RemoteInputStreamClient.wrap(ris); response = new XMLAttachment(stream, mde.getType() + "." @@ -92,7 +92,7 @@ try { RemoteInputStream ris = RemoteStorageService.getStorageService() - .exportFull(getToken(), mde.getUuid(), + .retrieveElementFull(getToken(), mde.getUuid(), mde.getVersion().toString()); InputStream stream = RemoteInputStreamClient.wrap(ris); response = new ZipAttachment(stream, mde.getType() + "." @@ -127,7 +127,7 @@ for (Attachment attachment : attachments) { if (attachment.getUniqueId().equals(attachmentUniqueId)) { RemoteInputStream ris = RemoteStorageService - .getStorageService().retrieveData(getToken(), uuid, + .getStorageService().retrieveElementData(getToken(), uuid, version, attachment); InputStream stream = RemoteInputStreamClient.wrap(ris); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-02-07 16:07:44 UTC (rev 726) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPage.java 2008-02-07 16:09:43 UTC (rev 727) @@ -44,7 +44,7 @@ */ public void setup(String uuid, String version) { try { - element = RemoteStorageService.getStorageService().getElement( + element = RemoteStorageService.getStorageService().getLoggableElement( getToken(), uuid, version); } catch (Exception e) { throw new SimExplorerWebException(e);