Author: glandais Date: 2008-01-10 15:58:24 +0000 (Thu, 10 Jan 2008) New Revision: 107 Modified: trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageService.java trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java trunk/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/test/ElementGenerator.java Log: Chargement d'un LoggableElement plut?\195?\180t qu'uniquement les EA Modified: trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-09 14:14:17 UTC (rev 106) +++ trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-10 15:58:24 UTC (rev 107) @@ -8,6 +8,7 @@ import com.healthmarketscience.rmiio.RemoteOutputStream; import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; /** @@ -144,14 +145,14 @@ int dateOrder) throws Exception; /** - * Fully load an exploration application + * Fully load an element * * @param uuid * @param version * @return * @throws Exception */ - ExplorationApplication getExplorationApplication(String uuid, String version) + LoggableElement getElement(String uuid, String version) throws Exception; } Modified: trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java 2008-01-09 14:14:17 UTC (rev 106) +++ trunk/simexplorer-is-service/src/main/java/fr/cemagref/simexplorer/is/service/StorageServiceImpl.java 2008-01-10 15:58:24 UTC (rev 107) @@ -24,7 +24,8 @@ import com.healthmarketscience.rmiio.RemoteOutputStream; import com.healthmarketscience.rmiio.RemoteOutputStreamClient; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.BaseEntity; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; @@ -98,8 +99,8 @@ } public int findApplicationsCount(boolean onlyLatest) throws Exception { - return storageEngine.findElementsByTypeCount( - VALUE_METADATA_TYPE_EA, onlyLatest); + return storageEngine.findElementsByTypeCount(VALUE_METADATA_TYPE_EA, + onlyLatest); } public MetaDataEntity[] findApplications(boolean onlyLatest, int start, @@ -108,13 +109,15 @@ onlyLatest, start, count, dateOrder); } - public ExplorationApplication getExplorationApplication(String uuid, - String version) throws Exception { + public LoggableElement getElement(String uuid, String version) + throws Exception { MetaDataEntity mde = getMetadata(uuid, version); - ExplorationApplication ea = (ExplorationApplication) BaseEntityFactory - .getFactory(ExplorationApplication.class).loadElement( - storageEngine.retrieveData(mde, KEY_XML)); - return ea; + + LoggableElement le = (LoggableElement) BaseEntityFactory.getFactory( + LoggableElement.class.getPackage().getName() + "." + mde.getType()) + .loadElement(storageEngine.retrieveData(mde, KEY_XML)); + + return le; } private MetaDataEntity saveElement(InputStream zipStream) throws Exception { Modified: trunk/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/test/ElementGenerator.java =================================================================== --- trunk/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/test/ElementGenerator.java 2008-01-09 14:14:17 UTC (rev 106) +++ trunk/simexplorer-is-service/src/test/java/fr/cemagref/simexplorer/is/service/test/ElementGenerator.java 2008-01-10 15:58:24 UTC (rev 107) @@ -40,9 +40,17 @@ metaData.setUuid(shortString()); metaData.setName(longString()); metaData.setType(element.getClass().getSimpleName()); - metaData.setDescription("test"); + + StringBuffer sb = new StringBuffer(""); + int c = 3 + r.nextInt(5); + for (int i = 0; i < c; i++) { + sb.append(shortString()); + sb.append(" "); + } + metaData.setDescription(sb.toString()); + Version v = new Version("0"); - int c = 2 + r.nextInt(2); + c = 2 + r.nextInt(2); for (int i = 0; i < c; i++) { v.setVersion(i, r.nextInt(5)); }