Author: tchemit Date: 2012-08-21 18:39:57 +0200 (Tue, 21 Aug 2012) New Revision: 560 Url: http://forge.codelutin.com/repositories/revision/echobase/560 Log: refs #1407: Extraction du module d'import-export csv vers ToPIA Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBasePersistenceHelper.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseMetadatas.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseMetadatas.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseMetadatas.java 2012-08-21 16:39:30 UTC (rev 559) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBaseMetadatas.java 2012-08-21 16:39:57 UTC (rev 560) @@ -27,7 +27,6 @@ import org.nuiton.topia.persistence.metadata.DbMeta; import org.nuiton.topia.persistence.metadata.MetaFilenameAware; import org.nuiton.topia.persistence.metadata.Metadatas; -import org.nuiton.topia.persistence.metadata.TopiaEntityEnumProvider; import java.util.List; @@ -52,7 +51,7 @@ public static DbMeta<EchoBaseEntityEnum> newDbMeta() { return DbMeta.newDbMeta( - new EchoBaseTopiaEntityEnumProvider(), + new EchoBasePersistenceHelper(), EchoBaseEntityEnum.values(), nonEditableTypes ); @@ -185,11 +184,4 @@ return result.toArray(new EchoBaseEntityEnum[result.size()]); } - public static class EchoBaseTopiaEntityEnumProvider implements TopiaEntityEnumProvider<EchoBaseEntityEnum> { - - @Override - public <E> EchoBaseEntityEnum getEntityEnum(Class<E> type) { - return EchoBaseEntityEnum.valueOf(type); - } - } } Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBasePersistenceHelper.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBasePersistenceHelper.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBasePersistenceHelper.java 2012-08-21 16:39:57 UTC (rev 560) @@ -0,0 +1,54 @@ +package fr.ifremer.echobase.entities; + +/* + * #%L + * EchoBase :: Entities + * $Id$ + * $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/main... $ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaPersistenceHelper; + +/** +* TODO +* +* @author tchemit <chemit@codelutin.com> +* @since 1.1 +*/ +public class EchoBasePersistenceHelper implements TopiaPersistenceHelper<EchoBaseEntityEnum> { + + @Override + public <E extends TopiaEntity> EchoBaseEntityEnum getEntityEnum(Class<E> type) { + return EchoBaseEntityEnum.valueOf(type); + } + + @Override + public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, Class<E> type) { + try { + return EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO(tx, type); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } +} Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EchoBasePersistenceHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-08-21 16:39:30 UTC (rev 559) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-08-21 16:39:57 UTC (rev 560) @@ -41,7 +41,7 @@ import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.MetaFilenameAware; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.topia.persistence.metadata.TopiaEntityEnumProvider; +import org.nuiton.topia.persistence.TopiaPersistenceHelper; import org.nuiton.util.FileUtil; import org.nuiton.util.TimeLog; @@ -206,7 +206,7 @@ modelFactory, entityMetas, associations, container); ReplicateEntityVisitor result = new ReplicateEntityVisitor( - getDbMeta().getEntityEnumProvider(), contexts); + getDbMeta().getPersistenceHelper(), contexts); return result; } @@ -226,7 +226,7 @@ entity instanceof Result; } - public ReplicateEntityVisitor(TopiaEntityEnumProvider<EchoBaseEntityEnum> typeProvider, + public ReplicateEntityVisitor(TopiaPersistenceHelper<EchoBaseEntityEnum> typeProvider, Map<EchoBaseEntityEnum, TopiaCsvExports.EntityExportContext<EchoBaseEntityEnum>> entityExporters) { super(typeProvider, entityExporters); categoryIds = Sets.newHashSet();